From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Wed, 22 Feb 2012 10:30:54 +0000 (+0100)
Subject: fixup: avoid spurious failure for 'parallel-tests-many.test'
X-Git-Tag: v1.11b~100
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e5e6fa03884708e2a48d081a460401c25badfc20;p=thirdparty%2Fautomake.git

fixup: avoid spurious failure for 'parallel-tests-many.test'

* tests/parallel-tests-many.test: Adjust grepping of "make check"
and "make recheck" output to match the new format of the testsuite
summary.  Remove redundant 'set -e' call since we are at it.
---

diff --git a/tests/parallel-tests-many.test b/tests/parallel-tests-many.test
index d14b09e9e..752ba15a4 100755
--- a/tests/parallel-tests-many.test
+++ b/tests/parallel-tests-many.test
@@ -21,8 +21,6 @@
 am_parallel_tests=yes
 . ./defs || Exit 1
 
-set -e
-
 cat >> configure.ac << 'END'
 AC_OUTPUT
 END
@@ -139,7 +137,8 @@ rm -f $deepdir/* || Exit 99
 $MAKE check > stdout || { cat stdout; Exit 1; }
 cat stdout
 
-grep "All $count tests" stdout
+grep "^# TOTAL: $count$" stdout
+grep "^# PASS:  $count$" stdout
 
 grep "^PASS: .*$tname-[0-9][0-9]*\.test" stdout > grp
 ls -1 $deepdir | grep '\.log$' > lst
@@ -164,7 +163,8 @@ cat stdout
 grep "^PASS: .*$tname-1\.test" stdout
 grep "^PASS: .*$tname-2\.test" stdout
 test `LC_ALL=C grep -c "^[A-Z][A-Z]*:" stdout` -eq 2
-grep "All 2 tests" stdout
+grep "^# TOTAL: 2$" stdout
+grep "^# PASS:  2$" stdout
 
 # "make clean" might ignore some failures, so we prefer to also grep its
 # output to ensure that no "Argument list too long" error was encountered.