[Automake-commit] [SCM] GNU Automake branch, branch-1.11, updated. v1.11.1-226-gfd6a1e2

[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=fd6a1e2d72cf6021daad4d4e89be7e48c560f5b6

The branch, branch-1.11 has been updated
       via  fd6a1e2d72cf6021daad4d4e89be7e48c560f5b6 (commit)
       via  9e126f15eef21b220cae7f1b3556c26ac19e29d0 (commit)
       via  614b643eca8361f9d5a5295d25482d07c34016af (commit)
      from  3349f1fc815365d2dde26e89518bcdb36c0e64c6 (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 fd6a1e2d72cf6021daad4d4e89be7e48c560f5b6
Merge: 3349f1f 9e126f1
Author: Ralf Wildenhues <address@hidden>
Date:   Sat Oct 2 18:40:42 2010 +0200

    Merge branch 'maint' into branch-1.11

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

Summary of changes:
 ChangeLog                      |   19 +++++++++++++++++++
 NEWS                           |    3 ---
 automake.in                    |   11 +++--------
 lib/Automake/tests/Makefile.in |    8 ++++----
 lib/am/check.am                |    8 ++++----
 tests/Makefile.in              |    8 ++++----
 6 files changed, 34 insertions(+), 23 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 151fe13..b7fcad5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+2010-10-02  Ralf Wildenhues  <address@hidden>
+
+       Revert "parallel-tests: avoid command-line length limit issue."
+       This reverts commit 24e3b4ee2f8cb9f72dd94a05a893f3d4e88b7835,
+       because it re-opened the bug fixed by v1.11-10-g218e678.
+
+       2010-09-07  Ralf Wildenhues  <address@hidden>
+
+       parallel-tests: avoid command-line length limit issue.
+       * automake.in (handle_tests): New argument $makefile, new
+       substitution %MAKEFILE%.
+       (generate_makefile): Adjust.
+       * lib/am/check.am [%?PARALLEL_TESTS%] (check-TESTS): Pass
+       sanitized TEST_LOGS value as makefile snippet on standard
+       input to $(MAKE), to avoid exceeding the command line limit on
+       w32 (MSYS).
+       * NEWS: Update.
+       Report by Bob Friesenhahn.
+
 2010-09-26  Stefano Lattarini  <address@hidden>
 
        Extend tests on `--help' and `--version' options.
diff --git a/NEWS b/NEWS
index 0fc638b..1abfd2d 100644
--- a/NEWS
+++ b/NEWS
@@ -9,9 +9,6 @@ Bugs fixed in 1.11.1a:
 
 * Bugs introduced by 1.11.1:
 
-  - The `parallel-tests' driver works around a problem with command-line
-    length limits with `make check' on w32 (MSYS).
-
 * Long standing bugs:
 
   - The `silent-rules' option now also silences all compile rules if dependency
diff --git a/automake.in b/automake.in
index 845ac7f..6b36ae2 100755
--- a/automake.in
+++ b/automake.in
@@ -4908,13 +4908,9 @@ sub handle_tests_dejagnu
 }
 
 
-# handle_tests ($MAKEFILE)
-# ------------------------
 # Handle TESTS variable and other checks.
-sub handle_tests ($)
+sub handle_tests
 {
-  my ($makefile) = @_;
-
   if (option 'dejagnu')
     {
       &handle_tests_dejagnu;
@@ -4933,8 +4929,7 @@ sub handle_tests ($)
       push (@check_tests, 'check-TESTS');
       $output_rules .= &file_contents ('check', new Automake::Location,
                                       COLOR => !! option 'color-tests',
-                                      PARALLEL_TESTS => !! option 
'parallel-tests',
-                                      MAKEFILE => basename $makefile);
+                                      PARALLEL_TESTS => !! option 
'parallel-tests');
 
       # Tests that are known programs should have $(EXEEXT) appended.
       # For matching purposes, we need to adjust XFAIL_TESTS as well.
@@ -8216,7 +8211,7 @@ sub generate_makefile ($$)
   handle_tags;
   handle_minor_options;
   # Must come after handle_programs so that %known_programs is up-to-date.
-  handle_tests ($makefile);
+  handle_tests;
 
   # This must come after most other rules.
   handle_dist;
diff --git a/lib/Automake/tests/Makefile.in b/lib/Automake/tests/Makefile.in
index 48ee823..482aa43 100644
--- a/lib/Automake/tests/Makefile.in
+++ b/lib/Automake/tests/Makefile.in
@@ -404,10 +404,10 @@ check-TESTS:
        @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list
        @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
        @list='$(TEST_LOGS)';                                           \
-       { echo "TEST_LOGS = \\";                                        \
-         for f in $$list; do test .log = $$f || echo "$$f \\"; done;   \
-       } | sed '$$s/\\$$//'                                            \
-         | $(MAKE) -f Makefile -f - $(AM_MAKEFLAGS) $(TEST_SUITE_LOG)
+       list=`for f in $$list; do                                       \
+         test .log = $$f || echo $$f;                                  \
+       done | tr '\012\015' '  '`;                                     \
+       $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$list"
 
 .log.html:
        @list='$(RST2HTML) $$RST2HTML rst2html rst2html.py';            \
diff --git a/lib/am/check.am b/lib/am/check.am
index b79201f..c612b22 100644
--- a/lib/am/check.am
+++ b/lib/am/check.am
@@ -236,10 +236,10 @@ check-TESTS:
 ## we rely on .PHONY to work portably.
        @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
        @list='$(TEST_LOGS)';                                           \
-       { echo "TEST_LOGS = \\";                                        \
-         for f in $$list; do test .log = $$f || echo "$$f \\"; done;   \
-       } | sed '$$s/\\$$//'                                            \
-         | $(MAKE) -f %MAKEFILE% -f - $(AM_MAKEFLAGS) $(TEST_SUITE_LOG)
+       list=`for f in $$list; do                                       \
+         test .log = $$f || echo $$f;                                  \
+       done | tr '\012\015' '  '`;                                     \
+       $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$list"
 
 AM_RECURSIVE_TARGETS += check
 
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 6a27b2c..fc247f8 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -1195,10 +1195,10 @@ check-TESTS:
        @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list
        @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
        @list='$(TEST_LOGS)';                                           \
-       { echo "TEST_LOGS = \\";                                        \
-         for f in $$list; do test .log = $$f || echo "$$f \\"; done;   \
-       } | sed '$$s/\\$$//'                                            \
-         | $(MAKE) -f Makefile -f - $(AM_MAKEFLAGS) $(TEST_SUITE_LOG)
+       list=`for f in $$list; do                                       \
+         test .log = $$f || echo $$f;                                  \
+       done | tr '\012\015' '  '`;                                     \
+       $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$list"
 
 .log.html:
        @list='$(RST2HTML) $$RST2HTML rst2html rst2html.py';            \


hooks/post-receive
-- 
GNU Automake