public inbox for glibc-cvs@sourceware.org
help / color / mirror / Atom feed
* [glibc] nptl: Rename tst-execstack to tst-execstack-threads
@ 2023-11-20 8:42 Florian Weimer
0 siblings, 0 replies; only message in thread
From: Florian Weimer @ 2023-11-20 8:42 UTC (permalink / raw)
To: glibc-cvs
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=8c8eff33e4e492d95f87dd49cfdc2d4de25693eb
commit 8c8eff33e4e492d95f87dd49cfdc2d4de25693eb
Author: Florian Weimer <fweimer@redhat.com>
Date: Mon Nov 20 09:22:21 2023 +0100
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>
Diff:
---
elf/tst-execstack.c | 7 ++++++-
nptl/Makefile | 10 +++++-----
nptl/{tst-execstack-mod.c => tst-execstack-threads-mod.c} | 0
nptl/{tst-execstack.c => tst-execstack-threads.c} | 0
4 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/elf/tst-execstack.c b/elf/tst-execstack.c
index 7e898b4f58..560b353918 100644
--- a/elf/tst-execstack.c
+++ b/elf/tst-execstack.c
@@ -137,7 +137,12 @@ do_test (void)
#endif
/* 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)
{
printf ("cannot load: %s\n", dlerror ());
diff --git a/nptl/Makefile b/nptl/Makefile
index d969419af7..015295e45c 100644
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -466,7 +466,7 @@ tests-internal += \
tst-tls5 \
# tests-internal
ifeq ($(have-z-execstack),yes)
-tests += tst-execstack
+tests += tst-execstack-threads
endif
endif
@@ -474,7 +474,7 @@ modules-names = \
tst-audit-threads-mod1 \
tst-audit-threads-mod2 \
tst-compat-forwarder-mod \
- tst-execstack-mod \
+ tst-execstack-threads-mod \
tst-stack4mod \
tst-tls3mod \
tst-tls5mod \
@@ -669,9 +669,9 @@ endif
tst-exec4-ARGS = $(host-test-program-cmd)
-$(objpfx)tst-execstack.out: $(objpfx)tst-execstack-mod.so
-LDFLAGS-tst-execstack = -Wl,-z,noexecstack
-CFLAGS-tst-execstack-mod.c += -Wno-trampolines
+$(objpfx)tst-execstack-threads.out: $(objpfx)tst-execstack-threads-mod.so
+LDFLAGS-tst-execstack-threads = -Wl,-z,noexecstack
+CFLAGS-tst-execstack-threads-mod.c += -Wno-trampolines
tst-stackguard1-ARGS = --command "$(host-test-program-cmd) --child"
tst-stackguard1-static-ARGS = --command "$(objpfx)tst-stackguard1-static --child"
diff --git a/nptl/tst-execstack-mod.c b/nptl/tst-execstack-threads-mod.c
similarity index 100%
rename from nptl/tst-execstack-mod.c
rename to nptl/tst-execstack-threads-mod.c
diff --git a/nptl/tst-execstack.c b/nptl/tst-execstack-threads.c
similarity index 100%
rename from nptl/tst-execstack.c
rename to nptl/tst-execstack-threads.c
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2023-11-20 8:42 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-11-20 8:42 [glibc] nptl: Rename tst-execstack to tst-execstack-threads Florian Weimer
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).