Enable `errexit' shell flag in various tests.

* tests/acoutnoq.test: Enabled `errexit' shell flag, and related
minor changes.
* tests/acoutpt.test: Likewise.
* tests/acoutqnl.test: Likewise.
* tests/amassign.test: Likewise.
* tests/ansi2.test: Likewise.
* tests/ansi4.test: Likewise.
* tests/badprog.test: Likewise.
* tests/checkall.test: Likewise.
* tests/clean.test: Likewise.
* tests/colneq2.test: Likewise.
* tests/colon.test: Likewise.
* tests/colon5.test: Likewise.
* tests/colon6.test: Likewise.
* tests/comment.test: Likewise.
* tests/compile_f90_c_cxx.test: Likewise.
* tests/compile_f_c_cxx.test: Likewise.
* tests/cond3.test: Likewise.
* tests/cond6.test: Likewise.
* tests/cond13.test: Likewise.
* tests/conf2.test: Likewise.
* tests/confvar.test: Likewise.
* tests/confvar2.test: Likewise.
* tests/cond8.test: Likewise, plus a cosmetic change.
* tests/confh4.test: Likewise.  Also, add in the heading comments
an excerpt from the original bug report which motivated the
creation of this test, to make its purpose clearer.

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

diff --git a/ChangeLog b/ChangeLog
index 653c421041a22f5248e7ed32f7837f353a0d73a3..69a89ff4cb1ab66d09a94ea5cb8d40bf12bcc82e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,34 @@
+2010-06-06  Stefano Lattarini  <stefano.lattarini@gmail.com>
+
+       Enable `errexit' shell flag in various tests.
+       * tests/acoutnoq.test: Enabled `errexit' shell flag, and related
+       minor changes.
+       * tests/acoutpt.test: Likewise.
+       * tests/acoutqnl.test: Likewise.
+       * tests/amassign.test: Likewise.
+       * tests/ansi2.test: Likewise.
+       * tests/ansi4.test: Likewise.
+       * tests/badprog.test: Likewise.
+       * tests/checkall.test: Likewise.
+       * tests/clean.test: Likewise.
+       * tests/colneq2.test: Likewise.
+       * tests/colon.test: Likewise.
+       * tests/colon5.test: Likewise.
+       * tests/colon6.test: Likewise.
+       * tests/comment.test: Likewise.
+       * tests/compile_f90_c_cxx.test: Likewise.
+       * tests/compile_f_c_cxx.test: Likewise.
+       * tests/cond3.test: Likewise.
+       * tests/cond6.test: Likewise.
+       * tests/cond13.test: Likewise.
+       * tests/conf2.test: Likewise.
+       * tests/confvar.test: Likewise.
+       * tests/confvar2.test: Likewise.
+       * tests/cond8.test: Likewise, plus a cosmetic change.
+       * tests/confh4.test: Likewise.  Also, add in the heading comments
+       an excerpt from the original bug report which motivated the
+       creation of this test, to make its purpose clearer.
+
 2010-06-06  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
        Rewrite manual to be gender-neutral.

diff --git a/tests/acoutnoq.test b/tests/acoutnoq.test
index b7bb61609bf5be542394e4cb9a14f85098c6bb46..344905f7484bbb9c64cbcde82e1de27144be5d15 100755 (executable)
--- a/tests/acoutnoq.test
+++ b/tests/acoutnoq.test
@@ -1,5 +1,6 @@
 #!/bin/sh
-# Copyright (C) 1996, 2000, 2001, 2002  Free Software Foundation, Inc.
+# Copyright (C) 1996, 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
@@ -22,6 +23,8 @@
 
 . ./defs || Exit 1
 
+set -e
+
 cat > configure.in << 'END'
 AC_INIT
 AM_INIT_AUTOMAKE(nonesuch, nonesuch)
@@ -30,5 +33,5 @@ END
 
 : > Makefile.am
 
-$ACLOCAL || Exit 1
+$ACLOCAL
 $AUTOMAKE

