| Message ID | 2d447c2aaead261f4449231379c4d1a15bf210a6.1699896042.git.fweimer@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | [1/2] nptl: Rename tst-execstack to tst-execstack-threads | expand |
On 13/11/23 14:21, Florian Weimer wrote: > So that the test is harder to confuse with elf/tst-execstack > (although the tests are supposed to be the same). LGTM, thanks. Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org> > --- > elf/tst-execstack.c | 7 ++++++- > nptl/Makefile | 10 +++++----- > ...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(-) > rename nptl/{tst-execstack-mod.c => tst-execstack-threads-mod.c} (100%) > rename nptl/{tst-execstack.c => tst-execstack-threads.c} (100%) > > 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 > > base-commit: 2d27dc1c750849f888b38fa7f0dadf6b376095de
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
So that the test is harder to confuse with elf/tst-execstack (although the tests are supposed to be the same). --- elf/tst-execstack.c | 7 ++++++- nptl/Makefile | 10 +++++----- ...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(-) rename nptl/{tst-execstack-mod.c => tst-execstack-threads-mod.c} (100%) rename nptl/{tst-execstack.c => tst-execstack-threads.c} (100%) base-commit: 2d27dc1c750849f888b38fa7f0dadf6b376095de