From a7fe3e805d2ee128ac5f43b2a24201726d41cc04 Mon Sep 17 00:00:00 2001 From: Carlos O'Donell Date: Wed, 19 Jun 2024 11:48:05 -0400 Subject: 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 --- catgets/Makefile | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'catgets') 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 \ -- cgit v1.2.3