From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Sun, 6 Jun 2010 15:02:56 +0000 (+0200)
Subject: Prefer AUTOMAKE_fails over `$AUTOMAKE | grep' in tests.
X-Git-Tag: v1.11.1b~79^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e3c82b94ea7dbfef8ec6eb7a689a77a8a6cd7e1f;p=thirdparty%2Fautomake.git

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 a42f6f5be..45fddf4b0 100644
--- 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 005f9d8d5..7f4fce89a 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 704b393f8..92a736f98 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