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>
This commit is contained in:
Florian Weimer 2021-03-09 21:07:24 +01:00
parent 15e50e6c96
commit a6917c82b3
2 changed files with 7 additions and 9 deletions

View File

@ -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-tgkill tst-sysvsem-linux tst-sysvmsg-linux tst-sysvshm-linux \
tst-timerfd tst-ppoll tst-futimens tst-utime tst-utimes \ tst-timerfd tst-ppoll tst-futimens tst-utime tst-utimes \
tst-clock_adjtime tst-adjtimex tst-ntp_adjtime 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 CFLAGS-tst-sigcontext-get_pc.c = -fasynchronous-unwind-tables

View File

@ -25,7 +25,6 @@
#include <support/check.h> #include <support/check.h>
#include <shlib-compat.h> #include <shlib-compat.h>
#if TEST_COMPAT (libc, GLIBC_2_0, GLIBC_2_28)
compat_symbol_reference (libc, fcntl, fcntl, GLIBC_2_0); compat_symbol_reference (libc, fcntl, fcntl, GLIBC_2_0);
static char *temp_filename; static char *temp_filename;
@ -86,12 +85,5 @@ do_test (void)
return 0; return 0;
} }
#else
static int
do_test (void)
{
return 77;
}
#endif
#include <support/test-driver.c> #include <support/test-driver.c>