Tests: normalize use of the 'errexit' shell flag.

* tests/maken3.test (check_targets): Remove redundant call to
'set -e'.
* tests/maken4.test: Likewise.
* tests/ansi5.test: Call 'set -e' just after './defs' has been
sourced.
* tests/ansi6.test: Likewise.
* tests/ansi7.test: Likewise.
* tests/cond16.test: Likewise.
* tests/cond17.test: Likewise.
* tests/cond18.test: Likewise.
* tests/cond19.test: Likewise.
* tests/cond20.test: Likewise.
* tests/cond21.test: Likewise.
* tests/instdat2.test: Likewise.
* tests/instdir-texi.test: Likewise.
* tests/parallel-tests3.test: Likewise.
* tests/remake1a.test: Likewise.
* tests/ccnoco.test: Likewise, and add trailing `:' command.
* tests/comment4.test: Likewise.
* tests/gcj4.test: Likewise.
* tests/nodist2.test: Likewise.
* tests/nodist3.test: Enable 'errexit' shell flag (this should
have been done in commit v1.11-248-g317e17b, but the relevant
hunk has been forgotten somehow).
* tests/output.test: Likewise.
* tests/gnits2.test: Likewise, and display captured stderr to
script's stderr, not to script's stdout.
* tests/gnits3.test: Likewise.  Also, prefer 'cat' over 'echo'
to append to Makefile.am, and really check that the exit status
of "make installcheck" indicates failure.

diff --git a/ChangeLog b/ChangeLog
index 472dc557855a10b0179e044b1e6aed5cd88df3ea..496e1cde5ed445fdfa34f2377bfbeae99c26e79e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,37 @@
+2010-01-03  Stefano Lattarini  <stefano.lattarini@gmail.com>
+
+       Tests: normalize use of the 'errexit' shell flag.
+       * tests/maken3.test (check_targets): Remove redundant call to
+       'set -e'.
+       * tests/maken4.test: Likewise.
+       * tests/ansi5.test: Call 'set -e' just after './defs' has been
+       sourced.
+       * tests/ansi6.test: Likewise.
+       * tests/ansi7.test: Likewise.
+       * tests/cond16.test: Likewise.
+       * tests/cond17.test: Likewise.
+       * tests/cond18.test: Likewise.
+       * tests/cond19.test: Likewise.
+       * tests/cond20.test: Likewise.
+       * tests/cond21.test: Likewise.
+       * tests/instdat2.test: Likewise.
+       * tests/instdir-texi.test: Likewise.
+       * tests/parallel-tests3.test: Likewise.
+       * tests/remake1a.test: Likewise.
+       * tests/ccnoco.test: Likewise, and add trailing `:' command.
+       * tests/comment4.test: Likewise.
+       * tests/gcj4.test: Likewise.
+       * tests/nodist2.test: Likewise.
+       * tests/nodist3.test: Enable 'errexit' shell flag (this should
+       have been done in commit v1.11-248-g317e17b, but the relevant
+       hunk has been forgotten somehow).
+       * tests/output.test: Likewise.
+       * tests/gnits2.test: Likewise, and display captured stderr to
+       script's stderr, not to script's stdout.
+       * tests/gnits3.test: Likewise.  Also, prefer 'cat' over 'echo'
+       to append to Makefile.am, and really check that the exit status
+       of "make installcheck" indicates failure.
+
 2011-01-02  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
        Sync auxiliary files from upstream.

diff --git a/tests/ansi5.test b/tests/ansi5.test
index 2652cb7ab7bb7182008e92f272709eb44af4c921..1e3b21c59ce0d73217badf27b6f4003ead31195a 100755 (executable)
--- a/tests/ansi5.test
+++ b/tests/ansi5.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2001, 2002, 2003  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2011 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 @@
 required=gcc
 . ./defs || Exit 1
 
+set -e
+
 cat > configure.in << 'END'
 AC_INIT(one/joe.c)
 AM_INIT_AUTOMAKE(liver, 0.23)
@@ -63,8 +65,6 @@ main (int argc, char *argv[])
 }
 END
 
-set -e
-
 $ACLOCAL
 $AUTOCONF
 $AUTOMAKE -a

