diff options
| author | Carlos O'Donell <carlos@redhat.com> | 2024-06-19 11:48:05 -0400 |
|---|---|---|
| committer | Andreas K. Hüttel <dilfridge@gentoo.org> | 2024-07-01 17:20:30 +0200 |
| commit | a7fe3e805d2ee128ac5f43b2a24201726d41cc04 (patch) | |
| tree | 0b1908eb5001e30028839ae6c007fb865488a1bd /elf | |
| parent | 4f7eb238d0da989a9deb50e9cd441cca895957dc (diff) | |
| download | glibc-a7fe3e805d2ee128ac5f43b2a24201726d41cc04.zip glibc-a7fe3e805d2ee128ac5f43b2a24201726d41cc04.tar.gz glibc-a7fe3e805d2ee128ac5f43b2a24201726d41cc04.tar.bz2 | |
Fix conditionals on mtrace-based tests (bug 31892)
The conditionals for several mtrace-based tests in catgets, elf, libio,
malloc, misc, nptl, posix, and stdio-common were incorrect leading to
test failures when bootstrapping glibc without perl.
The correct conditional for mtrace-based tests requires three checks:
first checking for run-built-tests, then build-shared, and lastly that
PERL is not equal to "no" (missing perl).
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Diffstat (limited to 'elf')
| -rw-r--r-- | elf/Makefile | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/elf/Makefile b/elf/Makefile index bb6cd06..1105bee 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -632,13 +632,19 @@ $(objpfx)tst-rtld-does-not-exist.out: tst-rtld-does-not-exist.sh $(objpfx)ld.so tests += $(tests-execstack-$(have-z-execstack)) ifeq ($(run-built-tests),yes) tests-special += \ - $(objpfx)noload-mem.out \ $(objpfx)tst-ldconfig-X.out \ $(objpfx)tst-ldconfig-p.out \ $(objpfx)tst-ldconfig-soname.out \ - $(objpfx)tst-leaks1-mem.out \ $(objpfx)tst-rtld-help.out \ # tests-special +ifeq (yes,$(build-shared)) +ifneq ($(PERL),no) +tests-special += \ + $(objpfx)noload-mem.out \ + $(objpfx)tst-leaks1-mem.out \ + # tests-special +endif +endif endif tlsmod17a-suffixes = 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 tlsmod18a-suffixes = 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 |