diff --git a/tests/acoutpt.test b/tests/acoutpt.test
index b0e44ee64dbc7f3b7b807f44c99ed6965d0f858c..e18e4e4498a19d1528e5cb7e3e8f9f3d9a5478ac 100755 (executable)
--- a/tests/acoutpt.test
+++ b/tests/acoutpt.test
@@ -1,5 +1,6 @@
 #!/bin/sh
-# Copyright (C) 1996, 2000, 2001, 2002  Free Software Foundation, Inc.
+# Copyright (C) 1996, 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 @@
 
 . ./defs || Exit 1
 
+set -e
+
 cat > configure.in << 'END'
 AC_INIT
 AM_INIT_AUTOMAKE(nonesuch, nonesuch)
@@ -27,5 +30,5 @@ END
 
 : > Makefile.am
 
-$ACLOCAL || Exit 1
+$ACLOCAL
 $AUTOMAKE

diff --git a/tests/acoutqnl.test b/tests/acoutqnl.test
index 70c5cbc0489af536487705666b9e26701c6b7dcd..75736f2eb47110a7a5ebff1565927fbcea96c8f5 100755 (executable)
--- a/tests/acoutqnl.test
+++ b/tests/acoutqnl.test
@@ -1,5 +1,6 @@
 #! /bin/sh
-# Copyright (C) 1996, 2000, 2001, 2002  Free Software Foundation, Inc.
+# Copyright (C) 1996, 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
@@ -18,6 +19,8 @@
 
 . ./defs || Exit 1
 
+set -e
+
 cat > configure.in << 'END'
 AC_INIT
 AM_INIT_AUTOMAKE(nonesuch, nonesuch)
@@ -27,6 +30,5 @@ END
 
 : > Makefile.am
 
-$ACLOCAL || Exit 1
+$ACLOCAL
 $AUTOMAKE
-

diff --git a/tests/amassign.test b/tests/amassign.test
index 3e411c88913f1b1156d4d8c80c3895431cfe231b..af098d21a8a4f510a7be0abbb2345d13545a1c59 100755 (executable)
--- a/tests/amassign.test
+++ b/tests/amassign.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2001, 2002  Free Software Foundation, Inc.
+# Copyright (C) 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 >> configure.in << 'END'
 AM_CFLAGS=foo
 AC_SUBST(AM_BAR)

diff --git a/tests/ansi2.test b/tests/ansi2.test
index c0409a32f897014faedce599673d03a1f6aec653..77ca2c61692e7261edcaccf027ca0e9e7b8f09f5 100755 (executable)
--- a/tests/ansi2.test
+++ b/tests/ansi2.test
@@ -1,5 +1,6 @@
 #! /bin/sh
-# Copyright (C) 1996, 1997, 1998, 2001, 2002  Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 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'
 AUTOMAKE_OPTIONS = ansi2knr
 bin_PROGRAMS = joe
@@ -31,7 +34,7 @@ END
 : > ansi2knr.c
 : > ansi2knr.1
 
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
 
 grep '^all[-a-z]*:.*ANSI2KNR' Makefile.in

diff --git a/tests/ansi4.test b/tests/ansi4.test
index baff19a6a7de626f4211c8492f15cda052019719..63250a9eca8f0376d7df3d1c27725bfa59983781 100755 (executable)
--- a/tests/ansi4.test
+++ b/tests/ansi4.test
@@ -1,5 +1,6 @@
 #! /bin/sh
-# Copyright (C) 1999, 2001, 2002, 2008  Free Software Foundation, Inc.
+# Copyright (C) 1999, 2001, 2002, 2008, 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 >> configure.in << 'END'
 AC_PROG_CC
 AM_C_PROTOTYPES
@@ -33,7 +36,7 @@ END
 : > ansi2knr.c
 : > hello.c
 
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
 
-$FGREP 'ansi2knr.$(' Makefile.in || Exit 1
+$FGREP 'ansi2knr.$(' Makefile.in

