Fix tests-printers handling for cross compiling.

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.

	* Rules [$(run-built-tests) != no] (tests-expected): Add
	$(tests-printers).
	(tests): Do not pass $(tests-printers) to merge-test-results.sh.

diff --git a/ChangeLog b/ChangeLog
index dbf9376e265224b3c463f82ccc53ed89fb452963..e19db5d05436513e9ac010fbad5cd5e0ba04f4f7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+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.
+
 2016-12-08  Andrew Senkevich  <andrew.senkevich@intel.com>
 
        [BZ #20539]

diff --git a/Rules b/Rules
index 714e917de42cd3769513d20eb880b495af394251..de58a64a67c8cb4112d6137eea3eb5eefc0e4a74 100644 (file)
--- 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) \