[Automake-commit] [SCM] GNU Automake branch, branch-1.11, updated. v1.11.1-99-gfebf8e1

[Ralf Wildenhues]

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=febf8e13c0c571215d7ec0a8424d5e316020fc0c

The branch, branch-1.11 has been updated
       via  febf8e13c0c571215d7ec0a8424d5e316020fc0c (commit)
       via  e3c82b94ea7dbfef8ec6eb7a689a77a8a6cd7e1f (commit)
      from  5b6cbc0fdfdc514237611c6c17c1222726c6dc33 (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 febf8e13c0c571215d7ec0a8424d5e316020fc0c
Merge: 5b6cbc0fdfdc514237611c6c17c1222726c6dc33 
e3c82b94ea7dbfef8ec6eb7a689a77a8a6cd7e1f
Author: Ralf Wildenhues <address@hidden>
Date:   Sun Jun 6 19:41:48 2010 +0200

    Merge branch 'maint' into branch-1.11

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

Summary of changes:
 ChangeLog        |    8 ++++++++
 tests/ldadd.test |    8 ++++++--
 tests/mdate.test |    8 ++++++--
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9e1683d..0be1b15 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-06-06  Ralf Wildenhues  <address@hidden>
+
+       Prefer AUTOMAKE_fails over `$AUTOMAKE | grep' in tests.
+       * tests/ldadd.test: Enable errexit.  Use AUTOMAKE_fails so
+       the verbose log contains all output.
+       * tests/mdate.test: Likewise.
+       Prompted by Stefano Lattarini's change to discover.test.
+
 2010-06-06  Stefano Lattarini  <address@hidden>
 
        Improve tests link*.test (enable `errexit' shell flag).
diff --git a/tests/ldadd.test b/tests/ldadd.test
index 005f9d8..7f4fce8 100755
--- a/tests/ldadd.test
+++ b/tests/ldadd.test
@@ -1,5 +1,6 @@
 #! /bin/sh
-# Copyright (C) 1997, 1999, 2000, 2001, 2002  Free Software Foundation, Inc.
+# Copyright (C) 1997, 1999, 2000, 2001, 2002, 2010 Free Software
+# Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -19,6 +20,8 @@
 required=libtool
 . ./defs || Exit 1
 
+set -e
+
 cat >> configure.in << 'END'
 AC_PROG_CC
 AC_PROG_LIBTOOL
@@ -39,5 +42,6 @@ END
 : > q.c
 
 $ACLOCAL || Exit 1
-$AUTOMAKE 2>&1 | grep LDADD || Exit 1
+AUTOMAKE_fails
+grep LDADD stderr || Exit 1
 Exit 0
diff --git a/tests/mdate.test b/tests/mdate.test
index 704b393..92a736f 100755
--- a/tests/mdate.test
+++ b/tests/mdate.test
@@ -1,5 +1,6 @@
 #!/bin/sh
-# Copyright (C) 1996, 1997, 2001, 2002  Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 2001, 2002, 2010 Free Software Foundation,
+# Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -18,6 +19,8 @@
 
 . ./defs || Exit 1
 
+set -e
+
 cat > Makefile.am << 'END'
 info_TEXINFOS = textutils.texi
 END
@@ -31,4 +34,5 @@ END
 : > texinfo.tex
 
 $ACLOCAL || Exit 1
-$AUTOMAKE 2>&1 > /dev/null | grep 'required file.*mdate-sh'
+AUTOMAKE_fails
+grep 'required file.*mdate-sh' stderr


hooks/post-receive
-- 
GNU Automake