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.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

diff --git a/ChangeLog b/ChangeLog
index a42f6f5be4a70e4985d073d97c20b6c744bd0cb1..45fddf4b0ed9e9cf7b5a0c16482ca656919f7b17 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-06-06  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       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  <stefano.lattarini@gmail.com>
 
        Improve tests link*.test (enable `errexit' shell flag).

diff --git a/tests/ldadd.test b/tests/ldadd.test
index 005f9d8d5bedf2f2668f5837197d600ae077f767..7f4fce89a7e9c580bd20c2482b952984f98b72a7 100755 (executable)
--- 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 704b393f86435157a86b3241172048e1468bacdc..92a736f9810a6b9947a4c5d1e3aafc2247908692 100755 (executable)
--- 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