This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
Fix tests-printers handling for cross compiling [committed]
- From: Joseph Myers <joseph at codesourcery dot com>
- To: <libc-alpha at sourceware dot org>
- Date: Thu, 8 Dec 2016 18:54:58 +0000
- Subject: Fix tests-printers handling for cross compiling [committed]
- Authentication-results: sourceware.org; auth=none
The pretty-printers changes resulted in the new tests showing as
UNRESOLVED (missing .out files) when run-built-tests = no, so
resulting in "make check" exiting with error status.
https://sourceware.org/ml/libc-testresults/2016-q4/msg00014.html
This patch moves the use of $(tests-printers) when generating the
summary of results into the setting of tests-expected, which is
appropriately conditional, matching the conditional for when tests
depends on $(tests-printers-out).
Tested with cross to aarch64 with build-many-glibcs.py, and natively
on x86_64. Committed.
2016-12-08 Joseph Myers <joseph@codesourcery.com>
* Rules [$(run-built-tests) != no] (tests-expected): Add
$(tests-printers).
(tests): Do not pass $(tests-printers) to merge-test-results.sh.
diff --git a/Rules b/Rules
index 714e917..de58a64 100644
--- a/Rules
+++ b/Rules
@@ -138,12 +138,11 @@ xtests-special-notdir = $(patsubst $(objpfx)%, %, $(xtests-special))
ifeq ($(run-built-tests),no)
tests-expected =
else
-tests-expected = $(tests)
+tests-expected = $(tests) $(tests-printers)
endif
tests:
$(..)scripts/merge-test-results.sh -s $(objpfx) $(subdir) \
- $(sort $(tests-expected) $(tests-special-notdir:.out=) \
- $(tests-printers)) \
+ $(sort $(tests-expected) $(tests-special-notdir:.out=)) \
> $(objpfx)subdir-tests.sum
xtests:
$(..)scripts/merge-test-results.sh -s $(objpfx) $(subdir) \
--
Joseph S. Myers
joseph@codesourcery.com