diff --git a/tests/ansi6.test b/tests/ansi6.test
index 10196ea1239263bd8a8480862b1817a7018e9973..76f4d22d78ec2b7b56345f3a6f3db1ab5ee75d05 100755 (executable)
--- a/tests/ansi6.test
+++ b/tests/ansi6.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2002, 2006, 2008  Free Software Foundation, Inc.
+# Copyright (C) 2002, 2006, 2008, 2011 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
@@ -20,6 +20,8 @@
 required=gcc
 . ./defs || Exit 1
 
+set -e
+
 cat > configure.in << 'END'
 AC_INIT(ansi6, 1.0)
 AM_INIT_AUTOMAKE
@@ -58,8 +60,6 @@ foo ()
 }
 END
 
-set -e
-
 $ACLOCAL
 $AUTOCONF
 $AUTOMAKE -a

diff --git a/tests/ansi7.test b/tests/ansi7.test
index e97f517441eed676334fefef8c735df64129c76e..2524d33f37a0e827f3b6fa9abbcd3663102f0c40 100755 (executable)
--- a/tests/ansi7.test
+++ b/tests/ansi7.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2002, 2008  Free Software Foundation, Inc.
+# Copyright (C) 2002, 2008, 2011 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
@@ -21,6 +21,8 @@
 required=gcc
 . ./defs || Exit 1
 
+set -e
+
 cat > configure.in << 'END'
 AC_INIT(ansi6, 1.0)
 AM_INIT_AUTOMAKE
@@ -60,8 +62,6 @@ foo ()
 }
 END
 
-set -e
-
 $ACLOCAL
 $AUTOCONF
 $AUTOMAKE -a

diff --git a/tests/ccnoco.test b/tests/ccnoco.test
index d6ed136e46b322d320a8cddc37f451598863ed17..d7c0360de77d3a0759c27a311164341a4531b2cc 100755 (executable)
--- a/tests/ccnoco.test
+++ b/tests/ccnoco.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2001, 2002, 2008  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2008, 2011 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
@@ -20,6 +20,8 @@
 required=gcc
 . ./defs || Exit 1
 
+set -e
+
 cat > configure.1 << 'END'
 AC_INIT(a.c)
 AM_INIT_AUTOMAKE(nonesuch, 0.23)
@@ -68,9 +70,6 @@ END
 
 chmod +x Mycomp
 
-set -e
-
-
 # Ignore user CFLAGS.
 CFLAGS=
 export CFLAGS
@@ -95,3 +94,5 @@ for conf in configure.1 configure.3; do
 
    cd ..
 done
+
+:

diff --git a/tests/comment4.test b/tests/comment4.test
index f6e6a3f482ea2e8f6400d367469577da49bf3f7c..6f3f8cc40f276756e1b9e91e998e9d1f5c66fa2b 100755 (executable)
--- a/tests/comment4.test
+++ b/tests/comment4.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2002  Free Software Foundation, Inc.
+# Copyright (C) 2002, 2011 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 <<'EOF'
 AC_OUTPUT
 EOF
@@ -29,7 +31,6 @@ cat > Makefile.am << 'EOF'
 mumble = UnIqUe_MUMBLE_VALUE
 EOF
 
-set -e
 $ACLOCAL
 $AUTOMAKE
 # UnIqUe_COPYRIGHT_BOILERPLATE should appear near the top of the file

diff --git a/tests/cond16.test b/tests/cond16.test
index 467b7185aa5d1825adb11b6309777d07452a5eb0..24f18df50b9aea5d907f20e9733c935c1ebee220 100755 (executable)
--- a/tests/cond16.test
+++ b/tests/cond16.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2001, 2002  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2011 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
@@ -20,6 +20,8 @@
 required=gcc
 . ./defs || Exit 1
 
+set -e
+
 cat > configure.in << 'END'
 AC_INIT(hello.c)
 AM_INIT_AUTOMAKE(hello,0.23)
@@ -51,8 +53,6 @@ END
 CFLAGS=
 export CFLAGS
 
-set -e
-
 $ACLOCAL
 $AUTOCONF
 $AUTOMAKE -a

diff --git a/tests/cond17.test b/tests/cond17.test
index 7368d9a12658024c497d4d348de826bc539f7377..962dec33b29089d056c4e8bf6337351c5d4a8bff 100755 (executable)
--- a/tests/cond17.test
+++ b/tests/cond17.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2001, 2002  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2011 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
@@ -20,6 +20,8 @@
 
 . ./defs || Exit 1
 
+set -e
+
 cat > configure.in << 'END'
 AC_INIT(Makefile.am)
 AM_INIT_AUTOMAKE(hello,0.23)
