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 /posix | |
| 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 'posix')
| -rw-r--r-- | posix/Makefile | 26 |
1 files changed, 20 insertions, 6 deletions
diff --git a/posix/Makefile b/posix/Makefile index a1e84853a8..2c598cd20a 100644 --- a/posix/Makefile +++ b/posix/Makefile @@ -418,6 +418,17 @@ generated += \ $(addprefix wordexp-test-result, 1 2 3 4 5 6 7 8 9 10) \ annexc \ annexc.out \ + getconf.speclist \ + ptestcases.h \ + testcases.h \ + tst-getconf.out \ + wordexp-tst.out \ + # generated + +ifeq ($(run-built-tests),yes) +ifeq (yes,$(build-shared)) +ifneq ($(PERL),no) +generated += \ bug-ga2-mem.out \ bug-ga2.mtrace \ bug-glob2-mem.out \ @@ -430,23 +441,22 @@ generated += \ bug-regex21.mtrace \ bug-regex31-mem.out \ bug-regex31.mtrace \ + bug-regex36-mem.out \ bug-regex36.mtrace \ - getconf.speclist \ - ptestcases.h \ - testcases.h \ tst-boost-mem.out \ tst-boost.mtrace \ tst-fnmatch-mem.out \ tst-fnmatch.mtrace \ - tst-getconf.out \ tst-pcre-mem.out \ tst-pcre.mtrace \ tst-rxspencer-no-utf8-mem.out \ tst-rxspencer-no-utf8.mtrace \ tst-vfork3-mem.out \ tst-vfork3.mtrace \ - wordexp-tst.out \ # generated +endif +endif +endif ifeq ($(run-built-tests),yes) ifeq (yes,$(build-shared)) @@ -461,6 +471,9 @@ endif # XXX Please note that for now we ignore the result of this test. tests-special += $(objpfx)annexc.out ifeq ($(run-built-tests),yes) +tests-special += $(objpfx)tst-getconf.out +ifeq (yes,$(build-shared)) +ifneq ($(PERL),no) tests-special += \ $(objpfx)bug-ga2-mem.out \ $(objpfx)bug-glob2-mem.out \ @@ -471,13 +484,14 @@ tests-special += \ $(objpfx)bug-regex36-mem.out \ $(objpfx)tst-boost-mem.out \ $(objpfx)tst-fnmatch-mem.out \ - $(objpfx)tst-getconf.out \ $(objpfx)tst-glob-tilde-mem.out \ $(objpfx)tst-pcre-mem.out \ $(objpfx)tst-rxspencer-no-utf8-mem.out \ $(objpfx)tst-vfork3-mem.out \ # tests-special endif +endif +endif include ../Rules |