diff --git a/tests/badprog.test b/tests/badprog.test
index b8d45e938a0a4362ce2174c716ec08cdde863226..7a31b3ff739b5f1f4875e8da3ed9e570758804ac 100755 (executable)
--- a/tests/badprog.test
+++ b/tests/badprog.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 >> configure.in << 'END'
 AC_PROG_CC
 END
@@ -28,5 +30,5 @@ bin_PROGRAMS = a,b
 a_b_SOURCES = ab.c
 END
 
-$ACLOCAL || Exit 1
+$ACLOCAL
 $AUTOMAKE

diff --git a/tests/checkall.test b/tests/checkall.test
index 4e7388be6ce67ac6fa25d1f2203939483150403a..7dff8fc183c025a5a116a96cfaad560a02f68625 100755 (executable)
--- a/tests/checkall.test
+++ b/tests/checkall.test
@@ -1,5 +1,6 @@
 #!/bin/sh
-# Copyright (C) 1996, 1997, 1998, 2001, 2002  Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 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,14 +19,16 @@
 
 . ./defs || Exit 1
 
+set -e
+
 cat > Makefile.am << 'END'
 bin_SCRIPTS = derived
 check-local:
        true
 END
 
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
 
-grep '^check-am:.*all-am' Makefile.in || Exit 1
+grep '^check-am:.*all-am' Makefile.in
 grep 'MAKE.*check-local' Makefile.in

diff --git a/tests/clean.test b/tests/clean.test
index df1c1682271b93ab5b1a5c8b7c03cdb322383b2c..23ab2acfc6c812b4bc4e791e0f5fc0889b7948ae 100755 (executable)
--- a/tests/clean.test
+++ b/tests/clean.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 1998, 2001, 2002  Free Software Foundation, Inc.
+# Copyright (C) 1998, 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,9 +18,11 @@
 
 . ./defs || Exit 1
 
+set -e
+
 : > Makefile.am
 
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
 
 grep '^clean-am:.*mostlyclean-am' Makefile.in

diff --git a/tests/colneq2.test b/tests/colneq2.test
index bca83ce95a162f9a10a6e8c68a8298e1f8bcf4e5..e454c46758ac99c1df0d24068d952015672dee9a 100755 (executable)
--- a/tests/colneq2.test
+++ b/tests/colneq2.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
@@ -18,6 +18,8 @@
 
 . ./defs || Exit 1
 
+set -e
+
 cat > Makefile.am << 'END'
 t = a b c
 EXTRA_DIST = $(t:=.test)
@@ -27,5 +29,5 @@ END
 : > b.test
 : > c.test
 
-$ACLOCAL || Exit 1
+$ACLOCAL
 $AUTOMAKE

diff --git a/tests/colon.test b/tests/colon.test
index 2fd0538a38e9bbd99f4a3add0532de21330bdf2c..da7a9da3ee74287d84d4baa17b24928b72e44a65 100755 (executable)
--- a/tests/colon.test
+++ b/tests/colon.test
@@ -1,5 +1,6 @@
 #! /bin/sh
-# Copyright (C) 1996, 2000, 2001, 2002  Free Software Foundation, Inc.
+# Copyright (C) 1996, 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 @@
 
 . ./defs || Exit 1
 
+set -e
+
 cat > configure.in << 'END'
 AC_INIT
 AM_INIT_AUTOMAKE(nonesuch, nonesuch)
@@ -29,5 +32,5 @@ END
 : > foo.hin
 : > stamp-h.in
 
-$ACLOCAL || Exit 1
+$ACLOCAL
 $AUTOMAKE

diff --git a/tests/colon5.test b/tests/colon5.test
index 7813d94061c0e2c1ad27a12ec691c762e1f090cb..fe97f99cea5e3add2c9c65600f9cab7677328425 100755 (executable)
--- a/tests/colon5.test
+++ b/tests/colon5.test
@@ -1,5 +1,6 @@
 #! /bin/sh
-# Copyright (C) 1998, 2000, 2001, 2002  Free Software Foundation, Inc.
+# Copyright (C) 1998, 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
@@ -18,6 +19,8 @@
 
 . ./defs || Exit 1
 
