summaryrefslogtreecommitdiff
path: root/Rules
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2016-11-04 21:29:00 +0000
committerJoseph Myers <joseph@codesourcery.com>2016-11-04 21:29:00 +0000
commite64e117177b4cf3545edabfcc630c6a82a4ee643 (patch)
tree7913c178c1f8c19e24d1fd8a202d1d825d8765f3 /Rules
parent5e37a69a04c61d5bdffb2acbcb05362794e72816 (diff)
downloadglibc-e64e117177b4cf3545edabfcc630c6a82a4ee643.tar.gz
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).
Diffstat (limited to 'Rules')
-rw-r--r--Rules7
1 files changed, 6 insertions, 1 deletions
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) \