diff options
| author | Ralf Wildenhues <Ralf.Wildenhues@gmx.de> | 2010-09-26 09:21:14 +0200 |
|---|---|---|
| committer | Ralf Wildenhues <Ralf.Wildenhues@gmx.de> | 2010-10-02 18:37:45 +0200 |
| commit | 614b643eca8361f9d5a5295d25482d07c34016af (patch) | |
| tree | e56eeaac46f5d1415bc0e0610cd8287afd2d9e8c /automake.in | |
| parent | 24e3b4ee2f8cb9f72dd94a05a893f3d4e88b7835 (diff) | |
| download | automake-614b643eca8361f9d5a5295d25482d07c34016af.tar.gz | |
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 <Ralf.Wildenhues@gmx.de>
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.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Diffstat (limited to 'automake.in')
| -rwxr-xr-x | automake.in | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/automake.in b/automake.in index fa098bbfe..381202b46 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; |