nptl: Rename tst-execstack to tst-execstack-threads

So that the test is harder to confuse with elf/tst-execstack
(although the tests are supposed to be the same).

Reviewed-by: Adhemerval Zanella  <adhemerval.zanella@linaro.org>
This commit is contained in:
Florian Weimer 2023-11-20 09:22:21 +01:00
parent 6ae7b5f43d
commit 8c8eff33e4
4 changed files with 11 additions and 6 deletions

View File

@ -137,7 +137,12 @@ do_test (void)
#endif #endif
/* Loading this module should force stacks to become executable. */ /* Loading this module should force stacks to become executable. */
void *h = dlopen ("tst-execstack-mod.so", RTLD_LAZY); #if USE_PTHREADS
const char *soname = "tst-execstack-threads-mod.so";
#else
const char *soname = "tst-execstack-mod.so";
#endif
void *h = dlopen (soname, RTLD_LAZY);
if (h == NULL) if (h == NULL)
{ {
printf ("cannot load: %s\n", dlerror ()); printf ("cannot load: %s\n", dlerror ());

View File

@ -466,7 +466,7 @@ tests-internal += \
tst-tls5 \ tst-tls5 \
# tests-internal # tests-internal
ifeq ($(have-z-execstack),yes) ifeq ($(have-z-execstack),yes)
tests += tst-execstack tests += tst-execstack-threads
endif endif
endif endif
@ -474,7 +474,7 @@ modules-names = \
tst-audit-threads-mod1 \ tst-audit-threads-mod1 \
tst-audit-threads-mod2 \ tst-audit-threads-mod2 \
tst-compat-forwarder-mod \ tst-compat-forwarder-mod \
tst-execstack-mod \ tst-execstack-threads-mod \
tst-stack4mod \ tst-stack4mod \
tst-tls3mod \ tst-tls3mod \
tst-tls5mod \ tst-tls5mod \
@ -669,9 +669,9 @@ endif
tst-exec4-ARGS = $(host-test-program-cmd) tst-exec4-ARGS = $(host-test-program-cmd)
$(objpfx)tst-execstack.out: $(objpfx)tst-execstack-mod.so $(objpfx)tst-execstack-threads.out: $(objpfx)tst-execstack-threads-mod.so
LDFLAGS-tst-execstack = -Wl,-z,noexecstack LDFLAGS-tst-execstack-threads = -Wl,-z,noexecstack
CFLAGS-tst-execstack-mod.c += -Wno-trampolines CFLAGS-tst-execstack-threads-mod.c += -Wno-trampolines
tst-stackguard1-ARGS = --command "$(host-test-program-cmd) --child" tst-stackguard1-ARGS = --command "$(host-test-program-cmd) --child"
tst-stackguard1-static-ARGS = --command "$(objpfx)tst-stackguard1-static --child" tst-stackguard1-static-ARGS = --command "$(objpfx)tst-stackguard1-static --child"