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 /stdio-common | |
| 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 'stdio-common')
| -rw-r--r-- | stdio-common/Makefile | 34 |
1 files changed, 25 insertions, 9 deletions
diff --git a/stdio-common/Makefile b/stdio-common/Makefile index 6bc972af1a..a63c05a120 100644 --- a/stdio-common/Makefile +++ b/stdio-common/Makefile @@ -229,10 +229,6 @@ tests := \ tst-popen \ tst-popen2 \ tst-printf-binary \ - tst-printf-bz18872 \ - tst-printf-bz25691 \ - tst-printf-fp-free \ - tst-printf-fp-leak \ tst-printf-intn \ tst-printf-oct \ tst-printf-round \ @@ -261,7 +257,6 @@ tests := \ tst-vfprintf-mbs-prec \ tst-vfprintf-user-type \ tst-vfprintf-width-i18n \ - tst-vfprintf-width-prec \ tst-vfprintf-width-prec-alloc \ tst-wc-printf \ tstdiomisc \ @@ -270,6 +265,20 @@ tests := \ xbug \ # tests +ifeq ($(run-built-tests),yes) +ifeq (yes,$(build-shared)) +ifneq ($(PERL),no) +tests += \ + tst-printf-bz18872 \ + tst-printf-bz25691 \ + tst-printf-fp-free \ + tst-printf-fp-leak \ + tst-vfprintf-width-prec \ + # tests +endif +endif +endif + tests-container += \ tst-popen3 # tests-container @@ -293,14 +302,19 @@ test-srcs = \ ifeq ($(run-built-tests),yes) tests-special += \ - $(objpfx)tst-printf-bz18872-mem.out \ - $(objpfx)tst-printf-bz25691-mem.out \ - $(objpfx)tst-printf-fp-free-mem.out \ - $(objpfx)tst-printf-fp-leak-mem.out \ $(objpfx)tst-printf.out \ $(objpfx)tst-printfsz-islongdouble.out \ $(objpfx)tst-setvbuf1-cmp.out \ $(objpfx)tst-unbputc.out \ + # tests-special + +ifeq (yes,$(build-shared)) +ifneq ($(PERL),no) +tests-special += \ + $(objpfx)tst-printf-bz18872-mem.out \ + $(objpfx)tst-printf-bz25691-mem.out \ + $(objpfx)tst-printf-fp-free-mem.out \ + $(objpfx)tst-printf-fp-leak-mem.out \ $(objpfx)tst-vfprintf-width-prec-mem.out \ # tests-special @@ -317,6 +331,8 @@ generated += \ tst-vfprintf-width-prec-mem.out \ tst-vfprintf-width-prec.mtrace \ # generated +endif +endif endif # $(run-built-tests) tests-special += $(objpfx)tst-errno-manual.out |