diff mbox series

Implement run-built-tests=no for make xcheck

Message ID 87ed5fhhrg.fsf@oldenburg.str.redhat.com
State New
Headers show
Series Implement run-built-tests=no for make xcheck | expand

Commit Message

Florian Weimer Sept. 19, 2024, 1:53 p.m. UTC 
Previously, the second occurrence of the xtests target
expected all xtests to run (as the r esult of specifying
$(xtests)), but these tests have not been run due to
the the first xtests target is set up in run-built-tests=no:
it only runs tests in $(xtests-special).

To make run-built-tests=no actually useful, tweak the
first xtests target to build tests, similar to what the
parallel tests target does.

---
 Rules | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)


base-commit: e64a1e81aadf6c401174ac9471ced0f0125c2912
diff mbox series

Patch

diff --git a/Rules b/Rules
index 27846abf82..32d1b9c5d8 100644
--- a/Rules
+++ b/Rules
@@ -152,7 +152,9 @@  tests: $(addprefix $(objpfx),$(filter-out $(tests-unsupported), \
 					  $(tests-malloc-hugetlb2:%=%-malloc-hugetlb2)) \
 			     $(test-srcs)) $(tests-special) \
 			     $(tests-printers-programs)
-xtests: tests $(xtests-special)
+xtests: tests \
+  $(addprefix $(objpfx),$(filter-out $(tests-unsupported), $(xtests))) \
+  $(xtests-special)
 else
 tests: $(tests:%=$(objpfx)%.out) $(tests-internal:%=$(objpfx)%.out) \
        $(tests-container:%=$(objpfx)%.out) \
@@ -181,7 +183,7 @@  tests:
 	  > $(objpfx)subdir-tests.sum
 xtests:
 	$(..)scripts/merge-test-results.sh -s $(objpfx) $(subdir) \
-	  $(sort $(xtests) $(xtests-special-notdir:.out=)) \
+	  $(sort $(xtests-special) $(xtests-special-notdir:.out=)) \
 	  > $(objpfx)subdir-xtests.sum
 
 ifeq ($(build-programs),yes)