@@ -38,7 +40,5 @@ helldl_SOURCES = foo.c
 endif
 END
 
-set -e
-
 $ACLOCAL
 $AUTOMAKE -a

diff --git a/tests/cond18.test b/tests/cond18.test
index 3119658580544c4a670c0c6329d829854aaa5ede..c4ebed2dbe9d63cd30221976a82198042802d226 100755 (executable)
--- a/tests/cond18.test
+++ b/tests/cond18.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2001, 2002  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2011 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
@@ -20,6 +20,8 @@
 required='GNUmake gcc'
 . ./defs || Exit 1
 
+set -e
+
 cat > configure.in << 'END'
 AC_INIT(Makefile.am)
 AM_INIT_AUTOMAKE(hello,0.23)
@@ -57,8 +59,6 @@ END
 CFLAGS=
 export CFLAGS
 
-set -e
-
 $ACLOCAL
 $AUTOCONF
 $AUTOMAKE -a

diff --git a/tests/cond19.test b/tests/cond19.test
index 14dfb51d9b8c411bde5ec296ce79de4c9117cb62..93545e0313def26c25b15662d3569fbf3e1fd35c 100755 (executable)
--- a/tests/cond19.test
+++ b/tests/cond19.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2001, 2002  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2011 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
@@ -20,6 +20,8 @@
 required='GNUmake gcc'
 . ./defs || Exit 1
 
+set -e
+
 cat > configure.in << 'END'
 AC_INIT(Makefile.am)
 AM_INIT_AUTOMAKE(hello,0.23)
@@ -59,8 +61,6 @@ END
 CFLAGS=
 export CFLAGS
 
-set -e
-
 $ACLOCAL
 $AUTOCONF
 $AUTOMAKE -a

diff --git a/tests/cond20.test b/tests/cond20.test
index d0557e5eeefbd2cec5ac4860b26a3e9a92e00492..8e16e9f0f14081425c7ff63943ab7be7abc76284 100755 (executable)
--- a/tests/cond20.test
+++ b/tests/cond20.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2001, 2002, 2003  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2011 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 > configure.in << 'END'
 AC_INIT(Makefile.am)
 AM_INIT_AUTOMAKE(hello,0.23)
@@ -42,8 +44,6 @@ helldl_SOURCES = $(var2)
 bin_PROGRAMS = helldl
 END
 
-set -e
-
 $ACLOCAL
 $AUTOCONF
 AUTOMAKE_fails -a

diff --git a/tests/cond21.test b/tests/cond21.test
index 160c76f0cbbee516378da0cbcfbce0db7d058098..37b6b6f39e0966bbb445fae7076556ec19e3e429 100755 (executable)
--- a/tests/cond21.test
+++ b/tests/cond21.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2002, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2002, 2005, 2011 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'
 AC_PROG_CC
 AM_CONDITIONAL(COND1, true)
@@ -66,8 +68,6 @@ test:
        @echo FOO: $(FOO) :FOO
 END
 
-set -e
-
 $ACLOCAL
 $AUTOCONF
 $AUTOMAKE -a

diff --git a/tests/gcj4.test b/tests/gcj4.test
index f3828ea42f16aa45540880a532d1b293f83591b4..b7e14ab27e30d6bd84811e81524e3d1084b933c7 100755 (executable)
--- a/tests/gcj4.test
+++ b/tests/gcj4.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2002, 2007  Free Software Foundation, Inc.
+# Copyright (C) 2002, 2007, 2011 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 @@
 required=gcj
 . ./defs || Exit 1
 
+set -e
+
 cat >> configure.in << 'END'
 AM_PROG_GCJ
 AC_OUTPUT
@@ -29,8 +31,6 @@ bin_PROGRAMS = convert
 convert_SOURCES = convert.java
 END
 
-set -e
-
 $ACLOCAL
 $AUTOCONF
 $AUTOMAKE
@@ -47,3 +47,5 @@ test `wc -l < filt` = 1
 # Accept any outcome but `none'
 # (at the time of writing it should be gcc or gcc3).
 grep -v none filt
+
+:

diff --git a/tests/gnits2.test b/tests/gnits2.test
index 4c5d54feb4cf163244a90a6a5796e9e3ba1b070b..bb6abaaadbc9b60815d5e5d3b35f83cf76f028c8 100755 (executable)
--- a/tests/gnits2.test
+++ b/tests/gnits2.test
@@ -1,5 +1,6 @@
 #! /bin/sh
