[Automake-commit] [SCM] GNU Automake branch, testsuite-work, updated. v1.11-824-g968fb0e

[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=968fb0e9528f1bf106838a1d8ca1219fa385df99

The branch, testsuite-work has been updated
       via  968fb0e9528f1bf106838a1d8ca1219fa385df99 (commit)
       via  be569feaa4dcf1eb2b906f730a57fcd1df8ad508 (commit)
       via  6bf2c888e0eeb7db4da4b50eefe055ba8b3060f4 (commit)
       via  b96d850ae6e35ecc96babc232aa7622adeece0ee (commit)
      from  8061d84e54c81305fa3ad22e20de9726bec82909 (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 968fb0e9528f1bf106838a1d8ca1219fa385df99
Merge: 8061d84 be569fe
Author: Stefano Lattarini <address@hidden>
Date:   Tue May 3 19:23:31 2011 +0200

    Merge branch 'master' into testsuite-work

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

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 24e2428..2ad40b9 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>
+
        maintcheck: consistency of list of test scripts
        * CheckListOfTests.am: New file.
        (maintainer-check-list-of-tests): New target,
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 26ee87e..f51fb2c 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -653,6 +653,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 98b5827..fd98415 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -914,6 +914,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 39d64b0..ad8e2ec 100755
--- a/tests/libtool7.test
+++ b/tests/libtool7.test
@@ -78,7 +78,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
@@ -86,12 +89,18 @@ 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 99e16ce..b025719 100755
--- a/tests/libtool9.test
+++ b/tests/libtool9.test
@@ -86,7 +86,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