+set -e
+
 cat > configure.in << 'END'
 AC_INIT
 AM_INIT_AUTOMAKE(nonesuch, nonesuch)
@@ -27,7 +30,7 @@ END
 : > Makefile.am
 : > Makefile.dep
 
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
 
 grep 'Makefile:Makefile.in' Makefile.in

diff --git a/tests/colon6.test b/tests/colon6.test
index 5bd9964465dc240b08c1403027b1594801daa006..99877c5f6c9f96d3115dae3ce980122f659044dc 100755 (executable)
--- a/tests/colon6.test
+++ b/tests/colon6.test
@@ -1,5 +1,6 @@
 #! /bin/sh
-# Copyright (C) 1998, 2000, 2001, 2002  Free Software Foundation, Inc.
+# Copyright (C) 1998, 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
@@ -18,6 +19,8 @@
 
 . ./defs || Exit 1
 
+set -e
+
 cat > configure.in << 'END'
 AC_INIT
 AM_INIT_AUTOMAKE(nonesuch, nonesuch)
@@ -29,5 +32,5 @@ mkdir demo
 : > demo/Makefile.am
 : > demo/version.gin
 
-$ACLOCAL || Exit 1
+$ACLOCAL
 $AUTOMAKE

diff --git a/tests/comment.test b/tests/comment.test
index 0051cd038880182b01cc78eb535d37a48f9917ff..761dbf59d793323483c1a6082ffa05f8e4741b87 100755 (executable)
--- a/tests/comment.test
+++ b/tests/comment.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,9 +19,11 @@
 
 . ./defs || Exit 1
 
+set -e
+
 cat > Makefile.am << 'END'
 AUTOMAKE_OPTIONS = #no such option
 END
 
-$ACLOCAL || Exit 1
+$ACLOCAL
 $AUTOMAKE

diff --git a/tests/compile_f90_c_cxx.test b/tests/compile_f90_c_cxx.test
index a685a2986c62bdbc9b76e65abb6f2af5cd7bfde9..21ed65da4276470554755d1ecd076f6edb5be533 100755 (executable)
--- a/tests/compile_f90_c_cxx.test
+++ b/tests/compile_f90_c_cxx.test
@@ -1,5 +1,6 @@
 #! /bin/sh
-# Copyright (C) 1998, 1999, 2001, 2002  Free Software Foundation, Inc.
+# Copyright (C) 1998, 1999, 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
@@ -20,6 +21,8 @@
 
 . ./defs || Exit 1
 
+set -e
+
 cat >> configure.in << 'END'
 AC_PROG_CC
 AC_PROG_CXX
@@ -37,14 +40,13 @@ END
 : > bar.c
 : > baz.cc
 
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
-
+$ACLOCAL
+$AUTOMAKE
 
 # Look for the macros at the beginning of rules.  Be careful, as there
 # are literal tabs at the beginning of the search strings.
-grep ' \$(COMPILE)'     Makefile.in  || Exit 1
-grep ' \$(CXXCOMPILE)'  Makefile.in  || Exit 1
-grep ' \$(FCCOMPILE)'  Makefile.in  || Exit 1
+$FGREP '       $(COMPILE)'    Makefile.in
+$FGREP '       $(CXXCOMPILE)' Makefile.in
+$FGREP '       $(FCCOMPILE)'  Makefile.in
 
 Exit 0

diff --git a/tests/compile_f_c_cxx.test b/tests/compile_f_c_cxx.test
index 941c7dbea7132a604de684b04a87ac21ac408c52..a995527c917c3f8bb15d7e43f66891225fc4b031 100755 (executable)
--- a/tests/compile_f_c_cxx.test
+++ b/tests/compile_f_c_cxx.test
@@ -1,5 +1,6 @@
 #! /bin/sh
-# Copyright (C) 1998, 1999, 2001, 2002  Free Software Foundation, Inc.
+# Copyright (C) 1998, 1999, 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
@@ -20,6 +21,8 @@
 
 . ./defs || Exit 1
 
