[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.10b-46-g68ce3ae

[Ralf Wildenhues]

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=68ce3ae97c09a3b2885e24a237fb83c7a779b77d

The branch, master has been updated
       via  68ce3ae97c09a3b2885e24a237fb83c7a779b77d (commit)
      from  4f2950ac63faad47c4640eb56fade7d6b1d74307 (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 68ce3ae97c09a3b2885e24a237fb83c7a779b77d
Author: Ralf Wildenhues <address@hidden>
Date:   Sat Apr 25 10:43:09 2009 +0200

    parallel-tests: fix recheck* targets for non-GNU make.
    
    * lib/am/check.am (recheck recheck-html): Override AM_MAKEFLAGS
    to portably transport the TEST_LOGS settings through the
    recursive `make' invocations.  Fixes parallel-tests9.test
    failure with Solaris make.
    * tests/parallel-tests9.test: Also ensure that the test
    summary is correct for `recheck'.
    Suggestion by Akim Demaille.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

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

Summary of changes:
 ChangeLog                      |   11 +++++++++++
 lib/Automake/tests/Makefile.in |    2 +-
 lib/am/check.am                |    2 +-
 tests/Makefile.in              |    2 +-
 tests/parallel-tests9.test     |    1 +
 5 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5585ced..b02b170 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2009-04-25  Ralf Wildenhues  <address@hidden>
+
+       parallel-tests: fix recheck* targets for non-GNU make.
+       * lib/am/check.am (recheck recheck-html): Override AM_MAKEFLAGS
+       to portably transport the TEST_LOGS settings through the
+       recursive `make' invocations.  Fixes parallel-tests9.test
+       failure with Solaris make.
+       * tests/parallel-tests9.test: Also ensure that the test
+       summary is correct for `recheck'.
+       Suggestion by Akim Demaille.
+
 2009-04-22  Ralf Wildenhues  <address@hidden>
 
        Avoid racy depmodes with universal builds.
diff --git a/lib/Automake/tests/Makefile.in b/lib/Automake/tests/Makefile.in
index 8233295..3556a30 100644
--- a/lib/Automake/tests/Makefile.in
+++ b/lib/Automake/tests/Makefile.in
@@ -423,7 +423,7 @@ recheck recheck-html:
                  case $$line in FAIL*|XPASS*) echo $$f;; esac;         \
                else echo $$f; fi;                                      \
              done | tr '\012\015' '  '`;                               \
-       $(MAKE) $(AM_MAKEFLAGS) $$target TEST_LOGS="$$list"
+       $(MAKE) $(AM_MAKEFLAGS) $$target AM_MAKEFLAGS='$(AM_MAKEFLAGS) 
TEST_LOGS="'"$$list"'"'
 .pl.log:
        @p='$<'; $(am__check_pre) $(PL_LOG_COMPILE) "$$tst" $(am__check_post)
 
diff --git a/lib/am/check.am b/lib/am/check.am
index 00b80d6..74f0563 100644
--- a/lib/am/check.am
+++ b/lib/am/check.am
@@ -289,7 +289,7 @@ recheck recheck-html:
                  case $$line in FAIL*|XPASS*) echo $$f;; esac;         \
                else echo $$f; fi;                                      \
              done | tr '\012\015' '  '`;                               \
-       $(MAKE) $(AM_MAKEFLAGS) $$target TEST_LOGS="$$list"
+       $(MAKE) $(AM_MAKEFLAGS) $$target AM_MAKEFLAGS='$(AM_MAKEFLAGS) 
TEST_LOGS="'"$$list"'"'
 
 .PHONY: recheck recheck-html
 .MAKE: recheck recheck-html
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 54422bf..b7197aa 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -1165,7 +1165,7 @@ recheck recheck-html:
                  case $$line in FAIL*|XPASS*) echo $$f;; esac;         \
                else echo $$f; fi;                                      \
              done | tr '\012\015' '  '`;                               \
-       $(MAKE) $(AM_MAKEFLAGS) $$target TEST_LOGS="$$list"
+       $(MAKE) $(AM_MAKEFLAGS) $$target AM_MAKEFLAGS='$(AM_MAKEFLAGS) 
TEST_LOGS="'"$$list"'"'
 .test.log:
        @p='$<'; $(am__check_pre) $(TEST_LOG_COMPILE) "$$tst" $(am__check_post)
 
diff --git a/tests/parallel-tests9.test b/tests/parallel-tests9.test
index e1f088b..a0cb585 100755
--- a/tests/parallel-tests9.test
+++ b/tests/parallel-tests9.test
@@ -65,6 +65,7 @@ cat stdout
 grep foo.test stdout && Exit 1
 grep bar.test stdout || Exit 1
 grep baz.test stdout || Exit 1
+grep '2 of 2.*failed' stdout
 
 # If we cannot read the log file, then redo it as well.
 chmod a-r foo.log


hooks/post-receive
-- 
GNU Automake