summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rwxr-xr-xtests/badopt.test8
2 files changed, 10 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index d94ee8f1c..d8398ccbc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2010-04-20 Stefano Lattarini <stefano.lattarini@gmail.com>
+ Make test badopt.test stricter (by enabling `set -e').
+ * tests/badopt.test: Add call to `set -e'. Due to this change,
+ an unexpected failure in the call to `$ACLOCAL' (whose outcome
+ was previously unchecked) would cause the whole test to fail.
+ Also, bumped the copyright years.
+
Make test for configure.in vs. configure.ac stricter.
* tests/configure.test: Use a configure.in file that provokes
an automake error, to ensure configure.ac is preferred.
diff --git a/tests/badopt.test b/tests/badopt.test
index 59eb5fa32..2da53e99d 100755
--- a/tests/badopt.test
+++ b/tests/badopt.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1998, 2002, 2003 Free Software Foundation, Inc.
+# Copyright (C) 1998, 2002, 2003, 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,9 +18,9 @@
. ./defs || Exit 1
-cat > Makefile.am << 'END'
-AUTOMAKE_OPTIONS = zardoz
-END
+set -e
+
+echo 'AUTOMAKE_OPTIONS = zardoz' > Makefile.am
$ACLOCAL
AUTOMAKE_fails