From e64e117177b4cf3545edabfcc630c6a82a4ee643 Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Fri, 4 Nov 2016 21:29:00 +0000 Subject: [PATCH] Do not generate UNRESOLVED results for run-built-tests = no. Testing with run-built-tests = no generates many UNRESOLVED results in tests.sum (and so in the output of "make check"), for all the tests that are only compiled and not run in such a configuration. This doesn't seem useful in the "make check" output, and also causes "make check" to exist with error status even when all tests that can be run in such a configuration passed. This patch changes it not to consider those tests when generating subdir-tests.sum, and so tests.sum, so that you get a smaller number of tests considered in the final results rather than a huge pile of UNRESOLVED. Tested with a cross-compiler to ARM in a run-built-tests = no configuration. * Rules (tests-expected): New variable, depending on $(run-built-tests). (tests): Pass $(tests-expected) to merge-test-results.sh, not $(tests). --- ChangeLog | 5 +++++ Rules | 7 ++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 0d3f7781fb..7f2493bc57 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2016-11-04 Joseph Myers + * Rules (tests-expected): New variable, depending on + $(run-built-tests). + (tests): Pass $(tests-expected) to merge-test-results.sh, not + $(tests). + * Rules [$(run-built-tests) = no] (tests): Do not depend on $(tests-unsupported). diff --git a/Rules b/Rules index 4b95997a06..466db076f0 100644 --- a/Rules +++ b/Rules @@ -124,9 +124,14 @@ endif tests-special-notdir = $(patsubst $(objpfx)%, %, $(tests-special)) xtests-special-notdir = $(patsubst $(objpfx)%, %, $(xtests-special)) +ifeq ($(run-built-tests),no) +tests-expected = +else +tests-expected = $(tests) +endif tests: $(..)scripts/merge-test-results.sh -s $(objpfx) $(subdir) \ - $(sort $(tests) $(tests-special-notdir:.out=)) \ + $(sort $(tests-expected) $(tests-special-notdir:.out=)) \ > $(objpfx)subdir-tests.sum xtests: $(..)scripts/merge-test-results.sh -s $(objpfx) $(subdir) \ -- 2.11.4.GIT