summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2008-04-05 21:58:10 +0100
committerChris Wilson <chris@chris-wilson.co.uk>2008-04-05 22:06:34 +0100
commitfc0a2988cdcbc54292377b00fe9a82b4a7407918 (patch)
treef1b2d591e3649a093b713304188dff9507312ff6
parentae6fbe9e6e153a917f3ae8d733e88303e2816b2b (diff)
[test] Disable jobserver with make check.
make -j check has the unfortunate side-effect of performing the summary before the TESTS have completed, both hiding in the stream of test output and making it useless. Forcibly disable the jobserver so that the summary is always last at the expense of not compiling the tests in parallel.
-rw-r--r--test/Makefile.am4
1 files changed, 3 insertions, 1 deletions
diff --git a/test/Makefile.am b/test/Makefile.am
index c1d2e3648..137fa0099 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -711,7 +711,9 @@ svg-surface \
user-data
# A hook that summarises the failures
-check: AM_MAKEFLAGS+=-k
+# We need to both force make to keep going after failures and to disable the
+# jobserver (parallel builds).
+check: AM_MAKEFLAGS+=-k -j1
check-local:
@FAILED_TESTS=""; \
for t in $(TESTS:$(EXEEXT)=.log); do \