Avoid possible false negatives in cond46.test.

* tests/cond46.test: Enable shell `errexit' flag (and bumped
copyright years).  Due to this change, the testcase should now
fail on unexpected failures in calls to $ACLOCAL/$AUTOMAKE (whose
outcomes were previously unchecked), and on failures in grepping
the expected diagnostic in Automake stderr.

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

diff --git a/ChangeLog b/ChangeLog
index a5b5426..f1e3958 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2010-04-11  Stefano Lattarini  <stefano.lattarini@gmail.com>
+
+       Avoid possible false negatives in cond46.test.
+       * tests/cond46.test: Enable shell `errexit' flag (and bumped
+       copyright years).  Due to this change, the testcase should now
+       fail on unexpected failures in calls to $ACLOCAL/$AUTOMAKE (whose
+       outcomes were previously unchecked), and on failures in grepping
+       the expected diagnostic in Automake stderr.
+
 2010-04-04  Stefano Lattarini  <stefano.lattarini@gmail.com>
 
        Generated tests are now just a thin layer around other tests.

diff --git a/tests/cond46.test b/tests/cond46.test
index 73b6e94..0b8696c 100755 (executable)
--- a/tests/cond46.test
+++ b/tests/cond46.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2009 Free Software Foundation, Inc.
+# Copyright (C) 2009, 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 +18,8 @@
 
 . ./defs || Exit 1
 
+set -e
+
 cat >> configure.in << 'END'
 AM_CONDITIONAL([USE_A],[test x = y])
 AM_CONDITIONAL([USE_B],[test x = z])
@@ -106,5 +108,3 @@ endif
 END
 
 $AUTOMAKE
-
-Exit 0