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 /nptl/Makefile | |
| parent | 4f7eb238d0da989a9deb50e9cd441cca895957dc (diff) | |
| download | glibc-a7fe3e805d2ee128ac5f43b2a24201726d41cc04.tar.gz glibc-a7fe3e805d2ee128ac5f43b2a24201726d41cc04.tar.xz glibc-a7fe3e805d2ee128ac5f43b2a24201726d41cc04.zip | |
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 'nptl/Makefile')
| -rw-r--r-- | nptl/Makefile | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/nptl/Makefile b/nptl/Makefile index b3f8af2e1c..096eef54f2 100644 --- a/nptl/Makefile +++ b/nptl/Makefile @@ -556,10 +556,12 @@ xtests-static += tst-setuid1-static ifeq ($(run-built-tests),yes) tests-special += \ $(objpfx)tst-oddstacklimit.out \ - $(objpfx)tst-stack3-mem.out \ # tests-special ifeq ($(build-shared),yes) tests-special += $(objpfx)tst-tls6.out +ifneq ($(PERL),no) +tests-special += $(objpfx)tst-stack3-mem.out +endif endif endif @@ -617,10 +619,17 @@ tst-stack3-ENV = MALLOC_TRACE=$(objpfx)tst-stack3.mtrace \ $(objpfx)tst-stack3-mem.out: $(objpfx)tst-stack3.out $(common-objpfx)malloc/mtrace $(objpfx)tst-stack3.mtrace > $@; \ $(evaluate-test) + +ifeq ($(run-built-tests),yes) +ifeq (yes,$(build-shared)) +ifneq ($(PERL),no) generated += \ tst-stack3-mem.out \ tst-stack3.mtrace \ # generated +endif +endif +endif tst-stack4mod.sos=$(shell for i in 0 1 2 3 4 5 6 7 8 9 10 \ 11 12 13 14 15 16 17 18 19; do \ |