From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-qt1-x834.google.com (mail-qt1-x834.google.com [IPv6:2607:f8b0:4864:20::834]) by sourceware.org (Postfix) with ESMTPS id DA857394EC0B for ; Mon, 8 Mar 2021 13:47:46 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org DA857394EC0B Received: by mail-qt1-x834.google.com with SMTP id z6so2364475qts.2 for ; Mon, 08 Mar 2021 05:47:46 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=llsdTZQb/k6usfmyJ/tAofp+wwg1iyWtOCJUwyIzuag=; b=XGT15MKvK20Z4+M1CGqCLMrWjK1S6IrFO3dVvVJ0dMW9+yDrLOcEKi6TA5ruBKD5Vh KvXBtYPxdde9Tj/qXBFe6TFSbq2XLtBaN/DgN7lQ0rtmcwSVVjqqIFjGLpPnqd5WcfN8 lwT9/HxKpGcu45ybAb/tjCQUThSisPlkgw5rPXgXnpQ9s/iw96P8kpq9vqfLDHof6iR+ RpePLVOAgUNIgV8Mm40ZP09V+KKJExrZyGBRoXHEf8cXaP/QYYUymhR8orTdVr5/FLA8 mIY/Q7ADphA/ekq6C9LoV3HOzt28RT+yicjCU7QHLP4fjDZ+VBpwtUjWDa/Ip6jPNhiB ZTJw== X-Gm-Message-State: AOAM532r1lxt5e4/4KUkk9HHT05lWK5MeQ/cAg+mmKl2x+SpS2W1aVDk oDBg6uZw7IUhiywRhrI7030ljrbGOUv5dg== X-Google-Smtp-Source: ABdhPJxatHoLCLqxRrx6D0RRcLqCNZcQJu2ujgR0oMuzIBENE+yzQIqPTTKej22+O+zp0pRtX/PcmQ== X-Received: by 2002:ac8:464a:: with SMTP id f10mr9412724qto.17.1615211265246; Mon, 08 Mar 2021 05:47:45 -0800 (PST) Received: from [192.168.1.4] ([177.194.48.209]) by smtp.googlemail.com with ESMTPSA id 184sm7668887qki.97.2021.03.08.05.47.44 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 08 Mar 2021 05:47:45 -0800 (PST) Subject: Re: [PATCH] Linux: misc/tst-ofdlocks-compat can be a regular test To: libc-alpha@sourceware.org References: <87v9a5ep1e.fsf@oldenburg.str.redhat.com> From: Adhemerval Zanella Message-ID: Date: Mon, 8 Mar 2021 10:47:43 -0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.7.1 MIME-Version: 1.0 In-Reply-To: <87v9a5ep1e.fsf@oldenburg.str.redhat.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-13.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, NICE_REPLY_A, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Mar 2021 13:47:48 -0000 On 05/03/2021 09:57, Florian Weimer via Libc-alpha wrote: > Now that compat_symbol_reference works in non-internal tests. > Also do not build and run the test at all on architectures which > do not have the pre-2.28 symbol version of fcntl. LGTM, thanks. Reviewed-by: Adhemerval Zanella > > --- > sysdeps/unix/sysv/linux/Makefile | 8 +++++++- > sysdeps/unix/sysv/linux/tst-ofdlocks-compat.c | 8 -------- > 2 files changed, 7 insertions(+), 9 deletions(-) > > diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile > index 51e28b97ac..8cc03c8145 100644 > --- a/sysdeps/unix/sysv/linux/Makefile > +++ b/sysdeps/unix/sysv/linux/Makefile > @@ -108,7 +108,13 @@ tests += tst-clone tst-clone2 tst-clone3 tst-fanotify tst-personality \ > tst-rlimit-infinity tst-ofdlocks tst-gettid tst-gettid-kill \ > tst-tgkill tst-sysvsem-linux tst-sysvmsg-linux tst-sysvshm-linux \ > tst-timerfd tst-ppoll tst-futimens tst-utime tst-utimes > -tests-internal += tst-ofdlocks-compat tst-sigcontext-get_pc > + > +# Test for the symbol version of fcntl that was replaced in glibc 2.28. > +ifeq ($(have-GLIBC_2.27)$(build-shared),yesyes) > +tests += tst-ofdlocks-compat > +endif > + > +tests-internal += tst-sigcontext-get_pc > > CFLAGS-tst-sigcontext-get_pc.c = -fasynchronous-unwind-tables > Ok. > diff --git a/sysdeps/unix/sysv/linux/tst-ofdlocks-compat.c b/sysdeps/unix/sysv/linux/tst-ofdlocks-compat.c > index 9169e3baf8..4af8da123f 100644 > --- a/sysdeps/unix/sysv/linux/tst-ofdlocks-compat.c > +++ b/sysdeps/unix/sysv/linux/tst-ofdlocks-compat.c > @@ -25,7 +25,6 @@ > #include > > #include > -#if TEST_COMPAT (libc, GLIBC_2_0, GLIBC_2_28) > compat_symbol_reference (libc, fcntl, fcntl, GLIBC_2_0); > > static char *temp_filename; > @@ -86,12 +85,5 @@ do_test (void) > > return 0; > } > -#else > -static int > -do_test (void) > -{ > - return 77; > -} > -#endif > > #include > Ok.