diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2016-12-08 18:54:13 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2016-12-08 18:54:13 +0000 |
| commit | 3d6bfcace17a479c2e006a33567af80e6070583f (patch) | |
| tree | b9c5c19a39fb7163d84d937c7848837e5d35681d | |
| parent | cbd8f9302c9a04bf4fe72a3a1a641faf07614552 (diff) | |
| download | glibc-3d6bfcace17a479c2e006a33567af80e6070583f.tar.gz glibc-3d6bfcace17a479c2e006a33567af80e6070583f.tar.xz glibc-3d6bfcace17a479c2e006a33567af80e6070583f.zip | |
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.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | Rules | 5 |
2 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index dbf9376e26..e19db5d054 100644 --- 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 714e917de4..de58a64a67 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) \ |