+set -e
+
 cat >> configure.in << 'END'
 AC_PROG_CC
 AC_PROG_CXX
@@ -37,14 +40,13 @@ END
 : > bar.c
 : > baz.cc
 
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
-
+$ACLOCAL
+$AUTOMAKE
 
 # Look for the macros at the beginning of rules.  Be careful, as there
 # are literal tabs at the beginning of the search strings.
-grep ' \$(COMPILE)'     Makefile.in  || Exit 1
-grep ' \$(CXXCOMPILE)'  Makefile.in  || Exit 1
-grep ' \$(F77COMPILE)'  Makefile.in  || Exit 1
+$FGREP '       $(COMPILE)'    Makefile.in
+$FGREP '       $(CXXCOMPILE)' Makefile.in
+$FGREP '       $(F77COMPILE)' Makefile.in
 
 Exit 0

diff --git a/tests/cond13.test b/tests/cond13.test
index 3cf5462871353c5af994e1badb0347b0da0444d8..d8c436159c73a942fef56970e210eeec863de3ad 100755 (executable)
--- a/tests/cond13.test
+++ b/tests/cond13.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2001, 2002  Free Software Foundation, Inc.
+# Copyright (C) 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 >> configure.in << 'END'
 AC_PROG_CC
 AC_PROG_CXX
@@ -47,7 +49,7 @@ endif
 libtest_a_SOURCES = $(TESTSOURCES)
 END
 
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
 
 grep 'am_libtest_a_OBJECTS = .*$' Makefile.in

diff --git a/tests/cond3.test b/tests/cond3.test
index 6728721865ac21eb183c246755c33b1efbba4c57..e2dbdafa3931035792d2c692c2a4ad5f2fe94693 100755 (executable)
--- a/tests/cond3.test
+++ b/tests/cond3.test
@@ -1,5 +1,6 @@
 #! /bin/sh
-# Copyright (C) 1997, 1998, 1999, 2001, 2002, 2003  Free Software Foundation, Inc.
+# Copyright (C) 1997, 1998, 1999, 2001, 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
@@ -19,6 +20,8 @@
 
 . ./defs || Exit 1
 
+set -e
+
 cat > configure.in << 'END'
 AC_INIT
 AM_INIT_AUTOMAKE(nonesuch, nonesuch)
@@ -53,8 +56,8 @@ endif
 targ_SOURCES = $(SONE) $(STWO) $(STHREE)
 END
 
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
 
 # `b top' so that
 sed -n '
@@ -76,4 +79,4 @@ am_targ_OBJECTS = $(am__objects_1) $(am__objects_2) $(am__objects_3)
 targ_OBJECTS = $(am_targ_OBJECTS)
 EOF
 
-diff expected produced || Exit 1
+diff expected produced

diff --git a/tests/cond6.test b/tests/cond6.test
index 1f442f937ed5413a71fca551536bc7f7b796a26b..ec40032277cb9fdcb8337a6d202fc31630c09885 100755 (executable)
--- a/tests/cond6.test
+++ b/tests/cond6.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 1998, 2001, 2002  Free Software Foundation, Inc.
+# Copyright (C) 1998, 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 +18,8 @@
 
 . ./defs || Exit 1
 
+set -e
+
 echo 'AM_CONDITIONAL(FOO, true)' >> configure.in
 
 cat > Makefile.am << 'END'
@@ -37,5 +39,5 @@ help_DATA = foo
 endif
 END
 
-$ACLOCAL || Exit 1
+$ACLOCAL
 $AUTOMAKE

diff --git a/tests/cond8.test b/tests/cond8.test
index 195a9124178eab3338f1740e9f06b07de92dd8c2..0a45ad3bb8a042b663788743e5b82ff09059d0a1 100755 (executable)
--- a/tests/cond8.test
+++ b/tests/cond8.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 1999, 2001, 2002  Free Software Foundation, Inc.
+# Copyright (C) 1999, 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,8 +19,12 @@
 
 . ./defs || Exit 1
 
