[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-338-
|
From: |
Ralf Wildenhues |
|
Subject: |
[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-338-gf60e9ae |
|
Date: |
Tue, 07 Sep 2010 03:11:20 +0000 |
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=f60e9ae2043125f1db170a5dd0e18546bd92303b
The branch, master has been updated
via f60e9ae2043125f1db170a5dd0e18546bd92303b (commit)
via 24e3b4ee2f8cb9f72dd94a05a893f3d4e88b7835 (commit)
via ccb31f6a93cd6076067b5bf120b4478afdad31bf (commit)
via 529421a033c9937a853ef0a315a57f230c3a3bc4 (commit)
from d6bb3cf28168727af9abb1546f3bbdc31debe534 (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 f60e9ae2043125f1db170a5dd0e18546bd92303b
Merge: d6bb3cf 24e3b4e
Author: Ralf Wildenhues <address@hidden>
Date: Tue Sep 7 04:58:02 2010 +0200
Merge branch 'maint'
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 24 ++++++++++++++++++++++++
NEWS | 3 +++
automake.in | 11 ++++++++---
lib/Automake/tests/Makefile.in | 10 +++++-----
lib/am/check.am | 10 +++++-----
tests/Makefile.in | 10 +++++-----
tests/missing6.test | 9 ++++-----
7 files changed, 54 insertions(+), 23 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 825589d..f38f8b6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,27 @@
+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.
+
+ Posix 2008 requires make to set errexit.
+ * lib/am/check.am: Update comment.
+
+2010-08-27 Stefano Lattarini <address@hidden>
+
+ Fix bug in test missing6.test.
+ * tests/missing6.test: Fix the hack used to edit `configure.in',
+ to avoid producing a configure script that breaks with shells
+ that do not support $LINENO. Also throw in a couple of cosmetic
+ changes.
+
2010-09-02 Peter Rosin <address@hidden>
Make ar-lib support backslashed files in archives.
diff --git a/NEWS b/NEWS
index c0f3ebd..8f56fe0 100644
--- a/NEWS
+++ b/NEWS
@@ -42,6 +42,9 @@ Bugs fixed in 1.11a:
- The AM_COND_IF macro also works if the shell expression for the conditional
is no longer valid for the condition.
+ - The `parallel-tests' driver works around a problem with command-line
+ length limits with `make check' on w32 (MSYS).
+
* Long standing bugs:
- On Darwin 9, `pythondir' and `pyexecdir' pointed below `/Library/Python'
diff --git a/automake.in b/automake.in
index c0c5289..7798bb0 100644
--- a/automake.in
+++ b/automake.in
@@ -4945,9 +4945,13 @@ 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;
@@ -4966,7 +4970,8 @@ 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');
+ PARALLEL_TESTS => !! option
'parallel-tests',
+ MAKEFILE => basename $makefile);
# Tests that are known programs should have $(EXEEXT) appended.
# For matching purposes, we need to adjust XFAIL_TESTS as well.
@@ -8250,7 +8255,7 @@ sub generate_makefile ($$)
handle_tags;
handle_minor_options;
# Must come after handle_programs so that %known_programs is up-to-date.
- handle_tests;
+ handle_tests ($makefile);
# This must come after most other rules.
handle_dist;
diff --git a/lib/Automake/tests/Makefile.in b/lib/Automake/tests/Makefile.in
index 34e58db..513f640 100644
--- a/lib/Automake/tests/Makefile.in
+++ b/lib/Automake/tests/Makefile.in
@@ -122,7 +122,7 @@ am__text_box = $(AWK) '{ \
print line; \
}'
# Solaris 10 'make', and several other traditional 'make' implementations,
-# pass "-e" to $(SHELL). This contradicts POSIX. Work around the problem
+# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it
# by disabling -e (using the XSI extension "set +e") if it's set.
am__sh_e_setup = case $$- in *e*) set +e;; esac
# To be inserted before the command running the test. Creates the
@@ -427,10 +427,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)'; \
- list=`for f in $$list; do \
- test .log = $$f || echo $$f; \
- done | tr '\012\015' ' '`; \
- $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$list"
+ { 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)
.log.html:
@list='$(RST2HTML) $$RST2HTML rst2html rst2html.py'; \
diff --git a/lib/am/check.am b/lib/am/check.am
index e519391..b79201f 100644
--- a/lib/am/check.am
+++ b/lib/am/check.am
@@ -87,7 +87,7 @@ am__text_box = $(AWK) '{ \
}'
# Solaris 10 'make', and several other traditional 'make' implementations,
-# pass "-e" to $(SHELL). This contradicts POSIX. Work around the problem
+# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it
# by disabling -e (using the XSI extension "set +e") if it's set.
am__sh_e_setup = case $$- in *e*) set +e;; esac
@@ -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)'; \
- list=`for f in $$list; do \
- test .log = $$f || echo $$f; \
- done | tr '\012\015' ' '`; \
- $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$list"
+ { 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)
AM_RECURSIVE_TARGETS += check
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 77ec888..e6c1063 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -125,7 +125,7 @@ am__text_box = $(AWK) '{ \
print line; \
}'
# Solaris 10 'make', and several other traditional 'make' implementations,
-# pass "-e" to $(SHELL). This contradicts POSIX. Work around the problem
+# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it
# by disabling -e (using the XSI extension "set +e") if it's set.
am__sh_e_setup = case $$- in *e*) set +e;; esac
# To be inserted before the command running the test. Creates the
@@ -1189,10 +1189,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)'; \
- list=`for f in $$list; do \
- test .log = $$f || echo $$f; \
- done | tr '\012\015' ' '`; \
- $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$list"
+ { 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)
.log.html:
@list='$(RST2HTML) $$RST2HTML rst2html rst2html.py'; \
diff --git a/tests/missing6.test b/tests/missing6.test
index 3994b85..e543697 100755
--- a/tests/missing6.test
+++ b/tests/missing6.test
@@ -22,7 +22,7 @@ set -e
{
echo 'm4_define([AC_AUTOCONF_VERSION], [9999a])'
- echo 'm4_define([b], [oops])'
+ echo 'dnl!! m4_define([a], [oops])'
cat configure.in
echo AC_OUTPUT
} >configure.ac
@@ -39,10 +39,9 @@ $AUTOMAKE
./configure
$MAKE
-sed 's/\[b\]/[a]/' < configure.ac > configure.tmp
-cmp configure.ac configure.tmp && Exit 1
-
-mv configure.tmp configure.ac
+sed 's/^dnl!! //' < configure.ac > configure.tmp
+cmp configure.ac configure.tmp && Exit 99 # sanity check
+mv -f configure.tmp configure.ac
$MAKE 2>stderr || { cat stderr >&2; Exit 1; }
cat stderr >&2
hooks/post-receive
--
GNU Automake
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-338-gf60e9ae,
Ralf Wildenhues <=