diff options
| author | Florian Weimer <fweimer@redhat.com> | 2021-03-09 21:07:24 +0100 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2021-03-09 21:07:24 +0100 |
| commit | a6917c82b32b197bbe2bb682dd26bcfbb0fde5e6 (patch) | |
| tree | b5504a6aa84b364412497887df7ce918ccfeb17c | |
| parent | 15e50e6c966fa0f26612602a95f0129543d9f9d5 (diff) | |
| download | glibc-a6917c82b32b197bbe2bb682dd26bcfbb0fde5e6.tar.gz glibc-a6917c82b32b197bbe2bb682dd26bcfbb0fde5e6.tar.xz glibc-a6917c82b32b197bbe2bb682dd26bcfbb0fde5e6.zip | |
Linux: misc/tst-ofdlocks-compat can be a regular test
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. Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
| -rw-r--r-- | sysdeps/unix/sysv/linux/Makefile | 8 | ||||
| -rw-r--r-- | 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 1d209516e3..e42bc7f13b 100644 --- a/sysdeps/unix/sysv/linux/Makefile +++ b/sysdeps/unix/sysv/linux/Makefile @@ -109,7 +109,13 @@ tests += tst-clone tst-clone2 tst-clone3 tst-fanotify tst-personality \ tst-tgkill tst-sysvsem-linux tst-sysvmsg-linux tst-sysvshm-linux \ tst-timerfd tst-ppoll tst-futimens tst-utime tst-utimes \ tst-clock_adjtime tst-adjtimex tst-ntp_adjtime -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 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> |