[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-1997-ge5e6fa0

[Stefano Lattarini]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=e5e6fa03884708e2a48d081a460401c25badfc20

The branch, master has been updated
       via  e5e6fa03884708e2a48d081a460401c25badfc20 (commit)
      from  db973eaa2be26fcfb523e3bfed65cf466e4946aa (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit e5e6fa03884708e2a48d081a460401c25badfc20
Author: Stefano Lattarini <address@hidden>
Date:   Wed Feb 22 11:30:54 2012 +0100

    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.

-----------------------------------------------------------------------

Summary of changes:
 tests/parallel-tests-many.test |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/parallel-tests-many.test b/tests/parallel-tests-many.test
index d14b09e..752ba15 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.


hooks/post-receive
-- 
GNU Automake