diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | Rules | 5 |
2 files changed, 8 insertions, 3 deletions
@@ -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] @@ -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) \ |