[cairo-commit] 2 commits - test/Makefile.am

[Chris Wilson]

 test/Makefile.am |   12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

New commits:
commit 3a89bf4a1dd37852ca603c2ba472de73959dc69a
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Sat Apr 5 22:01:24 2008 +0100

    [test] Remove some redundant evals from the summary.
    
    In a couple of places we used eval to execute a simple assignment -
    complete overkill.

diff --git a/test/Makefile.am b/test/Makefile.am
index 137fa00..305f62d 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -729,8 +729,8 @@ check-local:
 		grep -e '\<FAIL\>' $$t.log | sed -e 's/.*TARGET: \([^ ]*\).*/\1/' | sort | uniq | tr '\n' ' '; \
 		echo; \
 		for s in `grep -e '\<FAIL\>' $$t.log | sed -e 's/.*TARGET: \([^ ]*\).*/\1/' | sort | uniq`; do \
-		    eval ss=`echo $$s | tr '-' '_'`; \
-		    eval tt=`echo $$t | tr '-' '_'`; \
+		    ss=`echo $$s | tr '-' '_'`; \
+		    tt=`echo $$t | tr '-' '_'`; \
 		    eval $$ss=\""$${!ss} $$tt"\"; \
 		    echo $$surfaces | grep $$ss >/dev/null || surfaces="$$surfaces $$ss"; \
 		done; \
@@ -738,7 +738,7 @@ check-local:
 	    echo -n "Failures per surface - "; \
 	    first=""; \
 	    for s in $$surfaces; do \
-	        eval ss=`echo $$s | tr '_' '-'`; \
+	        ss=`echo $$s | tr '_' '-'`; \
 		test -n "$$first" && echo -n ", "; \
 		cnt=`echo $${!s} | wc -w`; \
 	        echo -n "$$ss: $$cnt"; \
@@ -746,7 +746,7 @@ check-local:
 	    done; \
 	    echo "."; \
 	    for s in $$surfaces; do \
-	        eval ss=`echo $$s | tr '_' '-'`; \
+	        ss=`echo $$s | tr '_' '-'`; \
 		cnt=`echo $${!s} | wc -w`; \
 	        echo -n "	$$ss [$$cnt]: "; \
 		echo $${!s} | tr '_' '-'; \
commit fc0a2988cdcbc54292377b00fe9a82b4a7407918
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Sat Apr 5 21:58:10 2008 +0100

    [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.

diff --git a/test/Makefile.am b/test/Makefile.am
index c1d2e36..137fa00 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 \