-# Copyright (C) 2002, 2003, 2004, 2007  Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2004, 2007, 2011 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=gcc
 . ./defs || Exit 1
 
+set -e
+
 cat >> configure.in << 'END'
 AC_PROG_CC
 AC_OUTPUT
@@ -90,8 +93,6 @@ chmod +x sub/scriptnok.sh
 # (alpha.test checks the case where it must be distributed.)
 : > README-alpha
 
-set -e
-
 $ACLOCAL
 $AUTOCONF
 $AUTOMAKE -a
@@ -106,5 +107,7 @@ cd build
 $MAKE all
 $MAKE test-install
 $MAKE -k installcheck 2>stderr || : # Never trust the exit status of make -k.
-cat stderr
+cat stderr >&2
 $MAKE grep-stderr
+
+:

diff --git a/tests/gnits3.test b/tests/gnits3.test
index 7a08fb852e69db8f3f94a6004ef02b11fa72e2c7..32246521b1aab06010441a533479c7f9942bf88b 100755 (executable)
--- a/tests/gnits3.test
+++ b/tests/gnits3.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2002, 2007  Free Software Foundation, Inc.
+# Copyright (C) 2002, 2007, 2011 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 @@
 required=gcc
 . ./defs || Exit 1
 
+set -e
+
 cat >> configure.in << 'END'
 AC_PROG_CC
 AC_OUTPUT
@@ -70,8 +72,6 @@ chmod +x sub/nok.sh
 : > ChangeLog
 : > THANKS
 
-set -e
-
 $ACLOCAL
 $AUTOCONF
 $AUTOMAKE -a
@@ -83,14 +83,19 @@ cd build
 ../configure "--prefix=`pwd`/../inst-dir" --program-prefix=p
 $MAKE
 $MAKE install
+$MAKE installcheck && Exit 1
 $MAKE -k installcheck 2>stderr || : # Never trust the exit status of make -k.
-cat stderr
+cat stderr >&2
 $MAKE grep-stderr
 
 # Make sure there is no more error when all targets are exempted.
 cd ..
-echo 'AM_INSTALLCHECK_STD_OPTIONS_EXEMPT += sub/nok$(EXEEXT) sub/nok.sh' >> Makefile.am
+cat >> Makefile.am <<'END'
+AM_INSTALLCHECK_STD_OPTIONS_EXEMPT += sub/nok$(EXEEXT) sub/nok.sh
+END
 $AUTOMAKE
 cd build
 ./config.status  # Don't rely on the rebuild rules (they need GNU make).
 $MAKE installcheck
+
+:

diff --git a/tests/instdat2.test b/tests/instdat2.test
index 966f0cf69bee60f571ef703f375bc883a86ecf5e..c63739789608162cd5f08ed700ac1bc039ca17cf 100755 (executable)
--- a/tests/instdat2.test
+++ b/tests/instdat2.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2001, 2002  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2011 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 << 'EOF'
 # User directories.
 inclexecdir = $(exec_prefix)/include
@@ -62,7 +64,6 @@ pkgdata_SCRIPTS = script
 ##pkginclude_SCRIPTS = script
 EOF
 
-set -e
 $ACLOCAL || Exit 1
 $AUTOMAKE
 

diff --git a/tests/instdir-texi.test b/tests/instdir-texi.test
index 50617c8b15f5be4dfc14504cff9c2efe6afd429d..b3e3c8463aabeafe0ea8da362b76db3ddee8a16a 100755 (executable)
--- a/tests/instdir-texi.test
+++ b/tests/instdir-texi.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2009  Free Software Foundation, Inc.
+# Copyright (C) 2009, 2011 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
@@ -20,12 +20,12 @@
 required='makeinfo-html tex texi2dvi'
 . ./defs || Exit 1
 
+set -e
+
 (dvips --help 2>/dev/null >/dev/null) || Exit 77
 (pdfetex --help 2>/dev/null >/dev/null) ||
   (pdftex --help 2>/dev/null >/dev/null) || Exit 77
 
-set -e
-
 cat >>configure.in <<'END'
 AC_OUTPUT
 END
@@ -67,4 +67,5 @@ $MAKE -e uninstall > stdout || { cat stdout; Exit 1; }
 cat stdout
 grep 'rm -f' stdout && Exit 1
 $MAKE -e uninstall DESTDIR="$destdir"
+
 :

