[Automake-commit] [SCM] GNU Automake branch, test-protocols, updated. v1.11-989-gb9dfd77

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

The branch, test-protocols has been updated
       via  b9dfd77aa5be5a91bfc82ce398d27e8266733554 (commit)
       via  17ca784b023de76b5fdb2baa50a10982dcb16854 (commit)
       via  142dab55025486e30985177a814e8c50f6a78c05 (commit)
       via  d9e4f1ec7d87ed96bb663c883ee3dd96e56affa9 (commit)
       via  232dcc6d2e6c80af70eb72964bfa2c0f08b9de80 (commit)
      from  a0cd0d4b41b7495d2b8b82c7e8d70a1a07664239 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                               |   17 +++++++++++++++++
 lib/Automake/tests/Makefile.in          |    4 ++--
 lib/am/check.am                         |    4 ++--
 tests/Makefile.in                       |    4 ++--
 tests/distcheck-configure-flags-am.test |    6 ++++--
 tests/test-trs-basic.test               |    4 ++--
 6 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5330296..96cf400 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,22 @@
 2011-08-08  Stefano Lattarini  <address@hidden>
 
+       tests: fix spurious failure with Solaris make
+       * tests/distcheck-configure-flags-am.test: Avoid using `+=' too
+       liberally with AM_DISTCHECK_CONFIGURE_FLAGS, since the line breaks
+       so introduced, in conjunction with single quotes, might confuse
+       Solaris make.
+
+2011-08-08  Stefano Lattarini  <address@hidden>
+
+       test harness: fixlet in workaround for VPATH rewrite issue
+       Fixes a minor in previous commit `v1.11-983-gfda3de5'.
+       * lib/am/check.am (am__set_TESTS_bases): Add forgotten end-of-line
+       anchor to sed expression.  In comments, add reference to ...
+       * tests/test-trs-basic.test: ... this test, which has been adapted
+       and tightened (and tweaked).
+
+2011-08-08  Stefano Lattarini  <address@hidden>
+
        test harness: work around a VPATH rewrite issue
        * lib/am/check.am (am__TEST_BASES): Removed, it's role taken
        over by ...
diff --git a/lib/Automake/tests/Makefile.in b/lib/Automake/tests/Makefile.in
index 642e7b7..7825d10 100644
--- a/lib/Automake/tests/Makefile.in
+++ b/lib/Automake/tests/Makefile.in
@@ -161,10 +161,10 @@ $(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT)
 # `$bases'.  This honors runtime overriding of TESTS and TEST_LOGS.  Sadly,
 # we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)",
 # since that might cause problem with VPATH rewrites for suffix-less tests.
-# See also 'test-harness-vpath-rewrite.test'.
+# See also 'test-harness-vpath-rewrite.test' and 'test-trs-basic.test'.
 am__set_TESTS_bases = \
   bases='$(TEST_LOGS)'; \
-  bases=`for f in $$bases; do echo $$f; done | sed 's/\.log//'`; \
+  bases=`for f in $$bases; do echo $$f; done | sed 's/\.log$$//'`; \
   bases=`echo $$bases`
 # This can be used instead of $(MAKE) in recipes requiring a recursive call
 # to make, but which are not intended to be executed by "make -n".  See the
diff --git a/lib/am/check.am b/lib/am/check.am
index 035b4c1..a6dcc30 100644
--- a/lib/am/check.am
+++ b/lib/am/check.am
@@ -110,10 +110,10 @@ $(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT)
 # `$bases'.  This honors runtime overriding of TESTS and TEST_LOGS.  Sadly,
 # we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)",
 # since that might cause problem with VPATH rewrites for suffix-less tests.
-# See also 'test-harness-vpath-rewrite.test'.
+# See also 'test-harness-vpath-rewrite.test' and 'test-trs-basic.test'.
 am__set_TESTS_bases = \
   bases='$(TEST_LOGS)'; \
-  bases=`for f in $$bases; do echo $$f; done | sed 's/\.log//'`; \
+  bases=`for f in $$bases; do echo $$f; done | sed 's/\.log$$//'`; \
 ## Trim away any extra whitespace.  This has already proved useful in
 ## avoiding weird bug on lesser make implementations.
   bases=`echo $$bases`
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 1372a0f..7610af2 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -166,10 +166,10 @@ $(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT)
 # `$bases'.  This honors runtime overriding of TESTS and TEST_LOGS.  Sadly,
 # we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)",
 # since that might cause problem with VPATH rewrites for suffix-less tests.
-# See also 'test-harness-vpath-rewrite.test'.
+# See also 'test-harness-vpath-rewrite.test' and 'test-trs-basic.test'.
 am__set_TESTS_bases = \
   bases='$(TEST_LOGS)'; \
-  bases=`for f in $$bases; do echo $$f; done | sed 's/\.log//'`; \
+  bases=`for f in $$bases; do echo $$f; done | sed 's/\.log$$//'`; \
   bases=`echo $$bases`
 # This can be used instead of $(MAKE) in recipes requiring a recursive call
 # to make, but which are not intended to be executed by "make -n".  See the
diff --git a/tests/distcheck-configure-flags-am.test 
b/tests/distcheck-configure-flags-am.test
index a5cab6a..dc31ee3 100755
--- a/tests/distcheck-configure-flags-am.test
+++ b/tests/distcheck-configure-flags-am.test
@@ -32,7 +32,9 @@ END
 unset sentence || :
 
 cat > Makefile.am << 'END'
-AM_DISTCHECK_CONFIGURE_FLAGS = --enable-success sentence='it works :-)'
+AM_DISTCHECK_CONFIGURE_FLAGS = $(dc_flags1) $(dc_flags2)
+dc_flags1 = --enable-success sentence='it works :-)'
+dc_flags2 =
 END
 
 $ACLOCAL
@@ -54,7 +56,7 @@ $MAKE distcheck
 # $(AM_DISTCHECK_CONFIGURE_FLAGS)
 
 cat >> Makefile.am << 'END'
-AM_DISTCHECK_CONFIGURE_FLAGS += --disable-success
+dc_flags2 += --disable-success
 END
 $AUTOMAKE Makefile
 ./config.status Makefile
diff --git a/tests/test-trs-basic.test b/tests/test-trs-basic.test
index a9c34a5..8a8c3c8 100755
--- a/tests/test-trs-basic.test
+++ b/tests/test-trs-basic.test
@@ -72,8 +72,8 @@ for vpath in : false; do
   test x"`cat tb`" = x"foo bar sub/zardoz"
   rm -f tb
   # Please don't change the order of the stuff in TESTS, below.
-  TESTS='a foo.test foo2.sh foo3 foo.log foo-log foolog b.exe' $MAKE -e tb
-  test x"`cat tb`" = x"a foo foo2 foo3 foo.log foo-log foolog b.exe"
+  TESTS='foo.test foo2.sh foo-log foolog.test a.log.b.sh 0.exe' $MAKE -e tb
+  test x"`cat tb`" = x"foo foo2 foo-log foolog a.log.b 0.exe"
   rm -f tb
 
   cd $srcdir


hooks/post-receive
-- 
GNU Automake