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.
This commit is contained in:
parent
cbd8f9302c
commit
3d6bfcace1
|
@ -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>
|
2016-12-08 Andrew Senkevich <andrew.senkevich@intel.com>
|
||||||
|
|
||||||
[BZ #20539]
|
[BZ #20539]
|
||||||
|
|
5
Rules
5
Rules
|
@ -138,12 +138,11 @@ xtests-special-notdir = $(patsubst $(objpfx)%, %, $(xtests-special))
|
||||||
ifeq ($(run-built-tests),no)
|
ifeq ($(run-built-tests),no)
|
||||||
tests-expected =
|
tests-expected =
|
||||||
else
|
else
|
||||||
tests-expected = $(tests)
|
tests-expected = $(tests) $(tests-printers)
|
||||||
endif
|
endif
|
||||||
tests:
|
tests:
|
||||||
$(..)scripts/merge-test-results.sh -s $(objpfx) $(subdir) \
|
$(..)scripts/merge-test-results.sh -s $(objpfx) $(subdir) \
|
||||||
$(sort $(tests-expected) $(tests-special-notdir:.out=) \
|
$(sort $(tests-expected) $(tests-special-notdir:.out=)) \
|
||||||
$(tests-printers)) \
|
|
||||||
> $(objpfx)subdir-tests.sum
|
> $(objpfx)subdir-tests.sum
|
||||||
xtests:
|
xtests:
|
||||||
$(..)scripts/merge-test-results.sh -s $(objpfx) $(subdir) \
|
$(..)scripts/merge-test-results.sh -s $(objpfx) $(subdir) \
|
||||||
|
|
Loading…
Reference in New Issue