[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-807-gbe569fe

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

The branch, master has been updated
       via  be569feaa4dcf1eb2b906f730a57fcd1df8ad508 (commit)
       via  6bf2c888e0eeb7db4da4b50eefe055ba8b3060f4 (commit)
       via  b96d850ae6e35ecc96babc232aa7622adeece0ee (commit)
      from  96f2b96726cf7049e4026f51df52d352809b32a6 (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 be569feaa4dcf1eb2b906f730a57fcd1df8ad508
Merge: b96d850 6bf2c88
Author: Stefano Lattarini <address@hidden>
Date:   Tue May 3 19:21:28 2011 +0200

    Merge branch 'tests-man-fixes'

commit 6bf2c888e0eeb7db4da4b50eefe055ba8b3060f4
Author: Stefano Lattarini <address@hidden>
Date:   Tue May 3 19:19:13 2011 +0200

    tests: add forgotten test scripts to $(TESTS)
    
    * tests/Makefile.am (TESTS): Added test scripts  man[678].test,
    which have been present on the filesystem and in the repository,
    but which had erroneously been left out from $(TESTS).

commit b96d850ae6e35ecc96babc232aa7622adeece0ee
Author: Stefano Lattarini <address@hidden>
Date:   Tue May 3 18:24:29 2011 +0200

    tests: ensure verbose printing of captured make output
    
    * tests/libtool7.test: Ensure verbose printing of captured
    make output.
    * tests/libtool9.test: Likewise.

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

Summary of changes:
 ChangeLog           |   14 ++++++++++++++
 tests/Makefile.am   |    3 +++
 tests/Makefile.in   |    3 +++
 tests/libtool7.test |   15 ++++++++++++---
 tests/libtool9.test |    2 +-
 5 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a5354c1..bfd90cd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,19 @@
 2011-05-03  Stefano Lattarini  <address@hidden>
 
+       tests: add forgotten test scripts to $(TESTS)
+       * tests/Makefile.am (TESTS): Added test scripts  man[678].test,
+       which have been present on the filesystem and in the repository,
+       but which had erroneously been left out from $(TESTS).
+
+2011-05-03  Stefano Lattarini  <address@hidden>
+
+       tests: ensure verbose printing of captured make output
+       * tests/libtool7.test: Ensure verbose printing of captured
+       make output.
+       * tests/libtool9.test: Likewise.
+
+2011-05-03  Stefano Lattarini  <address@hidden>
+
        tests: fix spurious failure in 'color2.test'
        * tests/color2.test: If $MAKE contains command-line arguments (as
        in e.g., "make -j2"), expect's directive "spawn $env(MAKE)" fails
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 0eba423..1c8e48c 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -635,6 +635,9 @@ man2.test \
 man3.test \
 man4.test \
 man5.test \
+man6.test \
+man7.test \
+man8.test \
 mdate.test \
 mdate2.test \
 mdate3.test \
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 308b2b2..f57d23c 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -900,6 +900,9 @@ man2.test \
 man3.test \
 man4.test \
 man5.test \
+man6.test \
+man7.test \
+man8.test \
 mdate.test \
 mdate2.test \
 mdate3.test \
diff --git a/tests/libtool7.test b/tests/libtool7.test
index afa9b1c..9700628 100755
--- a/tests/libtool7.test
+++ b/tests/libtool7.test
@@ -80,7 +80,10 @@ $AUTOCONF
 $AUTOMAKE --add-missing --copy
 
 ./configure "--prefix=`pwd`/_inst"
-env LIBTOOLFLAGS=--silent $MAKE print >output 2>&1
+env LIBTOOLFLAGS=--silent $MAKE print >output 2>&1 || {
+  cat output
+  Exit 1
+}
 cat output
 grep '1BEG: libmod1.la mod2.la :END1' output
 grep '2BEG: mod2.la :END2' output
@@ -88,11 +91,17 @@ grep '3BEG: .*silent.*silent.* :END3' output
 test 2 -le `grep mod2_la_LIBTOOLFLAGS Makefile | wc -l`
 $MAKE
 
-env LIBTOOLFLAGS=--silent $MAKE install >output 2>&1
+env LIBTOOLFLAGS=--silent $MAKE install >output 2>&1 || {
+  cat output
+  Exit 1
+}
 cat output
 grep 'silent.*silent.*prg' output
 grep 'silent.*silent.*libmod1' output
 
-env LIBTOOLFLAGS=--silent $MAKE uninstall >output 2>&1
+env LIBTOOLFLAGS=--silent $MAKE uninstall >output 2>&1 || {
+  cat output
+  Exit 1
+}
 cat output
 grep 'silent.*silent.*libmod1' output
diff --git a/tests/libtool9.test b/tests/libtool9.test
index ab03f58..46009c1 100755
--- a/tests/libtool9.test
+++ b/tests/libtool9.test
@@ -88,7 +88,7 @@ $AUTOMAKE --add-missing --copy
 ./configure
 env LDFLAGS=ldflags AM_LDFLAGS=am_ldflags libmod1_la_LDFLAGS=lm1_la_ldflags \
     CFLAGS=cflags AM_CFLAGS=am_cflags prg2_CFLAGS=prg2_cflags \
-    $MAKE -e print >output 2>&1
+    $MAKE -e print >output 2>&1 || { cat output; Exit 1; }
 cat output
 grep '1BEG: libmod1.la mod2.la :END1' output
 grep '2BEG: mod2.la :END2' output


hooks/post-receive
-- 
GNU Automake