summaryrefslogtreecommitdiff
path: root/tests/block.test
diff options
context:
space:
mode:
authorStefano Lattarini <stefano.lattarini@gmail.com>2010-06-11 17:19:20 +0200
committerRalf Wildenhues <Ralf.Wildenhues@gmx.de>2010-06-12 12:26:20 +0200
commitc1f6cdbdb3ef89d2f6a23e5b9d87baeba73b2735 (patch)
tree1c360da438faf9b42d4d287ab8d17fd5f5a21124 /tests/block.test
parent12e9334a5eac926a69e30979118954ec3eee1781 (diff)
downloadautomake-c1f6cdbdb3ef89d2f6a23e5b9d87baeba73b2735.tar.gz
Enable `errexit' shell flag in various tests.
* tests/backsl.test: Enable the `errexit' shell flag, and related changes. * tests/backsl2.test: Likewise. * tests/block.test: Likewise. * tests/canon2.test: Likewise. * tests/canon4.test: Likewise. * tests/comment2.test: Likewise. * tests/condlib.test: Likewise. * tests/cond15.test: Likewise, and prefer $FGREP over grep. * tests/canon3.test: Likewise. Also, avoid to create an useless dummy source file. * tests/acoutpt2.test: Enable the `errexit' shell flag, and some related changes. Do some cosmetic improvements in the generated `configure.in' file. * tests/cond4.test: Likewise. * tests/cond14.test: Likewise. * tests/condinc.test: Likewise. * tests/cond7.test: Likewise. Also, remove useless setting of AUTOMAKE_OPTIONS to `foreign' in the generated Makefile.am. * tests/ansi.test: Enable the `errexit' shell flag, and related changes. Extended, esp. by running autoconf, ./configure and make, and by looking into the distdir. Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Diffstat (limited to 'tests/block.test')
-rwxr-xr-xtests/block.test8
1 files changed, 5 insertions, 3 deletions
diff --git a/tests/block.test b/tests/block.test
index 8b4692ac0..862389eb0 100755
--- a/tests/block.test
+++ b/tests/block.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996, 2001, 2002 Free Software Foundation, Inc.
+# Copyright (C) 1996, 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 +19,8 @@
. ./defs || Exit 1
+set -e
+
cat > Makefile.am << 'END'
#START
#a
@@ -27,8 +29,8 @@ cat > Makefile.am << 'END'
#END
END
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
(sed -e '/^#START/,/^#END/ !d' Makefile.in | grep -v '^#') && Exit 1
Exit 0