From: Adhemerval Zanella <adhemerval.zanella@linaro.org>
To: libc-alpha@sourceware.org
Subject: Re: [PATCH] Linux: misc/tst-ofdlocks-compat can be a regular test
Date: Mon, 8 Mar 2021 10:47:43 -0300 [thread overview]
Message-ID: <c32944e8-1c07-199b-790f-fc5b223a689f@linaro.org> (raw)
In-Reply-To: <87v9a5ep1e.fsf@oldenburg.str.redhat.com>
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 <adhemerval.zanella@linaro.org>
>
> ---
> 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 <support/check.h>
>
> #include <shlib-compat.h>
> -#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 <support/test-driver.c>
>
Ok.
prev parent reply other threads:[~2021-03-08 13:47 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-05 12:57 Florian Weimer
2021-03-08 13:47 ` Adhemerval Zanella [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=c32944e8-1c07-199b-790f-fc5b223a689f@linaro.org \
--to=adhemerval.zanella@linaro.org \
--cc=libc-alpha@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).