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 /catgets | |
| parent | 4f7eb238d0da989a9deb50e9cd441cca895957dc (diff) | |
| download | 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 'catgets')
| -rw-r--r-- | catgets/Makefile | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/catgets/Makefile b/catgets/Makefile index 24b4560d5f..40c65eac95 100644 --- a/catgets/Makefile +++ b/catgets/Makefile @@ -43,8 +43,12 @@ tests-special += \ $(objpfx)test-gencat.out \ $(objpfx)test1.cat \ $(objpfx)test2.cat \ - $(objpfx)tst-catgets-mem.out # tests-special +ifeq (yes,$(build-shared)) +ifneq ($(PERL),no) +tests-special += $(objpfx)tst-catgets-mem.out +endif +endif endif gencat-modules = xmalloc @@ -68,9 +72,17 @@ generated += \ test1.h \ test2.cat \ test2.h \ + # generated +ifeq ($(run-built-tests),yes) +ifeq (yes,$(build-shared)) +ifneq ($(PERL),no) +generated += \ tst-catgets-mem.out \ tst-catgets.mtrace \ # generated +endif +endif +endif generated-dirs += \ de \ |