-echo 'AC_PROG_CC' >> configure.in
-echo 'AM_CONDITIONAL(X, false)' >> configure.in
+set -e
+
+cat >> configure.in << 'END'
+AC_PROG_CC
+AM_CONDITIONAL(X, false)
+END
 
 cat > Makefile.am << 'END'
 if X
@@ -30,5 +34,5 @@ noinst_PROGRAMS = x y
 endif
 END
 
-$ACLOCAL || Exit 1
+$ACLOCAL
 $AUTOMAKE

diff --git a/tests/conf2.test b/tests/conf2.test
index 23a8a5b19992fa68b4adf429e2a63c28020e7644..8e53733e7470787ac04f99d168a493095c99a498 100755 (executable)
--- a/tests/conf2.test
+++ b/tests/conf2.test
@@ -1,5 +1,6 @@
 #! /bin/sh
-# Copyright (C) 1997, 1998, 2000, 2001, 2002  Free Software Foundation, Inc.
+# Copyright (C) 1997, 1998, 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
@@ -18,6 +19,8 @@
 
 . ./defs || Exit 1
 
+set -e
+
 cat > configure.in << 'END'
 AC_INIT
 AM_INIT_AUTOMAKE(nonesuch, nonesuch)
@@ -31,5 +34,5 @@ END
 : > config.h.in
 : > two.h.in
 
-$ACLOCAL || Exit 1
+$ACLOCAL
 $AUTOMAKE

diff --git a/tests/confh4.test b/tests/confh4.test
index a93e38de521c4b460e05b7e3e6df54b4f42a2420..6fd4a07731cf112e65b94a0b31ef7ed86c64f8bc 100755 (executable)
--- a/tests/confh4.test
+++ b/tests/confh4.test
@@ -1,5 +1,6 @@
 #! /bin/sh
-# Copyright (C) 1999, 2000, 2001, 2002  Free Software Foundation, Inc.
+# Copyright (C) 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
@@ -15,9 +16,17 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Test for PR 34.
+# > Description:
+#  Automake fails to add -I option to include configuration
+#  header indicated like AM_CONFIG_HEADER(magick/config.h)
+# > How-To-Repeat:
+#  Use AM_CONFIG_HEADER(subdir/config.h) to place configuration
+#  header in subdirectory and observe that it is not included.
 
 . ./defs || Exit 1
 
+set -e
+
 cat > configure.in << 'END'
 AC_INIT
 AM_INIT_AUTOMAKE(nonesuch, nonesuch)
@@ -38,7 +47,7 @@ mkdir include
 : > include/Makefile.am
 : > include/config.h.in
 
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
 
 $EGREP '^DEFAULT_INCLUDES =.* -I(\.|\$\(top_builddir\))/include' Makefile.in

diff --git a/tests/confvar.test b/tests/confvar.test
index f098baf9d9eb4011202d479fcd1ab45afd3ebcee..99811b0cd9358407fb657c4347caf8b882881ebf 100755 (executable)
--- a/tests/confvar.test
+++ b/tests/confvar.test
@@ -18,13 +18,15 @@
 
 . ./defs || Exit 1
 
+set -e
+
 cat >> configure.in << 'END'
 AC_SUBST(QBERT)
 END
 
 : > Makefile.am
 
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
 
 grep '^QBERT' Makefile.in

diff --git a/tests/confvar2.test b/tests/confvar2.test
index ea9c81e9cd86ebae1feed0b7127f1e9d430f0f89..75c02dc05f8ef415a031c54b7bbb11e89ca27a31 100755 (executable)
--- a/tests/confvar2.test
+++ b/tests/confvar2.test
@@ -18,6 +18,8 @@
 
 . ./defs || Exit 1
 
+set -e
+
 cat >> configure.in << 'END'
 AC_SUBST(OTHER_SCRIPTS)
 END
@@ -26,5 +28,5 @@ cat > Makefile.am << 'END'
 bin_SCRIPTS = foo
 END
 
-$ACLOCAL || Exit 1
+$ACLOCAL
 $AUTOMAKE