diff --git a/tests/maken3.test b/tests/maken3.test
index b839d0da92f752fbf5e57513046dde98eb1c9a28..a3768bd6556f5d95d00c26e8376df6f5e2b436d1 100755 (executable)
--- a/tests/maken3.test
+++ b/tests/maken3.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2009  Free Software Foundation, Inc.
+# Copyright (C) 2009, 2011 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
@@ -122,7 +122,6 @@ $AUTOCONF
 
 check_targets ()
 {
-  set -e
   for target in \
     all install install-strip uninstall clean distclean check \
     info html dvi pdf ps \

diff --git a/tests/maken4.test b/tests/maken4.test
index ae5ce27e2f30d540b4af71eabc5c11ca4b3720c3..09aba676bea7f04a0da0ea57f70e780f007f5b5d 100755 (executable)
--- a/tests/maken4.test
+++ b/tests/maken4.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2009  Free Software Foundation, Inc.
+# Copyright (C) 2009, 2011 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
@@ -124,7 +124,6 @@ $AUTOCONF
 
 check_targets ()
 {
-  set -e
   for target in \
     all install install-strip uninstall clean distclean check \
     info html dvi pdf ps \

diff --git a/tests/nodist2.test b/tests/nodist2.test
index 3d9e6ce88aa38df19c9ecde4f6f1e40dc0e8b21a..4c875b14a4ed28a2fecd96f02affb1c2e112b1d8 100755 (executable)
--- a/tests/nodist2.test
+++ b/tests/nodist2.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2001, 2002, 2007  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2007, 2011 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 >> configure.in <<'EOF'
 AC_OUTPUT
 EOF
@@ -29,10 +31,10 @@ EOF
 
 : > baz.h
 
-set -e
-
 $ACLOCAL
 $AUTOCONF
 $AUTOMAKE -a
 ./configure --prefix "`pwd`/install"
 $MAKE install-data
+
+:

diff --git a/tests/nodist3.test b/tests/nodist3.test
index c5470e739cf708c498dc833fa99576c529a86ca8..ec21eaf94b52f509e44cecf4df3c33906cc31c57 100755 (executable)
--- a/tests/nodist3.test
+++ b/tests/nodist3.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2003, 2004, 2010 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2010, 2011 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'
 AC_PROG_CC
 END

diff --git a/tests/output.test b/tests/output.test
index 3931fc54e3b077bd9404fbf60c7592a84a432f8a..ad29300a0071ea638ca99ab811fb7e94c9d83c1d 100755 (executable)
--- a/tests/output.test
+++ b/tests/output.test
@@ -1,6 +1,6 @@
 #! /bin/sh
-# Copyright (C) 1996, 2000, 2001, 2002, 2010 Free Software Foundation,
-# Inc.
+# Copyright (C) 1996, 2000, 2001, 2002, 2010, 2011 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 > configure.in <<END
 AC_INIT([$me], [1.0])
 AM_INIT_AUTOMAKE

diff --git a/tests/parallel-tests3.test b/tests/parallel-tests3.test
index a138f908a781fc424e21d166bfef40cf45c3138e..210be57ee52ff31affec7e823ed3713f0d002b2b 100755 (executable)
--- a/tests/parallel-tests3.test
+++ b/tests/parallel-tests3.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2009, 2010  Free Software Foundation, Inc.
+# Copyright (C) 2009, 2010, 2011 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
@@ -21,13 +21,13 @@ parallel_tests=yes
 required=GNUmake
 . ./defs || Exit 1
 
+set -e
+
 # This test does not work well if $MAKE contains -j.
 case $MAKE in
 *\ -j*) Exit 77 ;;
 esac
 
-set -e
-
 cat >> configure.in << 'END'
 AC_OUTPUT
 END

diff --git a/tests/remake1a.test b/tests/remake1a.test
index ce80c19609ae4fd764a9a0339a524e544659e194..ec8c64146f7799f061e1b8d015227356bcaf9227 100755 (executable)
--- a/tests/remake1a.test
+++ b/tests/remake1a.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2010 Free Software Foundation, Inc.
+# Copyright (C) 2010, 2011 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,10 +19,10 @@
 
 . ./defs || Exit 1
 
-fingerprint='=/FiNgErPrInT/='
-
 set -e
 
+fingerprint='=/FiNgErPrInT/='
+
 cat > configure.in <<END
 AC_INIT([$me], [1.0])
 AM_INIT_AUTOMAKE