diff options
| author | Ralf Wildenhues <Ralf.Wildenhues@gmx.de> | 2008-09-06 19:20:32 +0200 |
|---|---|---|
| committer | Ralf Wildenhues <Ralf.Wildenhues@gmx.de> | 2008-09-06 19:38:34 +0200 |
| commit | 20594c08f633aaee1df952242ea78553037758b9 (patch) | |
| tree | c3aa9ca7e34401a717011279209386fe12c105ee /tests | |
| parent | c327d0d37c64dd126c71d3ffbf7eb8a3fe00c8c1 (diff) | |
| download | automake-20594c08f633aaee1df952242ea78553037758b9.tar.gz | |
Use `Exit' instead of `exit' in test suite.
Cater to Bourne shells like Solaris sh that do not pass the
`exit' argument as status to the cleanup trap.
* Makefile.am (maintainer-check): Check that here-documents
use only `END' or `EOF' as delimiter in the test suite.
Check that, outside of here-documents, the tests do not use
`exit' with an argument, but use `Exit' instead.
* tests/defs.in (Exit): New function. Use it throughout,
starting with the introduction of the exit trap.
* tests/*.test: Use `Exit $arg' instead of `exit $arg'
throughout, except inside created files.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Diffstat (limited to 'tests')
614 files changed, 1488 insertions, 1476 deletions
diff --git a/tests/aclibobj.test b/tests/aclibobj.test index 346e406bf..6b826ef8f 100755 --- a/tests/aclibobj.test +++ b/tests/aclibobj.test @@ -16,7 +16,7 @@ # Make sure AC_LIBOBJ and friends work. -. ./defs || exit 1 +. ./defs || Exit 1 cat >> configure.in << 'END' AC_PROG_CC diff --git a/tests/acloca10.test b/tests/acloca10.test index 4a1d07fba..07a9878e7 100755 --- a/tests/acloca10.test +++ b/tests/acloca10.test @@ -20,7 +20,7 @@ # # Also check for --install. -. ./defs || exit 1 +. ./defs || Exit 1 set -e @@ -72,7 +72,7 @@ $AUTOCONF grep macro11 foo grep macro21 foo grep macro3 foo -grep MACRO3 aclocal.m4 && exit 1 +grep MACRO3 aclocal.m4 && Exit 1 test -f m4_1/macro.m4 test ! -f m4_2/macro.m4 cp aclocal.m4 copy.m4 @@ -84,8 +84,8 @@ $AUTOCONF grep macro11 foo grep macro21 foo grep macro3 foo -grep MACRO3 aclocal.m4 && exit 1 -grep GREPME m4_1/macro.m4 && exit 1 +grep MACRO3 aclocal.m4 && Exit 1 +grep GREPME m4_1/macro.m4 && Exit 1 test -f m4_1/macro.m4 test ! -f m4_2/macro.m4 diff aclocal.m4 copy.m4 diff --git a/tests/acloca11.test b/tests/acloca11.test index e04d170c4..3e9810310 100755 --- a/tests/acloca11.test +++ b/tests/acloca11.test @@ -17,7 +17,7 @@ # Make sure that when two files define the same macro in the same # directory, the macro from the lexically greatest file is used. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/acloca12.test b/tests/acloca12.test index b1c36eaeb..8b3c3a1a8 100755 --- a/tests/acloca12.test +++ b/tests/acloca12.test @@ -18,7 +18,7 @@ # directory, the macro from the lexically greatest file is used. # Same as acloca11.test, but without calling MACRO2. -. ./defs || exit 1 +. ./defs || Exit 1 set -e @@ -40,6 +40,6 @@ EOF $ACLOCAL --verbose -I m4 $AUTOCONF ./configure -grep macro11 foo && exit 1 -grep macro21 foo && exit 1 +grep macro11 foo && Exit 1 +grep macro21 foo && Exit 1 grep macro12 foo diff --git a/tests/acloca13.test b/tests/acloca13.test index e8db87ce7..09c3de173 100755 --- a/tests/acloca13.test +++ b/tests/acloca13.test @@ -16,7 +16,7 @@ # Make sure changes to m4_included files also cause aclocal.m4 to change. -. ./defs || exit 1 +. ./defs || Exit 1 set -e @@ -49,13 +49,13 @@ EOF $ACLOCAL -I m4 grep version2 aclocal.m4 -grep version1 aclocal.m4 && exit 1 +grep version1 aclocal.m4 && Exit 1 $sleep echo MACRO2 >somefile.m4 $ACLOCAL -I m4 -grep version2 aclocal.m4 && exit 1 +grep version2 aclocal.m4 && Exit 1 grep version1 aclocal.m4 $sleep diff --git a/tests/acloca14.test b/tests/acloca14.test index 253c538dc..4042d0ef8 100755 --- a/tests/acloca14.test +++ b/tests/acloca14.test @@ -18,7 +18,7 @@ # Report from Phil Edwards. required=GNUmake -. ./defs || exit 1 +. ./defs || Exit 1 set -e @@ -69,12 +69,12 @@ $ACLOCAL -I defs $FGREP acinclude.m4 aclocal.m4 # None of the following macro should be included. acinclude.m4 # includes the first four, and the last two are not needed at all. -$FGREP a.m4 aclocal.m4 && exit 1 -$FGREP b.m4 aclocal.m4 && exit 1 -$FGREP c.m4 aclocal.m4 && exit 1 -$FGREP d.m4 aclocal.m4 && exit 1 -$FGREP defs/e.m4 aclocal.m4 && exit 1 -$FGREP defs/f.m4 aclocal.m4 && exit 1 +$FGREP a.m4 aclocal.m4 && Exit 1 +$FGREP b.m4 aclocal.m4 && Exit 1 +$FGREP c.m4 aclocal.m4 && Exit 1 +$FGREP d.m4 aclocal.m4 && Exit 1 +$FGREP defs/e.m4 aclocal.m4 && Exit 1 +$FGREP defs/f.m4 aclocal.m4 && Exit 1 $AUTOCONF $AUTOMAKE @@ -108,5 +108,5 @@ $MAKE testdist2 # Make sure aclocal diagnose missing included files with correct `file:line:'. rm -f b.m4 -$ACLOCAL 2>stderr && exit 1 +$ACLOCAL 2>stderr && Exit 1 grep 'a.m4:1:.*b.m4.*does not exist' stderr diff --git a/tests/acloca15.test b/tests/acloca15.test index cd2be7167..3cfcd1af5 100755 --- a/tests/acloca15.test +++ b/tests/acloca15.test @@ -17,7 +17,7 @@ # Make sure aclocal scans configure.in for macro definitions. # PR/319. -. ./defs || exit 1 +. ./defs || Exit 1 set -e @@ -39,7 +39,7 @@ echo 'AC_DEFUN([AM_SOME_DEF])' > somedef.m4 echo 'AC_DEFUN([AM_MORE_MACRO], [AC_REQUIRE([AM_SOME_DEF])])' > m4/more.m4 $ACLOCAL -I m4 -$FGREP AM_SOME_MACRO aclocal.m4 && exit 1 -$FGREP AM_MORE_MACRO aclocal.m4 && exit 1 +$FGREP AM_SOME_MACRO aclocal.m4 && Exit 1 +$FGREP AM_MORE_MACRO aclocal.m4 && Exit 1 $FGREP 'm4_include([m4/more.m4])' aclocal.m4 test 1 = `grep m4_include aclocal.m4 | wc -l` diff --git a/tests/acloca16.test b/tests/acloca16.test index 7c24df21e..85b88d750 100755 --- a/tests/acloca16.test +++ b/tests/acloca16.test @@ -17,7 +17,7 @@ # Make sure aclocal does not include definitions that are not actually # evaluated. -. ./defs || exit 1 +. ./defs || Exit 1 set -e @@ -32,5 +32,5 @@ AC_DEFUN([AM_SOME_MACRO], EOF $ACLOCAL -I m4 -grep m4/some.m4 aclocal.m4 && exit 1 +grep m4/some.m4 aclocal.m4 && Exit 1 : diff --git a/tests/acloca17.test b/tests/acloca17.test index c2232b6c0..d60a5a0c3 100755 --- a/tests/acloca17.test +++ b/tests/acloca17.test @@ -16,7 +16,7 @@ # Make sure aclocal report unused required macros. -. ./defs || exit 1 +. ./defs || Exit 1 set -e @@ -34,6 +34,6 @@ EOF # FIXME: We want autom4te's 'undefined required macro' warning to be fatal, # but have no means to say so to aclocal. We use WARNINGS=error instead. -WARNINGS=error $ACLOCAL -I m4 2>stderr && exit 1 +WARNINGS=error $ACLOCAL -I m4 2>stderr && Exit 1 cat stderr grep 'configure.in:4:.*UNDEFINED_MACRO' stderr diff --git a/tests/acloca18.test b/tests/acloca18.test index 3a015a985..f0bfd571a 100755 --- a/tests/acloca18.test +++ b/tests/acloca18.test @@ -16,7 +16,7 @@ # Test for --install with #serial numbers. -. ./defs || exit 1 +. ./defs || Exit 1 set -e @@ -86,7 +86,7 @@ grep macro23 foo ACLOCAL_TESTSUITE_FLAGS='-I 4 -I 1 -I 2' rm -f foo -$ACLOCAL --install 2>stderr && exit 1 +$ACLOCAL --install 2>stderr && Exit 1 grep AM_MACRO2 stderr ACLOCAL_TESTSUITE_FLAGS='-I 4 -I 1' diff --git a/tests/acloca19.test b/tests/acloca19.test index 7b4a3158f..909aa7a67 100755 --- a/tests/acloca19.test +++ b/tests/acloca19.test @@ -18,7 +18,7 @@ # more than just variable definitions. # Report from Peter Breitenlohner (PR/450). -. ./defs || exit 1 +. ./defs || Exit 1 set -e @@ -44,6 +44,6 @@ $AUTOCONF ./configure >stdout cat stdout grep GREPME stdout -grep 'aconfig\.ac' aclocal.m4 && exit 1 -grep 'bconfig\.ac' aclocal.m4 && exit 1 +grep 'aconfig\.ac' aclocal.m4 && Exit 1 +grep 'bconfig\.ac' aclocal.m4 && Exit 1 grep with-grepme configure diff --git a/tests/acloca20.test b/tests/acloca20.test index 0d6dbbfbe..376752d30 100755 --- a/tests/acloca20.test +++ b/tests/acloca20.test @@ -16,7 +16,7 @@ # Make sure aclocal does not write into symlinked aclocal.m4. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/acloca21.test b/tests/acloca21.test index c99e5f7ae..769a3c250 100755 --- a/tests/acloca21.test +++ b/tests/acloca21.test @@ -19,7 +19,7 @@ # Also make sure aclocal does not think 'include' is # an Autoconf macro. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/acloca22.test b/tests/acloca22.test index 2562a8817..913e4d9bc 100755 --- a/tests/acloca22.test +++ b/tests/acloca22.test @@ -17,7 +17,7 @@ # Make sure the "deleted header file" issue is fixed wrt. aclocal.m4 # dependencies. -. ./defs || exit 1 +. ./defs || Exit 1 set -e @@ -40,10 +40,10 @@ $AUTOCONF ./configure $MAKE grep GREPFOO Makefile -grep GREPBAR Makefile && exit 1 +grep GREPBAR Makefile && Exit 1 sed 's/FOO/BAR/' < configure.in > t mv -f t configure.in rm -f foo.m4 $MAKE -grep GREPFOO Makefile && exit 1 +grep GREPFOO Makefile && Exit 1 grep GREPBAR Makefile diff --git a/tests/aclocal.test b/tests/aclocal.test index 776fc15b8..4431779a7 100755 --- a/tests/aclocal.test +++ b/tests/aclocal.test @@ -16,22 +16,22 @@ # Test to make sure that aclocal --output works. Report from # Alexandre Oliva. -. ./defs || exit 1 +. ./defs || Exit 1 set -e $ACLOCAL --output=fred test -f fred -$ACLOCAL --output 2>stderr && exit 1 +$ACLOCAL --output 2>stderr && Exit 1 grep 'option.*--output.*an argument' stderr grep help stderr -$ACLOCAL --unknown-option 2>stderr && exit 1 +$ACLOCAL --unknown-option 2>stderr && Exit 1 grep 'unrecognized.*--unknown-option' stderr grep help stderr -$ACLOCAL --ver 2>stderr && exit 1 +$ACLOCAL --ver 2>stderr && Exit 1 grep 'unrecognized.*--ver' stderr grep help stderr diff --git a/tests/aclocal3.test b/tests/aclocal3.test index a16778154..fb24b629b 100755 --- a/tests/aclocal3.test +++ b/tests/aclocal3.test @@ -15,7 +15,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # Test to make sure include of include detects missing macros -. ./defs || exit 1 +. ./defs || Exit 1 echo GNOME_X_CHECKS >> configure.in diff --git a/tests/aclocal4.test b/tests/aclocal4.test index daf3ab63b..d46edc4c2 100755 --- a/tests/aclocal4.test +++ b/tests/aclocal4.test @@ -19,7 +19,7 @@ # We need GNU make for the `rebuild rules' to be triggered. required=GNUmake -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/aclocal5.test b/tests/aclocal5.test index 8b3c6f041..18b879870 100755 --- a/tests/aclocal5.test +++ b/tests/aclocal5.test @@ -20,7 +20,7 @@ # This test assumes that the `make' utility is able to start # over and reload Makefiles which have been remade (a non-POSIX feature). required='GNUmake' -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/aclocal6.test b/tests/aclocal6.test index 36f9ce093..19aaea459 100755 --- a/tests/aclocal6.test +++ b/tests/aclocal6.test @@ -18,7 +18,7 @@ # dependency changes. Test for acinclude.m4 and VPATH too. required='GNUmake' -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/aclocal7.test b/tests/aclocal7.test index 24296a4f3..d8a186d45 100755 --- a/tests/aclocal7.test +++ b/tests/aclocal7.test @@ -17,7 +17,7 @@ # Make sure aclocal does not overwrite aclocal.m4 needlessly. # Also make sure automake --no-force does not overwrite Makefile.in needlessly. -. ./defs || exit 1 +. ./defs || Exit 1 set -e @@ -93,7 +93,7 @@ test `ls -1t aclocal.m4 foo | sed 1q` = foo test `ls -1t Makefile.in foo | sed 1q` = Makefile.in test `ls -1t sub/Makefile.in foo | sed 1q` = foo -grep README Makefile.in && exit 1 +grep README Makefile.in && Exit 1 : > README $sleep diff --git a/tests/aclocal8.test b/tests/aclocal8.test index 23bce5bba..78b7a3b37 100755 --- a/tests/aclocal8.test +++ b/tests/aclocal8.test @@ -16,7 +16,7 @@ # Make sure aclocal does not require unused macros. -. ./defs || exit 1 +. ./defs || Exit 1 set -e @@ -38,5 +38,5 @@ $ACLOCAL -I m4 >output 2>&1 cat output test 0 = `wc -l <output` grep macro1.m4 aclocal.m4 -grep macro2.m4 aclocal.m4 && exit 1 +grep macro2.m4 aclocal.m4 && Exit 1 : diff --git a/tests/aclocal9.test b/tests/aclocal9.test index fb6bf6678..a4f8cb752 100755 --- a/tests/aclocal9.test +++ b/tests/aclocal9.test @@ -16,7 +16,7 @@ # Make sure aclocal define macros in the same order as -I's. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/acoutbs.test b/tests/acoutbs.test index 50c232cb2..2d1d56a93 100755 --- a/tests/acoutbs.test +++ b/tests/acoutbs.test @@ -17,7 +17,7 @@ # Test for bug reported by François Pinard. # If \ is in AC_OUTPUT, automake barfs. -. ./defs || exit 1 +. ./defs || Exit 1 cat > configure.in << 'END' AC_INIT @@ -29,5 +29,5 @@ END : > Makefile.am : > zot.in -$ACLOCAL || exit 1 +$ACLOCAL || Exit 1 $AUTOMAKE diff --git a/tests/acoutbs2.test b/tests/acoutbs2.test index 50b7300a4..c26bd1fa2 100755 --- a/tests/acoutbs2.test +++ b/tests/acoutbs2.test @@ -17,7 +17,7 @@ # Test for bug reported by David A. Swierczek. # Another bug with \ in AC_OUTPUT (this time with whitespace). -. ./defs || exit 1 +. ./defs || Exit 1 cat > configure.in << 'END' PACKAGE=nonesuch diff --git a/tests/acoutnoq.test b/tests/acoutnoq.test index c47bb0e7c..2821120be 100755 --- a/tests/acoutnoq.test +++ b/tests/acoutnoq.test @@ -20,7 +20,7 @@ # automake is not happy: # [ ... ] -. ./defs || exit 1 +. ./defs || Exit 1 cat > configure.in << 'END' AC_INIT @@ -30,5 +30,5 @@ END : > Makefile.am -$ACLOCAL || exit 1 +$ACLOCAL || Exit 1 $AUTOMAKE diff --git a/tests/acoutpt.test b/tests/acoutpt.test index 7a0195354..7e6d6309a 100755 --- a/tests/acoutpt.test +++ b/tests/acoutpt.test @@ -17,7 +17,7 @@ # Test for bug when AC_OUTPUT has 2 args on the same line, eg: # AC_OUTPUT([Makefile automake tests/Makefile],[chmod +x automake]) -. ./defs || exit 1 +. ./defs || Exit 1 cat > configure.in << 'END' AC_INIT @@ -27,5 +27,5 @@ END : > Makefile.am -$ACLOCAL || exit 1 +$ACLOCAL || Exit 1 $AUTOMAKE diff --git a/tests/acoutpt2.test b/tests/acoutpt2.test index ce5abb04f..ddb73a1e8 100755 --- a/tests/acoutpt2.test +++ b/tests/acoutpt2.test @@ -16,7 +16,7 @@ # Test for bug reported by Eric Magnien. -. ./defs || exit 1 +. ./defs || Exit 1 cat > configure.in << 'END' AC_INIT @@ -31,12 +31,12 @@ mkdir subdir : > foo.in : > subdir/foo.in -$ACLOCAL || exit 1 -$AUTOMAKE || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE || Exit 1 count=`$FGREP foo.in Makefile.in | wc -l` -test $count -eq 2 || exit 1 +test $count -eq 2 || Exit 1 # This ought to work as well. -$ACLOCAL || exit 1 +$ACLOCAL || Exit 1 $AUTOMAKE --add-missing --force-missing diff --git a/tests/acoutqnl.test b/tests/acoutqnl.test index d84b565d2..d28449342 100755 --- a/tests/acoutqnl.test +++ b/tests/acoutqnl.test @@ -16,7 +16,7 @@ # Test for bug reported by François Pinard. -. ./defs || exit 1 +. ./defs || Exit 1 cat > configure.in << 'END' AC_INIT @@ -27,6 +27,6 @@ END : > Makefile.am -$ACLOCAL || exit 1 +$ACLOCAL || Exit 1 $AUTOMAKE diff --git a/tests/acsilent.test b/tests/acsilent.test index c34ebc032..c1fb4cd0c 100755 --- a/tests/acsilent.test +++ b/tests/acsilent.test @@ -16,7 +16,7 @@ # Test to make sure there are no spurious acinclude warnings. -. ./defs || exit 1 +. ./defs || Exit 1 cat >configure.in <<EOF AC_INIT @@ -32,5 +32,5 @@ module=[$1] AC_SUBST(module)]) END -$ACLOCAL > output 2>&1 || exit 1 +$ACLOCAL > output 2>&1 || Exit 1 test -z "`cat output`" diff --git a/tests/acsubst.test b/tests/acsubst.test index 7f99d11d9..ee8248891 100755 --- a/tests/acsubst.test +++ b/tests/acsubst.test @@ -14,7 +14,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/acsubst2.test b/tests/acsubst2.test index 5ac76c9f6..ca098b3f3 100755 --- a/tests/acsubst2.test +++ b/tests/acsubst2.test @@ -14,7 +14,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/all.test b/tests/all.test index de29d1516..c2fdfb24a 100755 --- a/tests/all.test +++ b/tests/all.test @@ -16,7 +16,7 @@ # Test to make sure all-local and other -local targets work correctly. -. ./defs || exit 1 +. ./defs || Exit 1 set -e targets='all install-exec install-data uninstall' @@ -27,7 +27,7 @@ for target in $targets; do $ACLOCAL $AUTOMAKE - $FGREP "${target}-local ${target}-local" Makefile.in && exit 1 + $FGREP "${target}-local ${target}-local" Makefile.in && Exit 1 done # Several *-local's in a single rule. @@ -40,4 +40,4 @@ for target in $targets; do $EGREP "${target}-am:.*${target}-local" Makefile.in done -exit 0 +Exit 0 diff --git a/tests/alloca.test b/tests/alloca.test index 0656fd372..2078ef34e 100755 --- a/tests/alloca.test +++ b/tests/alloca.test @@ -16,7 +16,7 @@ # Make sure we complain if @ALLOCA@ is used without being set in configure.in -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/alloca2.test b/tests/alloca2.test index bd662a591..4d1ee0403 100755 --- a/tests/alloca2.test +++ b/tests/alloca2.test @@ -16,7 +16,7 @@ # Make sure we complain if @LTALLOCA@ is used without being set in configure.in -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/alpha.test b/tests/alpha.test index 7f0e92cf9..ba17d74b2 100755 --- a/tests/alpha.test +++ b/tests/alpha.test @@ -16,7 +16,7 @@ # Make sure README-alpha is distributed when appropriate. Report from # Jim Meyering. -. ./defs || exit 1 +. ./defs || Exit 1 set -e @@ -62,7 +62,7 @@ $AUTOMAKE ./configure # make distdir should fail because NEWS does not mention 1.0a -$MAKE check 2>stderr && exit 1 +$MAKE check 2>stderr && Exit 1 cat stderr grep 'NEWS not updated' stderr test ! -f works diff --git a/tests/alpha2.test b/tests/alpha2.test index 13ddf6c82..d0b5da909 100755 --- a/tests/alpha2.test +++ b/tests/alpha2.test @@ -17,7 +17,7 @@ # Another check for README-alpha support. This time it is requested # from configure.in. Report from Akim Demaille. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/amassign.test b/tests/amassign.test index a6c8bcc05..2d7ed3c50 100755 --- a/tests/amassign.test +++ b/tests/amassign.test @@ -17,7 +17,7 @@ # Test to see if AM_ name can be assigned to in configure.in. # Report from Steve Robbins. -. ./defs || exit 1 +. ./defs || Exit 1 cat >> configure.in << 'END' AM_CFLAGS=foo diff --git a/tests/ammissing.test b/tests/ammissing.test index 6a4756888..ba31b6e3c 100755 --- a/tests/ammissing.test +++ b/tests/ammissing.test @@ -16,7 +16,7 @@ # Test to see if aclocal correctly reports missing AM_ macro. -. ./defs || exit 1 +. ./defs || Exit 1 echo AM_ZARDOZ >> configure.in diff --git a/tests/amopt.test b/tests/amopt.test index 31941c995..c969bec2f 100755 --- a/tests/amopt.test +++ b/tests/amopt.test @@ -17,7 +17,7 @@ # Make Automake diagnose a conditional AUTOMAKE_OPTIONS. # Report from Bas Wijnen. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/amsubst.test b/tests/amsubst.test index e98e7068f..d696344e7 100755 --- a/tests/amsubst.test +++ b/tests/amsubst.test @@ -16,7 +16,7 @@ # Check for _AM_SUBST_NOTMAKE. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/ansi.test b/tests/ansi.test index d077adb0c..1bb6616ce 100755 --- a/tests/ansi.test +++ b/tests/ansi.test @@ -18,7 +18,7 @@ # Test for bug where ansi2knr.c is not included in distribution. # From François Pinard. -. ./defs || exit 1 +. ./defs || Exit 1 cat > Makefile.am << 'END' AUTOMAKE_OPTIONS = ansi2knr @@ -33,8 +33,8 @@ END : > ansi2knr.c : > ansi2knr.1 -$ACLOCAL || exit 1 -$AUTOMAKE || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE || Exit 1 $FGREP -v @SET_MAKE@ Makefile.in > Makefile.sed $MAKE -s -f Makefile.sed SHELL=$SHELL magic | grep 'ansi2knr\.c' diff --git a/tests/ansi10.test b/tests/ansi10.test index e381ca319..8f1791abc 100755 --- a/tests/ansi10.test +++ b/tests/ansi10.test @@ -17,7 +17,7 @@ # Make sure ansi2knr works with $(LIBOBJS). required=gcc -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/ansi2.test b/tests/ansi2.test index c0dfdea38..f17045533 100755 --- a/tests/ansi2.test +++ b/tests/ansi2.test @@ -16,7 +16,7 @@ # Test to make sure ansi2knr built at the right time. -. ./defs || exit 1 +. ./defs || Exit 1 cat > Makefile.am << 'END' AUTOMAKE_OPTIONS = ansi2knr @@ -31,7 +31,7 @@ END : > ansi2knr.c : > ansi2knr.1 -$ACLOCAL || exit 1 -$AUTOMAKE || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE || Exit 1 grep '^all[-a-z]*:.*ANSI2KNR' Makefile.in diff --git a/tests/ansi3.test b/tests/ansi3.test index abc69a84f..0c247795c 100755 --- a/tests/ansi3.test +++ b/tests/ansi3.test @@ -18,7 +18,7 @@ # of working gcc. required=gcc -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/ansi3b.test b/tests/ansi3b.test index f02c7c058..aa25a2192 100755 --- a/tests/ansi3b.test +++ b/tests/ansi3b.test @@ -19,7 +19,7 @@ # defined in configure.in. required=gcc -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/ansi4.test b/tests/ansi4.test index f805ecaa6..819d8996e 100755 --- a/tests/ansi4.test +++ b/tests/ansi4.test @@ -16,7 +16,7 @@ # Quoting regression. Test from Thomas Gagne. -. ./defs || exit 1 +. ./defs || Exit 1 cat >> configure.in << 'END' AC_PROG_CC @@ -33,7 +33,7 @@ END : > ansi2knr.c : > hello.c -$ACLOCAL || exit 1 -$AUTOMAKE || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE || Exit 1 -$FGREP 'ansi2knr.$(' Makefile.in || exit 1 +$FGREP 'ansi2knr.$(' Makefile.in || Exit 1 diff --git a/tests/ansi5.test b/tests/ansi5.test index f44144331..4be0f7939 100755 --- a/tests/ansi5.test +++ b/tests/ansi5.test @@ -17,7 +17,7 @@ # Test for ansi2knr in another directory. required=gcc -. ./defs || exit 1 +. ./defs || Exit 1 cat > configure.in << 'END' AC_INIT(one/joe.c) diff --git a/tests/ansi6.test b/tests/ansi6.test index 0ab1d3f9d..0a37d6b7a 100755 --- a/tests/ansi6.test +++ b/tests/ansi6.test @@ -18,7 +18,7 @@ # From Kevin Ryde. required=gcc -. ./defs || exit 1 +. ./defs || Exit 1 cat > configure.in << 'END' AC_INIT(ansi6, 1.0) diff --git a/tests/ansi7.test b/tests/ansi7.test index bf64ebccc..846b14fc1 100755 --- a/tests/ansi7.test +++ b/tests/ansi7.test @@ -19,7 +19,7 @@ # From Kevin Ryde. required=gcc -. ./defs || exit 1 +. ./defs || Exit 1 cat > configure.in << 'END' AC_INIT(ansi6, 1.0) diff --git a/tests/ansi8.test b/tests/ansi8.test index 23545047d..298ccc4a4 100755 --- a/tests/ansi8.test +++ b/tests/ansi8.test @@ -16,7 +16,7 @@ # Check that AM_C_PROTOTYPES is required by ansi2knr -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/ansi9.test b/tests/ansi9.test index b10543535..208b1ac0f 100755 --- a/tests/ansi9.test +++ b/tests/ansi9.test @@ -19,7 +19,7 @@ # Report from Paul D. Smith. required=gcc -. ./defs || exit 1 +. ./defs || Exit 1 set -e @@ -56,7 +56,7 @@ $AUTOMAKE --add-missing -Wno-override $FGREP 'loadavg-loadavg$U.o: loadavg$U.c' Makefile.in # The following rule should not exist, because the # default .o.c: inference rule is enough. -$FGREP 'sub/sub$U.o: sub/sub$U.c' Makefile.in && exit 1 +$FGREP 'sub/sub$U.o: sub/sub$U.c' Makefile.in && Exit 1 # Force ansi2knr's use, regardless of the compiler. ./configure ac_cv_prog_cc_stdc=no $MAKE sub/sub_.c diff --git a/tests/ar.test b/tests/ar.test index 6e25a19f9..3af7925f7 100755 --- a/tests/ar.test +++ b/tests/ar.test @@ -16,7 +16,7 @@ # Make sure that AR, ARFLAGS, and RANLIB can be substituted from configure.in. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/ar2.test b/tests/ar2.test index 77a054949..df4308e21 100755 --- a/tests/ar2.test +++ b/tests/ar2.test @@ -17,7 +17,7 @@ # Make sure AR and ARFLAGS are defined for EXTRA_LIBRARIES. # Report from Kevin Ryde. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/asm.test b/tests/asm.test index 2b5634720..bc234f6c6 100755 --- a/tests/asm.test +++ b/tests/asm.test @@ -16,7 +16,7 @@ # Test of basic assembly functionality -. ./defs || exit 1 +. ./defs || Exit 1 set -e @@ -112,4 +112,4 @@ END $ACLOCAL $AUTOMAKE -exit 0 +Exit 0 diff --git a/tests/asm2.test b/tests/asm2.test index 247f2e848..c7705831f 100755 --- a/tests/asm2.test +++ b/tests/asm2.test @@ -16,7 +16,7 @@ # Test of basic preprocessed assembly functionality -. ./defs || exit 1 +. ./defs || Exit 1 set -e @@ -131,4 +131,4 @@ END $ACLOCAL $AUTOMAKE -exit 0 +Exit 0 diff --git a/tests/asm3.test b/tests/asm3.test index 2d8c10482..c55eda784 100755 --- a/tests/asm3.test +++ b/tests/asm3.test @@ -17,7 +17,7 @@ # Test of basic preprocessed assembly functionality with extension .sx. -. ./defs || exit 1 +. ./defs || Exit 1 set -e @@ -132,4 +132,4 @@ END $ACLOCAL $AUTOMAKE -exit 0 +Exit 0 diff --git a/tests/automake.test b/tests/automake.test index 70c0d83eb..44a2993a2 100755 --- a/tests/automake.test +++ b/tests/automake.test @@ -15,7 +15,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # Test Automake's command-line options. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/auxdir.test b/tests/auxdir.test index 674457f25..358a2fcc3 100755 --- a/tests/auxdir.test +++ b/tests/auxdir.test @@ -16,7 +16,7 @@ # Test to make sure AC_CONFIG_AUX_DIR works correctly. -. ./defs || exit 1 +. ./defs || Exit 1 # The "./." is here so we don't have to mess with subdirs. cat > configure.in << 'END' @@ -34,7 +34,7 @@ cp "$testsrcdir/../lib/mkinstalldirs" . # The "././" prefix confuses Automake into thinking it is doing a # subdir build. Yes, this is hacky. -$ACLOCAL || exit 1 -$AUTOMAKE ././Makefile || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE ././Makefile || Exit 1 grep '/\./\./mkinstalldirs' Makefile.in diff --git a/tests/auxdir2.test b/tests/auxdir2.test index 28a5774ae..a20e7861c 100755 --- a/tests/auxdir2.test +++ b/tests/auxdir2.test @@ -17,7 +17,7 @@ # It should be possible to use a computed auxdir. This might seem # bizarre, but it is actually used in multilib builds. -. ./defs || exit 1 +. ./defs || Exit 1 # The "./." is here so we don't have to mess with subdirs. cat > configure.in << 'END' @@ -29,5 +29,5 @@ END : > Makefile.am -$ACLOCAL || exit 1 +$ACLOCAL || Exit 1 $AUTOMAKE diff --git a/tests/auxdir3.test b/tests/auxdir3.test index 7e225622f..3ac0cabd4 100755 --- a/tests/auxdir3.test +++ b/tests/auxdir3.test @@ -16,7 +16,7 @@ # Test to make sure we diagnose misplaced AC_CONFIG_AUX_DIR. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/auxdir4.test b/tests/auxdir4.test index defba9909..be2a0c4a7 100755 --- a/tests/auxdir4.test +++ b/tests/auxdir4.test @@ -16,7 +16,7 @@ # Make sure we diagnose dangerous AC_CONFIG_AUX_DIR names. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/backsl.test b/tests/backsl.test index a9ecd475a..0e50f5232 100755 --- a/tests/backsl.test +++ b/tests/backsl.test @@ -16,7 +16,7 @@ # Test for "\" problems. Bug report from Joerg-Martin Schwarz. -. ./defs || exit 1 +. ./defs || Exit 1 cat >> configure.in << 'END' AC_PROG_CC @@ -27,8 +27,8 @@ bin_PROGRAMS = \ frob END -$ACLOCAL || exit 1 -$AUTOMAKE || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE || Exit 1 -grep '^_SOURCE' Makefile.in && exit 1 -exit 0 +grep '^_SOURCE' Makefile.in && Exit 1 +Exit 0 diff --git a/tests/backsl2.test b/tests/backsl2.test index 5ab25dd11..9745eb7ac 100755 --- a/tests/backsl2.test +++ b/tests/backsl2.test @@ -17,14 +17,14 @@ # We must skip the backslash, not complain about `./\' not existing. # Reported by Rick Scott <rwscott@omnisig.com> -. ./defs || exit 1 +. ./defs || Exit 1 cat > Makefile.am << 'END' SUBDIRS = \ . END -$ACLOCAL || exit 1 -$AUTOMAKE || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE || Exit 1 -exit 0 +Exit 0 diff --git a/tests/backsl3.test b/tests/backsl3.test index 1711ef519..c095d83f2 100755 --- a/tests/backsl3.test +++ b/tests/backsl3.test @@ -17,7 +17,7 @@ # Make sure we diagnose trailing backslash at the end of a file. # Report from Akim Demaile <akim@epita.fr> -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/backsl4.test b/tests/backsl4.test index d0155cac2..d9ce21dd2 100755 --- a/tests/backsl4.test +++ b/tests/backsl4.test @@ -17,7 +17,7 @@ # Make sure we diagnose and fix white spaces following backslash. # Report from Peter Muir. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/badline.test b/tests/badline.test index 8633f9749..046146f5b 100755 --- a/tests/badline.test +++ b/tests/badline.test @@ -17,7 +17,7 @@ # Test to make sure that line number and file name in error message # referring to variable is always correct. -. ./defs || exit 1 +. ./defs || Exit 1 set -e @@ -30,6 +30,6 @@ END : > Makefile.am -$ACLOCAL || exit 1 +$ACLOCAL || Exit 1 AUTOMAKE_fails grep 'configure.in:3:.*info_TEXINFOS' stderr diff --git a/tests/badopt.test b/tests/badopt.test index 9cbe3e824..c028cdf2c 100755 --- a/tests/badopt.test +++ b/tests/badopt.test @@ -16,7 +16,7 @@ # Test to make sure bad options cause error. -. ./defs || exit 1 +. ./defs || Exit 1 cat > Makefile.am << 'END' AUTOMAKE_OPTIONS = zardoz diff --git a/tests/badprog.test b/tests/badprog.test index 709c7e2ea..21fb4d734 100755 --- a/tests/badprog.test +++ b/tests/badprog.test @@ -17,7 +17,7 @@ # Test to make sure that programs with bad names are properly # transformed. -. ./defs || exit 1 +. ./defs || Exit 1 cat >> configure.in << 'END' AC_PROG_CC @@ -28,5 +28,5 @@ bin_PROGRAMS = a,b a_b_SOURCES = ab.c END -$ACLOCAL || exit 1 +$ACLOCAL || Exit 1 $AUTOMAKE diff --git a/tests/block.test b/tests/block.test index bbb5face5..822181c8b 100755 --- a/tests/block.test +++ b/tests/block.test @@ -17,7 +17,7 @@ # Make sure block comments are not double-spaced. # Report from François Pinard. -. ./defs || exit 1 +. ./defs || Exit 1 cat > Makefile.am << 'END' #START @@ -27,8 +27,8 @@ cat > Makefile.am << 'END' #END END -$ACLOCAL || exit 1 -$AUTOMAKE || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE || Exit 1 -(sed -e '/^#START/,/^#END/ !d' Makefile.in | grep -v '^#') && exit 1 -exit 0 +(sed -e '/^#START/,/^#END/ !d' Makefile.in | grep -v '^#') && Exit 1 +Exit 0 diff --git a/tests/bsource.test b/tests/bsource.test index b2bee0bcc..3d10517ea 100755 --- a/tests/bsource.test +++ b/tests/bsource.test @@ -17,7 +17,7 @@ # Regression test for install-recursive appearing in a non recursive Makefile. # Report from Bruno Haible. -. ./defs || exit 1 +. ./defs || Exit 1 set -e @@ -29,5 +29,5 @@ END $ACLOCAL $AUTOMAKE -grep 'install-recursive' Makefile.in && exit 1 +grep 'install-recursive' Makefile.in && Exit 1 : diff --git a/tests/canon-name.test b/tests/canon-name.test index 30f04a73c..9f81e10f7 100755 --- a/tests/canon-name.test +++ b/tests/canon-name.test @@ -16,7 +16,7 @@ # PR 511: Make sure we warn about AC_CONFIG_FILES([./makefile]). -. ./defs || exit 1 +. ./defs || Exit 1 cat > configure.in << 'END' AC_INIT([canon-name], [1.0]) diff --git a/tests/canon.test b/tests/canon.test index 4c7441cad..cfb1c1169 100755 --- a/tests/canon.test +++ b/tests/canon.test @@ -16,7 +16,7 @@ # Test to make sure that name canonicalization error works. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/canon2.test b/tests/canon2.test index 9c520eeff..d6116dad3 100755 --- a/tests/canon2.test +++ b/tests/canon2.test @@ -16,7 +16,7 @@ # Test to make sure name canonicalization happens for texinfo. -. ./defs || exit 1 +. ./defs || Exit 1 cat > Makefile.am << 'END' info_TEXINFOS = zar-doz.texi @@ -27,8 +27,8 @@ END echo '@setfilename zar-doz.info' > zar-doz.texi echo '@setfilename frob' > frob.texi -$ACLOCAL || exit 1 -$AUTOMAKE || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE || Exit 1 -grep zar-doz_TEXINFOS Makefile.in && exit 1 -exit 0 +grep zar-doz_TEXINFOS Makefile.in && Exit 1 +Exit 0 diff --git a/tests/canon3.test b/tests/canon3.test index f89afaef9..337f2303e 100755 --- a/tests/canon3.test +++ b/tests/canon3.test @@ -16,7 +16,7 @@ # Yet another canonicalization test. -. ./defs || exit 1 +. ./defs || Exit 1 cat >> configure.in << 'END' AC_PROG_CC @@ -28,8 +28,8 @@ END : > perm-number.c -$ACLOCAL || exit 1 -$AUTOMAKE || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE || Exit 1 -grep 'perm_number\.c' Makefile.in && exit 1 -exit 0 +grep 'perm_number\.c' Makefile.in && Exit 1 +Exit 0 diff --git a/tests/canon4.test b/tests/canon4.test index eded11a85..126650f3a 100755 --- a/tests/canon4.test +++ b/tests/canon4.test @@ -16,7 +16,7 @@ # Test to make sure name canonicalization happens for libraries. -. ./defs || exit 1 +. ./defs || Exit 1 cat >> configure.in << 'END' AC_PROG_CC @@ -28,8 +28,8 @@ noinst_LIBRARIES = libx-y.a libx_y_a_SOURCES = xy.c END -$ACLOCAL || exit 1 -$AUTOMAKE || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE || Exit 1 -grep '^libx-y.*=' Makefile.in && exit 1 -exit 0 +grep '^libx-y.*=' Makefile.in && Exit 1 +Exit 0 diff --git a/tests/canon5.test b/tests/canon5.test index d785ec724..882c39dc2 100755 --- a/tests/canon5.test +++ b/tests/canon5.test @@ -17,7 +17,7 @@ # Test to make sure that we allow variable names starting in # non-letters. Whatever that might mean. -. ./defs || exit 1 +. ./defs || Exit 1 set -e @@ -29,7 +29,7 @@ bin_PROGRAMS = 123test END $ACLOCAL -$AUTOMAKE || exit 1 +$AUTOMAKE || Exit 1 cat > Makefile.am << 'END' bin_PROGRAMS = _foo diff --git a/tests/ccnoco.test b/tests/ccnoco.test index ca7592204..327001c79 100755 --- a/tests/ccnoco.test +++ b/tests/ccnoco.test @@ -18,7 +18,7 @@ # understand `-c -o'. required=gcc -. ./defs || exit 1 +. ./defs || Exit 1 cat > configure.1 << 'END' AC_INIT(a.c) diff --git a/tests/ccnoco2.test b/tests/ccnoco2.test index d0b13a797..325c9895d 100755 --- a/tests/ccnoco2.test +++ b/tests/ccnoco2.test @@ -17,7 +17,7 @@ # Make sure Automake requires AM_PROG_CC_C_O when either per-targets # flags or subdir-objects are used. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/check.test b/tests/check.test index b58fd9364..e6da57faa 100755 --- a/tests/check.test +++ b/tests/check.test @@ -16,7 +16,7 @@ # Test Automake style tests. -. ./defs || exit 1 +. ./defs || Exit 1 set -e @@ -30,7 +30,7 @@ $ACLOCAL $AUTOMAKE grep '^check-TESTS:' Makefile.in -grep '^check-DEJAGNU' Makefile.in && exit 1 +grep '^check-DEJAGNU' Makefile.in && Exit 1 # check-TESTS is phony. sed -n '/^\.PHONY:/,/^$/p' Makefile.in | grep check-TESTS diff --git a/tests/check2.test b/tests/check2.test index 9ff3430aa..d8071f49d 100755 --- a/tests/check2.test +++ b/tests/check2.test @@ -16,7 +16,7 @@ # Test Automake style tests. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/check3.test b/tests/check3.test index bebf3e4a6..0050e45c1 100755 --- a/tests/check3.test +++ b/tests/check3.test @@ -17,7 +17,7 @@ # Make sure `check:' and `install:' honor $(BUILT_SOURCES). # PR/359. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/check4.test b/tests/check4.test index b17141bf0..fce92192c 100755 --- a/tests/check4.test +++ b/tests/check4.test @@ -16,7 +16,7 @@ # Make sure `make -k check' processes all directories. -. ./defs || exit 1 +. ./defs || Exit 1 set -e @@ -50,10 +50,10 @@ $ACLOCAL $AUTOCONF $AUTOMAKE ./configure --prefix "`pwd`/inst" -$MAKE check >stdout && exit 1 +$MAKE check >stdout && Exit 1 cat stdout grep 'FAIL: fail.sh' stdout -grep 'PASS: ok.sh' stdout && exit 1 +grep 'PASS: ok.sh' stdout && Exit 1 # The exit status of `make -k' can be anything # (depending on the Make implementation) @@ -73,7 +73,7 @@ grep 'PASS: ok.sh' stdout # Use --version AND -v, because SGI Make doesn't fail on --version. # Also grep for GNU because newer versions of FreeBSD make do # not complain about `--version' (they seem to silently ignore it). -($MAKE --version -v | grep GNU) || exit 0 +($MAKE --version -v | grep GNU) || Exit 0 # Try with a long-option that do not have a short option equivalent # (here, --no-print-directory). That should cause all options to diff --git a/tests/check5.test b/tests/check5.test index 3c713e928..58c860714 100755 --- a/tests/check5.test +++ b/tests/check5.test @@ -16,7 +16,7 @@ # Test TESTS = $(check_PROGRAMS) -. ./defs || exit 1 +. ./defs || Exit 1 set -e @@ -52,6 +52,6 @@ test -f ok EXEEXT=.bin $MAKE -e print-tests >output cat output # No am__EXEEXT_* variable is needed. -grep '_EXEEXT' Makefile.in && exit 1 +grep '_EXEEXT' Makefile.in && Exit 1 grep 'BEG: one.bin two.bin :END' output $FGREP 'TESTS = $(check_PROGRAMS)' Makefile.in diff --git a/tests/check6.test b/tests/check6.test index 2e006da41..5e102fc30 100755 --- a/tests/check6.test +++ b/tests/check6.test @@ -17,7 +17,7 @@ # Test for PR 400: XFAIL_TESTS delimited by TABs. # Also test that Solaris make VPATH rewriting is honored -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/check7.test b/tests/check7.test index 596d5ce18..a304cc193 100755 --- a/tests/check7.test +++ b/tests/check7.test @@ -16,7 +16,7 @@ # Check EXEEXT extension for XFAIL_TESTS. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/checkall.test b/tests/checkall.test index 12b2f504d..145dade1c 100755 --- a/tests/checkall.test +++ b/tests/checkall.test @@ -16,7 +16,7 @@ # Test for bug where check target doesn't depend on all. -. ./defs || exit 1 +. ./defs || Exit 1 cat > Makefile.am << 'END' bin_SCRIPTS = derived @@ -24,8 +24,8 @@ check-local: true END -$ACLOCAL || exit 1 -$AUTOMAKE || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE || Exit 1 -grep '^check-am:.*all-am' Makefile.in || exit 1 +grep '^check-am:.*all-am' Makefile.in || Exit 1 grep 'MAKE.*check-local' Makefile.in diff --git a/tests/clean.test b/tests/clean.test index 145f7cfae..eafa9c01d 100755 --- a/tests/clean.test +++ b/tests/clean.test @@ -16,11 +16,11 @@ # Test to make sure a clean target depends on previous one. -. ./defs || exit 1 +. ./defs || Exit 1 : > Makefile.am -$ACLOCAL || exit 1 -$AUTOMAKE || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE || Exit 1 grep '^clean-am:.*mostlyclean-am' Makefile.in diff --git a/tests/clean2.test b/tests/clean2.test index a5890b928..cc6a12103 100755 --- a/tests/clean2.test +++ b/tests/clean2.test @@ -17,7 +17,7 @@ # Make sure distclean works in cygnus mode. # Report from Daniel Jacobowitz -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/colneq.test b/tests/colneq.test index 40b2bca27..39ef93da9 100755 --- a/tests/colneq.test +++ b/tests/colneq.test @@ -16,7 +16,7 @@ # Test that := definitions produce warnings, but otherwise work. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/colneq2.test b/tests/colneq2.test index 06f445eaf..a3a6475d3 100755 --- a/tests/colneq2.test +++ b/tests/colneq2.test @@ -16,7 +16,7 @@ # Test that := in var substitutions works. -. ./defs || exit 1 +. ./defs || Exit 1 cat > Makefile.am << 'END' t = a b c @@ -27,5 +27,5 @@ END : > b.test : > c.test -$ACLOCAL || exit 1 +$ACLOCAL || Exit 1 $AUTOMAKE diff --git a/tests/colon.test b/tests/colon.test index 29db5cd08..f648d895a 100755 --- a/tests/colon.test +++ b/tests/colon.test @@ -17,7 +17,7 @@ # Test for bug reported by Nyul Laszlo. When using the ":" syntax in # AC_OUTPUT, Automake fails to find the correct file. -. ./defs || exit 1 +. ./defs || Exit 1 cat > configure.in << 'END' AC_INIT @@ -29,5 +29,5 @@ END : > foo.hin : > stamp-h.in -$ACLOCAL || exit 1 +$ACLOCAL || Exit 1 $AUTOMAKE diff --git a/tests/colon2.test b/tests/colon2.test index 810d38d40..b66a3166a 100755 --- a/tests/colon2.test +++ b/tests/colon2.test @@ -16,7 +16,7 @@ # Make sure ":" works with files automake generates. -. ./defs || exit 1 +. ./defs || Exit 1 cat > configure.in << 'END' AC_INIT @@ -26,10 +26,10 @@ END : > zardoz.am -$ACLOCAL || exit 1 -$AUTOMAKE || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE || Exit 1 # We actually check several things here. -test -f zardoz.in || exit 1 -grep '^zardoz:' zardoz.in && exit 1 -exit 0 +test -f zardoz.in || Exit 1 +grep '^zardoz:' zardoz.in && Exit 1 +Exit 0 diff --git a/tests/colon3.test b/tests/colon3.test index c486a3826..41c4edb46 100755 --- a/tests/colon3.test +++ b/tests/colon3.test @@ -18,7 +18,7 @@ # Make sure ":" works with files automake generates. # This test is for multiple ":"s. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/colon4.test b/tests/colon4.test index d32097dc8..80d57fa70 100755 --- a/tests/colon4.test +++ b/tests/colon4.test @@ -18,7 +18,7 @@ # This test is for multiple ":"s. # Test from Maciej W. Rozycki. -. ./defs || exit 1 +. ./defs || Exit 1 cat > configure.in << 'END' AC_INIT @@ -31,9 +31,9 @@ END : > two : > three -$ACLOCAL || exit 1 -$AUTOMAKE || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE || Exit 1 # The rule should regenerate the file "zardoz". -grep '^zardoz:one:two' Makefile.in && exit 1 -exit 0 +grep '^zardoz:one:two' Makefile.in && Exit 1 +Exit 0 diff --git a/tests/colon5.test b/tests/colon5.test index d8653a22d..1d0b8a1d8 100755 --- a/tests/colon5.test +++ b/tests/colon5.test @@ -16,7 +16,7 @@ # Another multi-":" test, this time from Doug Evans. -. ./defs || exit 1 +. ./defs || Exit 1 cat > configure.in << 'END' AC_INIT @@ -27,7 +27,7 @@ END : > Makefile.am : > Makefile.dep -$ACLOCAL || exit 1 -$AUTOMAKE || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE || Exit 1 grep 'Makefile:Makefile.in' Makefile.in diff --git a/tests/colon6.test b/tests/colon6.test index 0fc575500..ed0d1c0bb 100755 --- a/tests/colon6.test +++ b/tests/colon6.test @@ -16,7 +16,7 @@ # Yet another multi-":" test, this time from Ken Pizzini. -. ./defs || exit 1 +. ./defs || Exit 1 cat > configure.in << 'END' AC_INIT @@ -29,5 +29,5 @@ mkdir demo : > demo/Makefile.am : > demo/version.gin -$ACLOCAL || exit 1 +$ACLOCAL || Exit 1 $AUTOMAKE diff --git a/tests/colon7.test b/tests/colon7.test index 582d8e41e..cb07fb727 100755 --- a/tests/colon7.test +++ b/tests/colon7.test @@ -17,7 +17,7 @@ # Another test for a failing ":" in AC_OUTPUT. Report from Maciej # Stachowiak. -. ./defs || exit 1 +. ./defs || Exit 1 cat > configure.in << 'END' AC_INIT @@ -34,13 +34,13 @@ mkdir subdir : > subdir/Makefile.am : > subdir/foo -$ACLOCAL || exit 1 -$AUTOMAKE || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE || Exit 1 # shouldn't have any bar.in -grep 'bar.in' subdir/Makefile.in && exit 1 +grep 'bar.in' subdir/Makefile.in && Exit 1 # DIST_COMMON should have foo, not subdir/foo -grep 'DIST_COMMON.*subdir/foo' subdir/Makefile.in && exit 1 +grep 'DIST_COMMON.*subdir/foo' subdir/Makefile.in && Exit 1 -exit 0 +Exit 0 diff --git a/tests/color.test b/tests/color.test index dd4ded590..5a02e8d19 100755 --- a/tests/color.test +++ b/tests/color.test @@ -16,7 +16,7 @@ # Test Automake TESTS color output. -. ./defs || exit 1 +. ./defs || Exit 1 set -e @@ -34,7 +34,7 @@ std='[m' # GNU or BSD 'grep -a' works on files, but is not portable. case `echo "$std" | grep .` in $std) ;; - *) exit 77 ;; + *) Exit 77 ;; esac cat >>configure.in <<END @@ -85,11 +85,11 @@ test_color () test_no_color () { # Not a useless use of cat; see above comments about grep. - cat stdout | grep ": pass" | $FGREP "$grn" && exit 1 - cat stdout | grep ": fail" | $FGREP "$red" && exit 1 - cat stdout | grep ": xfail" | $FGREP "$lgn" && exit 1 - cat stdout | grep ": xpass" | $FGREP "$red" && exit 1 - cat stdout | grep ": skip" | $FGREP "$blu" && exit 1 + cat stdout | grep ": pass" | $FGREP "$grn" && Exit 1 + cat stdout | grep ": fail" | $FGREP "$red" && Exit 1 + cat stdout | grep ": xfail" | $FGREP "$lgn" && Exit 1 + cat stdout | grep ": xpass" | $FGREP "$red" && Exit 1 + cat stdout | grep ": skip" | $FGREP "$blu" && Exit 1 : } @@ -101,15 +101,15 @@ END unset TESTS || : -AM_COLOR_TESTS=always $MAKE -e check >stdout && { cat stdout; exit 1; } +AM_COLOR_TESTS=always $MAKE -e check >stdout && { cat stdout; Exit 1; } cat stdout test_color -MAKE=$MAKE expect -f expect-make >stdout || exit 77 +MAKE=$MAKE expect -f expect-make >stdout || Exit 77 cat stdout test_color -AM_COLOR_TESTS=no MAKE=$MAKE expect -f expect-make >stdout || exit 77 +AM_COLOR_TESTS=no MAKE=$MAKE expect -f expect-make >stdout || Exit 77 cat stdout test_no_color : diff --git a/tests/commen10.test b/tests/commen10.test index 760000ac0..762920a11 100755 --- a/tests/commen10.test +++ b/tests/commen10.test @@ -17,7 +17,7 @@ # Make sure comments following trailing backslashes are diagnosed. # Report from Harald Dunkel. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/comment.test b/tests/comment.test index 93b9c8efc..4d01c3ccd 100755 --- a/tests/comment.test +++ b/tests/comment.test @@ -17,11 +17,11 @@ # Make sure that `#' as start of word in AUTOMAKE_OPTIONS means # comment. -. ./defs || exit 1 +. ./defs || Exit 1 cat > Makefile.am << 'END' AUTOMAKE_OPTIONS = #no such option END -$ACLOCAL || exit 1 +$ACLOCAL || Exit 1 $AUTOMAKE diff --git a/tests/comment2.test b/tests/comment2.test index ce2330353..a4008e06a 100755 --- a/tests/comment2.test +++ b/tests/comment2.test @@ -17,7 +17,7 @@ # Make sure comment recognition works in PROGRAMS. Report from Mark # Galassi. -. ./defs || exit 1 +. ./defs || Exit 1 cat >> configure.in << 'END' AC_PROG_CC @@ -27,8 +27,8 @@ cat > Makefile.am << 'END' bin_PROGRAMS = sim_products receive_th receive_pos # image_proc END -$ACLOCAL || exit 1 -$AUTOMAKE || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE || Exit 1 -grep '^image_proc' Makefile.in && exit 1 -exit 0 +grep '^image_proc' Makefile.in && Exit 1 +Exit 0 diff --git a/tests/comment3.test b/tests/comment3.test index 76b49d9d8..fb46d3281 100755 --- a/tests/comment3.test +++ b/tests/comment3.test @@ -19,7 +19,7 @@ # shell, which in turn can't find `#' as a command. # Sigh. Some vendors must be destroyed. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/comment4.test b/tests/comment4.test index ebffa8b6b..b444a0fbb 100755 --- a/tests/comment4.test +++ b/tests/comment4.test @@ -16,7 +16,7 @@ # Make sure commented variables are output near their comments. -. ./defs || exit 1 +. ./defs || Exit 1 cat >> configure.in <<'EOF' AC_OUTPUT diff --git a/tests/comment5.test b/tests/comment5.test index 9ac2fbd81..713dbb185 100755 --- a/tests/comment5.test +++ b/tests/comment5.test @@ -17,7 +17,7 @@ # Test for PR/280. # (Automake should complain about trailing backslashes in comments.) -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/comment6.test b/tests/comment6.test index 29654ca28..4ac80b93a 100755 --- a/tests/comment6.test +++ b/tests/comment6.test @@ -16,7 +16,7 @@ # Test for PR/322. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/comment7.test b/tests/comment7.test index 88e09866a..35656c724 100755 --- a/tests/comment7.test +++ b/tests/comment7.test @@ -17,7 +17,7 @@ # Make sure comment for conditional variables are output near the # corresponding conditional definitions. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/comment8.test b/tests/comment8.test index fcb4a9700..f5c446a8c 100755 --- a/tests/comment8.test +++ b/tests/comment8.test @@ -17,7 +17,7 @@ # Make sure += does not append to a comment. # Report from Stepan Kasal. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/comment9.test b/tests/comment9.test index 3911edc2e..68c909a2c 100755 --- a/tests/comment9.test +++ b/tests/comment9.test @@ -17,7 +17,7 @@ # Make sure ##-comments are ignored in variable definitions. # Report from Julien Sopena. -. ./defs || exit 1 +. ./defs || Exit 1 set -e @@ -48,6 +48,6 @@ sed -n -e '/^TESTS =.*\\$/ { }' -e '/^TESTS =/ p' Makefile.in > tests grep '3\.test' tests -grep '##' tests && exit 1 -grep '4\.test' tests && exit 1 +grep '##' tests && Exit 1 +grep '4\.test' tests && Exit 1 grep '5\.test' tests diff --git a/tests/compile.test b/tests/compile.test index 5c97adc81..bcc8b1057 100755 --- a/tests/compile.test +++ b/tests/compile.test @@ -16,7 +16,7 @@ # Make sure `compile' preserves spaces in its arguments. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/compile_f90_c_cxx.test b/tests/compile_f90_c_cxx.test index de02f2892..312c2ef9f 100755 --- a/tests/compile_f90_c_cxx.test +++ b/tests/compile_f90_c_cxx.test @@ -18,7 +18,7 @@ # mixed source objects. # (copied from compile_f_c_cxx.test) Mike Nolta <mrnolta@princeton.edu> -. ./defs || exit 1 +. ./defs || Exit 1 cat >> configure.in << 'END' AC_PROG_CC @@ -37,14 +37,14 @@ END : > bar.c : > baz.cc -$ACLOCAL || exit 1 -$AUTOMAKE || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE || Exit 1 # 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 +grep ' \$(COMPILE)' Makefile.in || Exit 1 +grep ' \$(CXXCOMPILE)' Makefile.in || Exit 1 +grep ' \$(FCCOMPILE)' Makefile.in || Exit 1 -exit 0 +Exit 0 diff --git a/tests/compile_f_c_cxx.test b/tests/compile_f_c_cxx.test index f36561e64..c9085cabe 100755 --- a/tests/compile_f_c_cxx.test +++ b/tests/compile_f_c_cxx.test @@ -18,7 +18,7 @@ # mixed source objects. # Matthew D. Langston <langston@SLAC.Stanford.EDU> -. ./defs || exit 1 +. ./defs || Exit 1 cat >> configure.in << 'END' AC_PROG_CC @@ -37,14 +37,14 @@ END : > bar.c : > baz.cc -$ACLOCAL || exit 1 -$AUTOMAKE || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE || Exit 1 # 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 +grep ' \$(COMPILE)' Makefile.in || Exit 1 +grep ' \$(CXXCOMPILE)' Makefile.in || Exit 1 +grep ' \$(F77COMPILE)' Makefile.in || Exit 1 -exit 0 +Exit 0 diff --git a/tests/cond.test b/tests/cond.test index 0ca3b71b5..111898b5d 100755 --- a/tests/cond.test +++ b/tests/cond.test @@ -16,7 +16,7 @@ # Check basic use of conditionals. -. ./defs || exit 1 +. ./defs || Exit 1 set -e @@ -36,7 +36,7 @@ END $ACLOCAL $AUTOMAKE -grep '^TEST_FALSE' Makefile.in && exit 1 -grep '^TEST_TRUE' Makefile.in && exit 1 +grep '^TEST_FALSE' Makefile.in && Exit 1 +grep '^TEST_TRUE' Makefile.in && Exit 1 grep '^@TEST_TRUE@VAR = true$' Makefile.in grep '^@TEST_FALSE@VAR = false$' Makefile.in diff --git a/tests/cond10.test b/tests/cond10.test index ffe96dbd8..254304b05 100755 --- a/tests/cond10.test +++ b/tests/cond10.test @@ -16,7 +16,7 @@ # Test for bug in conditionals. From Raja R Harinath. -. ./defs || exit 1 +. ./defs || Exit 1 cat > configure.in << 'END' AC_INIT(Makefile.am) diff --git a/tests/cond11.test b/tests/cond11.test index c12f5c330..51b7c2f1c 100755 --- a/tests/cond11.test +++ b/tests/cond11.test @@ -18,7 +18,7 @@ # This checks that, if LDADD is set from a conditional variable # and an AC_SUBST, the _DEPENDENCIES variable is set correctly. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/cond13.test b/tests/cond13.test index 065dde695..9104c25fd 100755 --- a/tests/cond13.test +++ b/tests/cond13.test @@ -17,7 +17,7 @@ # Test for bug in conditionals. # Report from Lars J. Aas. -. ./defs || exit 1 +. ./defs || Exit 1 cat >> configure.in << 'END' AC_PROG_CC @@ -47,7 +47,7 @@ endif libtest_a_SOURCES = $(TESTSOURCES) END -$ACLOCAL || exit 1 -$AUTOMAKE || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE || Exit 1 grep 'am_libtest_a_OBJECTS = .*$' Makefile.in diff --git a/tests/cond14.test b/tests/cond14.test index a6edd17e8..0e0a53942 100755 --- a/tests/cond14.test +++ b/tests/cond14.test @@ -17,7 +17,7 @@ # Test for bug in conditionals. # Report from Robert Boehne -. ./defs || exit 1 +. ./defs || Exit 1 cat >> configure.in << 'END' AC_PROG_CC @@ -43,8 +43,8 @@ endif bin_PROGRAMS = $(BUILD_helldl) END -$ACLOCAL || exit 1 -$AUTOMAKE || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE || Exit 1 num=`grep 'helldl$(EXEEXT):' Makefile.in | wc -l` test $num -eq 2 diff --git a/tests/cond15.test b/tests/cond15.test index 30f4953c6..3010c288a 100755 --- a/tests/cond15.test +++ b/tests/cond15.test @@ -16,7 +16,7 @@ # Regression test for conditionally defined overriding of automatic rules. -. ./defs || exit 1 +. ./defs || Exit 1 cat >> configure.in << 'END' AC_PROG_CC @@ -50,10 +50,10 @@ endif bin_PROGRAMS = helldl END -$ACLOCAL || exit 1 -$AUTOMAKE || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE || Exit 1 num1=`grep 'helldl$(EXEEXT):' Makefile.in | wc -l` num2=`grep '@COND1_FALSE@@COND2_TRUE@helldl$(EXEEXT):' Makefile.in | wc -l` -test $num1 -eq 4 || exit 1 -test $num2 -eq 1 || exit 1 +test $num1 -eq 4 || Exit 1 +test $num2 -eq 1 || Exit 1 diff --git a/tests/cond16.test b/tests/cond16.test index cc09ed671..5aebbca6b 100755 --- a/tests/cond16.test +++ b/tests/cond16.test @@ -18,7 +18,7 @@ # Report from Richard Boulton required=gcc -. ./defs || exit 1 +. ./defs || Exit 1 cat > configure.in << 'END' AC_INIT(hello.c) diff --git a/tests/cond17.test b/tests/cond17.test index 34598271f..d2f905233 100755 --- a/tests/cond17.test +++ b/tests/cond17.test @@ -18,7 +18,7 @@ # according to a conditional. # Report from Richard Boulton -. ./defs || exit 1 +. ./defs || Exit 1 cat > configure.in << 'END' AC_INIT(Makefile.am) diff --git a/tests/cond18.test b/tests/cond18.test index 981eaa520..a4737b0eb 100755 --- a/tests/cond18.test +++ b/tests/cond18.test @@ -18,7 +18,7 @@ # Report from Richard Boulton required='GNUmake gcc' -. ./defs || exit 1 +. ./defs || Exit 1 cat > configure.in << 'END' AC_INIT(Makefile.am) diff --git a/tests/cond19.test b/tests/cond19.test index f46441c86..f9d49b737 100755 --- a/tests/cond19.test +++ b/tests/cond19.test @@ -18,7 +18,7 @@ # Report from Richard Boulton required='GNUmake gcc' -. ./defs || exit 1 +. ./defs || Exit 1 cat > configure.in << 'END' AC_INIT(Makefile.am) @@ -78,7 +78,7 @@ echo $vala echo $valb echo $valc echo $vald -test "x$vala" = "xdlmaina1.c dlmainb2.c dlmaina1.o dlmainb2.o" || exit 1 -test "x$valb" = "xdlmainb1.c dlmaina2.c dlmainb1.o dlmaina2.o" || exit 1 -test "x$valc" = "xdlmaina1.c dlmainb2.c dlmaina1.o dlmainb2.o" || exit 1 -test "x$vald" = "xdlmainb1.c dlmaina2.c dlmainb1.o dlmaina2.o" || exit 1 +test "x$vala" = "xdlmaina1.c dlmainb2.c dlmaina1.o dlmainb2.o" || Exit 1 +test "x$valb" = "xdlmainb1.c dlmaina2.c dlmainb1.o dlmaina2.o" || Exit 1 +test "x$valc" = "xdlmaina1.c dlmainb2.c dlmaina1.o dlmainb2.o" || Exit 1 +test "x$vald" = "xdlmainb1.c dlmaina2.c dlmainb1.o dlmaina2.o" || Exit 1 diff --git a/tests/cond2.test b/tests/cond2.test index 109b32791..92140db18 100755 --- a/tests/cond2.test +++ b/tests/cond2.test @@ -16,7 +16,7 @@ # Check SUBDIRS set based on conditionals. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/cond20.test b/tests/cond20.test index 9f45f352a..145b5a2e6 100755 --- a/tests/cond20.test +++ b/tests/cond20.test @@ -17,7 +17,7 @@ # Regression test for recursion handling in substitution references to # conditional variables. -. ./defs || exit 1 +. ./defs || Exit 1 cat > configure.in << 'END' AC_INIT(Makefile.am) diff --git a/tests/cond21.test b/tests/cond21.test index 5b4a332c0..fd997c232 100755 --- a/tests/cond21.test +++ b/tests/cond21.test @@ -16,7 +16,7 @@ # Check for use of = and += in different conditions. -. ./defs || exit 1 +. ./defs || Exit 1 cat >> configure.in << 'END' AC_PROG_CC diff --git a/tests/cond22.test b/tests/cond22.test index 5384caec2..0a60cf409 100755 --- a/tests/cond22.test +++ b/tests/cond22.test @@ -17,7 +17,7 @@ # Regression test for bug when sources listed in conditional. # Report from Richard Boulton. PR/326. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/cond27.test b/tests/cond27.test index f7eb93779..4767b5671 100755 --- a/tests/cond27.test +++ b/tests/cond27.test @@ -34,5 +34,5 @@ EOF $ACLOCAL AUTOMAKE_fails -grep ' USE_FOO' stderr && exit 1 +grep ' USE_FOO' stderr && Exit 1 grep '!USE_FOO' stderr diff --git a/tests/cond3.test b/tests/cond3.test index 156c5e624..98e081a0d 100755 --- a/tests/cond3.test +++ b/tests/cond3.test @@ -17,7 +17,7 @@ # Test sources listed in conditional. # Report from Rob Savoye <rob@cygnus.com>, and Lars J. Aas. -. ./defs || exit 1 +. ./defs || Exit 1 cat > configure.in << 'END' AC_INIT @@ -53,8 +53,8 @@ endif targ_SOURCES = $(SONE) $(STWO) $(STHREE) END -$ACLOCAL || exit 1 -$AUTOMAKE || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE || Exit 1 # `b top' so that sed -n ' @@ -76,4 +76,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 || Exit 1 diff --git a/tests/cond37.test b/tests/cond37.test index 4f2fda6cf..9b9b5b369 100755 --- a/tests/cond37.test +++ b/tests/cond37.test @@ -43,7 +43,7 @@ $AUTOMAKE ./configure $MAKE check >stdout cat stdout -grep GrepMe1 stdout && exit 1 +grep GrepMe1 stdout && Exit 1 $MAKE install >stdout cat stdout grep GrepMe2 stdout @@ -54,6 +54,6 @@ cat stdout grep GrepMe1 stdout $MAKE install >stdout cat stdout -grep GrepMe2 stdout && exit 1 +grep GrepMe2 stdout && Exit 1 : diff --git a/tests/cond39.test b/tests/cond39.test index 1431ed11e..54088b74b 100755 --- a/tests/cond39.test +++ b/tests/cond39.test @@ -84,22 +84,22 @@ $AUTOMAKE --add-missing ./configure COND=true $MAKE 2>stderr cat stderr -grep 'overriding commands' stderr && exit 1 +grep 'overriding commands' stderr && Exit 1 $MAKE sure-exist -./prog1 && exit 1 -./sub/prog2 && exit 1 +./prog1 && Exit 1 +./sub/prog2 && Exit 1 $MAKE clean $MAKE sure-not-exist $MAKE $MAKE sure-exist -./prog1 && exit 1 -./sub/prog2 && exit 1 +./prog1 && Exit 1 +./sub/prog2 && Exit 1 $MAKE distclean ./configure COND=false $MAKE 2>stderr cat stderr -grep 'overriding commands' stderr && exit 1 +grep 'overriding commands' stderr && Exit 1 ./prog1 ./sub/prog2 $MAKE clean diff --git a/tests/cond4.test b/tests/cond4.test index 29fca3248..74397a879 100755 --- a/tests/cond4.test +++ b/tests/cond4.test @@ -17,7 +17,7 @@ # Another sources-in-conditional test. Report from Tim Goodwin. required='GNUmake gcc' -. ./defs || exit 1 +. ./defs || Exit 1 cat > configure.in << 'END' AC_INIT(Makefile.am) @@ -45,25 +45,25 @@ echo-objects: @echo $(targ_OBJECTS) END -$ACLOCAL || exit 1 -$AUTOMAKE || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE || Exit 1 # We should not output useless definitions. -test "`grep '^@TWO_FALSE@' Makefile.in | wc -l`" -eq 0 || exit 1 +test "`grep '^@TWO_FALSE@' Makefile.in | wc -l`" -eq 0 || Exit 1 -$AUTOCONF || exit 1 +$AUTOCONF || Exit 1 # Ignore user CFLAGS. CFLAGS= export CFLAGS -CONDITION1=true CONDITION2=true ./configure || exit 1 +CONDITION1=true CONDITION2=true ./configure || Exit 1 msgtt=`$MAKE --no-print-directory echo-objects` -CONDITION1=true CONDITION2=false ./configure || exit 1 +CONDITION1=true CONDITION2=false ./configure || Exit 1 msgtf=`$MAKE --no-print-directory echo-objects` -CONDITION1=false CONDITION2=true ./configure || exit 1 +CONDITION1=false CONDITION2=true ./configure || Exit 1 msgft=`$MAKE --no-print-directory echo-objects` -CONDITION1=false CONDITION2=false ./configure || exit 1 +CONDITION1=false CONDITION2=false ./configure || Exit 1 msgff=`$MAKE --no-print-directory echo-objects` echo $msgtt @@ -71,7 +71,7 @@ echo $msgtf echo $msgft echo $msgff -test "$msgtt" = "main.o one.o two.o" || exit 1 -test "$msgtf" = "main.o one.o" || exit 1 -test "$msgft" = "main.o two.o" || exit 1 -test "$msgff" = "main.o" || exit 1 +test "$msgtt" = "main.o one.o two.o" || Exit 1 +test "$msgtf" = "main.o one.o" || Exit 1 +test "$msgft" = "main.o two.o" || Exit 1 +test "$msgff" = "main.o" || Exit 1 diff --git a/tests/cond40.test b/tests/cond40.test index d567a6862..b6408cade 100755 --- a/tests/cond40.test +++ b/tests/cond40.test @@ -58,7 +58,7 @@ test ! -f file2 test -f file3 rm -f file1 file3 $MAKE file1 file3 -$MAKE file2 && exit 1 +$MAKE file2 && Exit 1 test -f file1 test ! -f file2 test -f file3 @@ -69,9 +69,9 @@ test ! -f file1 test -f file2 test ! -f file3 rm -f file2 -$MAKE file1 && exit 1 +$MAKE file1 && Exit 1 $MAKE file2 -$MAKE file3 && exit 1 +$MAKE file3 && Exit 1 test ! -f file1 test -f file2 test ! -f file3 diff --git a/tests/cond41.test b/tests/cond41.test index 281e48458..16da9430f 100755 --- a/tests/cond41.test +++ b/tests/cond41.test @@ -29,5 +29,5 @@ AM_COND_IF([COND], AC_OUTPUT END -$ACLOCAL && exit 1 +$ACLOCAL && Exit 1 : diff --git a/tests/cond5.test b/tests/cond5.test index 2f968bf1f..964327398 100755 --- a/tests/cond5.test +++ b/tests/cond5.test @@ -16,7 +16,7 @@ # Yet another sources-in-conditional test. Report from Tim Goodwin. -. ./defs || exit 1 +. ./defs || Exit 1 cat > configure.in << 'END' AC_INIT @@ -43,13 +43,13 @@ END # The bug is that automake hangs. So we give it a few seconds and # then kill it. -$ACLOCAL || exit 1 +$ACLOCAL || Exit 1 $AUTOMAKE & pid=$! sleep 60 kill -0 $pid && { kill $pid - exit 1 + Exit 1 } -exit 0 +Exit 0 diff --git a/tests/cond6.test b/tests/cond6.test index ae8cc84c9..3490058c2 100755 --- a/tests/cond6.test +++ b/tests/cond6.test @@ -16,7 +16,7 @@ # Test for an odd conditional bug. Report from Matt Leach. -. ./defs || exit 1 +. ./defs || Exit 1 echo 'AM_CONDITIONAL(FOO, true)' >> configure.in @@ -37,5 +37,5 @@ help_DATA = foo endif END -$ACLOCAL || exit 1 +$ACLOCAL || Exit 1 $AUTOMAKE diff --git a/tests/cond7.test b/tests/cond7.test index 56aec24c7..523acc92c 100755 --- a/tests/cond7.test +++ b/tests/cond7.test @@ -16,7 +16,7 @@ # Test for an odd conditional bug. Report from Pavel Roskin. -. ./defs || exit 1 +. ./defs || Exit 1 cat > configure.in << 'END' AC_INIT() @@ -35,7 +35,7 @@ ab_HEADERS = \ endif END -$ACLOCAL || exit 1 -$AUTOMAKE || exit 1 -grep '^[^#].*002' Makefile.in && exit 1 -exit 0 +$ACLOCAL || Exit 1 +$AUTOMAKE || Exit 1 +grep '^[^#].*002' Makefile.in && Exit 1 +Exit 0 diff --git a/tests/cond8.test b/tests/cond8.test index 8ab4dae6b..2286a10eb 100755 --- a/tests/cond8.test +++ b/tests/cond8.test @@ -17,7 +17,7 @@ # Test to make sure _PROGRAMS conditionals can be written in a useful # way. -. ./defs || exit 1 +. ./defs || Exit 1 echo 'AC_PROG_CC' >> configure.in echo 'AM_CONDITIONAL(X, false)' >> configure.in @@ -30,5 +30,5 @@ noinst_PROGRAMS = x y endif END -$ACLOCAL || exit 1 +$ACLOCAL || Exit 1 $AUTOMAKE diff --git a/tests/cond9.test b/tests/cond9.test index 21c37801d..d8ab4171a 100755 --- a/tests/cond9.test +++ b/tests/cond9.test @@ -16,7 +16,7 @@ # Test for bug in conditionals. From Raja R Harinath. -. ./defs || exit 1 +. ./defs || Exit 1 cat > configure.in << 'END' AC_INIT(Makefile.am) diff --git a/tests/condd.test b/tests/condd.test index ed38fa705..2467e6444 100755 --- a/tests/condd.test +++ b/tests/condd.test @@ -16,7 +16,7 @@ # Test for bug in conditionals. -. ./defs || exit 1 +. ./defs || Exit 1 set -e @@ -64,7 +64,7 @@ mkdir foo bar $ACLOCAL $AUTOCONF -grep "meaningless;characters" configure && exit 1 +grep "meaningless;characters" configure && Exit 1 $AUTOMAKE ./configure $MAKE test diff --git a/tests/condhook.test b/tests/condhook.test index 1ab2e250b..772d363b7 100755 --- a/tests/condhook.test +++ b/tests/condhook.test @@ -17,7 +17,7 @@ # Test install when a conditional install-*-hook is not defined. # Report by Nik A. Melchior (PR/428). -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/condinc.test b/tests/condinc.test index dc967a778..c31afb337 100755 --- a/tests/condinc.test +++ b/tests/condinc.test @@ -16,7 +16,7 @@ # Make sure a conditional include statement is handled properly. -. ./defs || exit 1 +. ./defs || Exit 1 cat >> configure.in << 'END' AM_CONDITIONAL(TOBE, false) @@ -33,11 +33,11 @@ target: dependency rule END -$ACLOCAL || exit 1 -$AUTOMAKE || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE || Exit 1 -grep '^target:' Makefile.in && exit 1 +grep '^target:' Makefile.in && Exit 1 -grep '^@TOBE_TRUE@target:' Makefile.in || exit 1 +grep '^@TOBE_TRUE@target:' Makefile.in || Exit 1 -exit 0 +Exit 0 diff --git a/tests/condinc2.test b/tests/condinc2.test index 746472ae4..2dd1313df 100755 --- a/tests/condinc2.test +++ b/tests/condinc2.test @@ -16,7 +16,7 @@ # Another test of conditional include statements. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/condlib.test b/tests/condlib.test index f1afa673e..af7237e27 100755 --- a/tests/condlib.test +++ b/tests/condlib.test @@ -17,7 +17,7 @@ # Test for bug with conditional library. # From Harlan Stenn -. ./defs || exit 1 +. ./defs || Exit 1 cat >> configure.in << 'END' AC_PROG_RANLIB @@ -34,8 +34,8 @@ nodist_librsaref_a_SOURCES = desc.c digit.c BUILT_SOURCES = $(nodist_librsaref_a_SOURCES) END -$ACLOCAL || exit 1 -$AUTOMAKE || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE || Exit 1 -$FGREP librsaref.a.c Makefile.in && exit 1 -exit 0 +$FGREP librsaref.a.c Makefile.in && Exit 1 +Exit 0 diff --git a/tests/condman.test b/tests/condman.test index 1bd6309ea..8b5c3a551 100755 --- a/tests/condman.test +++ b/tests/condman.test @@ -15,7 +15,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # Make sure conditionals work with man pages. -. ./defs || exit 1 +. ./defs || Exit 1 cat >> configure.in << 'END' AM_CONDITIONAL(FRED, true) @@ -32,5 +32,5 @@ END : > foo.1 : > joe.1 -$ACLOCAL || exit 1 +$ACLOCAL || Exit 1 $AUTOMAKE diff --git a/tests/condman2.test b/tests/condman2.test index 6969479ed..cc0d9db2e 100755 --- a/tests/condman2.test +++ b/tests/condman2.test @@ -15,16 +15,16 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # Make sure appropriate man install targets generated in all cases. -. ./defs || exit 1 +. ./defs || Exit 1 cat > Makefile.am << 'END' man_MANS = foo.1 foo.2 man5_MANS = foo.5 END -$ACLOCAL || exit 1 -$AUTOMAKE || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE || Exit 1 -grep '^install-man1:' Makefile.in || exit 1 -grep '^install-man2:' Makefile.in || exit 1 -grep '^install-man5:' Makefile.in || exit 1 +grep '^install-man1:' Makefile.in || Exit 1 +grep '^install-man2:' Makefile.in || Exit 1 +grep '^install-man5:' Makefile.in || Exit 1 diff --git a/tests/conf2.test b/tests/conf2.test index a92e818c5..aa74e94ac 100755 --- a/tests/conf2.test +++ b/tests/conf2.test @@ -16,7 +16,7 @@ # Test to make sure several config headers are allowed. -. ./defs || exit 1 +. ./defs || Exit 1 cat > configure.in << 'END' AC_INIT @@ -31,5 +31,5 @@ END : > config.h.in : > two.h.in -$ACLOCAL || exit 1 +$ACLOCAL || Exit 1 $AUTOMAKE diff --git a/tests/confdeps.test b/tests/confdeps.test index 40ca344ce..2047a27c7 100755 --- a/tests/confdeps.test +++ b/tests/confdeps.test @@ -16,7 +16,7 @@ # Make sure that config* files are properly regenerated. -. ./defs || exit 1 +. ./defs || Exit 1 echo "FOO = foo" > Makefile.am set -e @@ -32,6 +32,6 @@ echo "$me: Not generated by aclocal..." sed -n '3,$p' aclocal.m4 >aclocal.m4t mv aclocal.m4t aclocal.m4 $AUTOMAKE -grep '^\$(ACLOCAL_M4):' Makefile.in && exit 1 +grep '^\$(ACLOCAL_M4):' Makefile.in && Exit 1 -exit 0 +Exit 0 diff --git a/tests/conff.test b/tests/conff.test index 128a4bf1d..615ba78d5 100755 --- a/tests/conff.test +++ b/tests/conff.test @@ -18,7 +18,7 @@ # Report from Alexander Turbov. required=GNUmake -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/conff2.test b/tests/conff2.test index 60c0e0cfd..96a326905 100755 --- a/tests/conff2.test +++ b/tests/conff2.test @@ -16,7 +16,7 @@ # Make sure empty calls to AC_CONFIG_FILES or AC_CONFIG_HEADERS are diagnosed. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/confh.test b/tests/confh.test index 071126733..8e6102678 100755 --- a/tests/confh.test +++ b/tests/confh.test @@ -17,7 +17,7 @@ # Test to make sure config.h works in a subdir. # Report from Alexandre Oliva. -. ./defs || exit 1 +. ./defs || Exit 1 cat > configure.in << 'END' AC_INIT @@ -33,8 +33,8 @@ mkdir include : > include/Makefile.am : > include/config.h.in -$ACLOCAL || exit 1 -$AUTOMAKE || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE || Exit 1 (sed -n -e '/^DIST_COMMON =.*\\$/ { :loop @@ -46,11 +46,11 @@ $AUTOMAKE || exit 1 t loop p n - }' -e '/^DIST_COMMON =/ p' Makefile.in | grep acconfig.h) || exit 1 + }' -e '/^DIST_COMMON =/ p' Makefile.in | grep acconfig.h) || Exit 1 # Make sure re-running automake in a different way generates same # Makefile.in. mv Makefile.in save -$ACLOCAL || exit 1 -$AUTOMAKE Makefile || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE Makefile || Exit 1 cmp Makefile.in save diff --git a/tests/confh4.test b/tests/confh4.test index 7e01d1d53..eaf9a4076 100755 --- a/tests/confh4.test +++ b/tests/confh4.test @@ -16,7 +16,7 @@ # Test for PR 34. -. ./defs || exit 1 +. ./defs || Exit 1 cat > configure.in << 'END' AC_INIT @@ -38,7 +38,7 @@ mkdir include : > include/Makefile.am : > include/config.h.in -$ACLOCAL || exit 1 -$AUTOMAKE || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE || Exit 1 $EGREP '^DEFAULT_INCLUDES =.* -I(\.|\$\(top_builddir\))/include' Makefile.in diff --git a/tests/confh5.test b/tests/confh5.test index 2993fea1d..8e03525cc 100755 --- a/tests/confh5.test +++ b/tests/confh5.test @@ -16,7 +16,7 @@ # Make sure we do not distribute header sources when they are built. -. ./defs || exit 1 +. ./defs || Exit 1 cat >> configure.in << 'END' AC_SUBST([FOO], [name]) diff --git a/tests/config.test b/tests/config.test index d3a1b8f75..32b38ea5f 100755 --- a/tests/config.test +++ b/tests/config.test @@ -19,7 +19,7 @@ # that subdir, then we want to build config.h as the top level. required=GNUmake -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/confincl.test b/tests/confincl.test index 38b7fff71..bf4fbada6 100755 --- a/tests/confincl.test +++ b/tests/confincl.test @@ -18,7 +18,7 @@ # If config.h is not used, @CONFIG_INCLUDE_SPEC@ should not appear # in Makefile.in. -. ./defs || exit 1 +. ./defs || Exit 1 cat >> configure.in << 'END' AC_PROG_CC @@ -28,10 +28,10 @@ cat > Makefile.am << 'EOF' bin_PROGRAMS = fred EOF -$ACLOCAL || exit 1 -$AUTOMAKE || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE || Exit 1 if grep '@CONFIG_INCLUDE_SPEC@' Makefile.in; then - exit 1 + Exit 1 fi -exit 0 +Exit 0 diff --git a/tests/conflnk.test b/tests/conflnk.test index 60c707be5..e2146283e 100755 --- a/tests/conflnk.test +++ b/tests/conflnk.test @@ -17,7 +17,7 @@ # Test to make sure links created by AC_CONFIG_LINKS get removed with # `make distclean' -. ./defs || exit 1 +. ./defs || Exit 1 set -e @@ -62,11 +62,11 @@ $MAKE distclean test -f src test -f sdir/src2 -test -r dest && exit 1 -test -r dest2 && exit 1 -test -r sdir/dest3 && exit 1 -test -r dest4 && exit 1 -test -r sdir/dest5 && exit 1 -test -r sdir-no-make/dest6 && exit 1 +test -r dest && Exit 1 +test -r dest2 && Exit 1 +test -r sdir/dest3 && Exit 1 +test -r dest4 && Exit 1 +test -r sdir/dest5 && Exit 1 +test -r sdir-no-make/dest6 && Exit 1 : diff --git a/tests/conflnk2.test b/tests/conflnk2.test index f97cbdac7..852d5e503 100755 --- a/tests/conflnk2.test +++ b/tests/conflnk2.test @@ -17,7 +17,7 @@ # Test to make sure that sources for links created by AC_CONFIG_LINKS # are distributed. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/conflnk3.test b/tests/conflnk3.test index 244e84b59..7845364cb 100755 --- a/tests/conflnk3.test +++ b/tests/conflnk3.test @@ -17,14 +17,14 @@ # Test to make sure that AC_CONFIG_LINKS using a variable source # is not broken. -. ./defs || exit 1 +. ./defs || Exit 1 set -e # Skip platforms where `test -e' does not work. (Note that Changing # all `test -e' into `test -h' will not work when AC_CONFIG_LINKS # copies or hardlinks files.) -(test -e configure.in) >/dev/null 2>&1 || exit 77 +(test -e configure.in) >/dev/null 2>&1 || Exit 77 cat > Makefile.am << 'END' SUBDIRS = sdir @@ -65,8 +65,8 @@ $AUTOMAKE # $my_src_dir and $my_dest are variables local to configure, they should # not appear in Makefile. -grep my_src_dir Makefile.in && exit 1 -grep my_dest Makefile.in && exit 1 +grep my_src_dir Makefile.in && Exit 1 +grep my_dest Makefile.in && Exit 1 ./configure test -e sdir/dest2 diff --git a/tests/conflnk4.test b/tests/conflnk4.test index 6fc3fb713..ba5d0526e 100755 --- a/tests/conflnk4.test +++ b/tests/conflnk4.test @@ -21,7 +21,7 @@ # Test to make sure links to _identical files_ created by AC_CONFIG_LINKS get # removed with `make distclean' only if doing a VPATH build. -. ./defs || exit 1 +. ./defs || Exit 1 set -e @@ -76,10 +76,10 @@ test -f ../sdir/src2 test -f ../nonmk-subdir/src3 test -f ../sdir/mk-subdir/src4 -test -r src && exit 1 -test -r sdir/src2 && exit 1 -test -r nonmk-subdir/src3 && exit 1 -test -r sdir/mk-subdir/src4 && exit 1 +test -r src && Exit 1 +test -r sdir/src2 && Exit 1 +test -r nonmk-subdir/src3 && Exit 1 +test -r sdir/mk-subdir/src4 && Exit 1 cd .. ./configure diff --git a/tests/confsub.test b/tests/confsub.test index 5dfdcc656..767b19825 100755 --- a/tests/confsub.test +++ b/tests/confsub.test @@ -18,7 +18,7 @@ # Test to make sure config.h can be in subdir. # Also, make sure config.h is properly rebuilt. -. ./defs || exit 1 +. ./defs || Exit 1 cat > configure.in << 'END' AC_INIT @@ -37,23 +37,23 @@ END echo 'Before.' > subdir/config.hin -$ACLOCAL || exit 1 -$AUTOMAKE || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE || Exit 1 # Make sure subdir Makefile.in doesn't itself look in the subdir. # One line is allowed though: # # cd $(top_builddir) && $(SHELL) ./config.status subdir/config.h ($FGREP 'subdir/config.h' subdir/Makefile.in | - $FGREP -v 'cd $(top_builddir)') && exit 1 + $FGREP -v 'cd $(top_builddir)') && Exit 1 -$AUTOCONF || exit 1 -./configure || exit 1 +$AUTOCONF || Exit 1 +./configure || Exit 1 $FGREP 'Before.' subdir/config.h $sleep echo 'After.' > subdir/config.hin -$MAKE || exit 1 -$FGREP 'After.' subdir/config.h || exit 1 +$MAKE || Exit 1 +$FGREP 'After.' subdir/config.h || Exit 1 -exit 0 +Exit 0 diff --git a/tests/confvar.test b/tests/confvar.test index 32acf29cf..b23343c27 100755 --- a/tests/confvar.test +++ b/tests/confvar.test @@ -16,7 +16,7 @@ # Test to make sure configure_vars stuff works. -. ./defs || exit 1 +. ./defs || Exit 1 cat >> configure.in << 'END' AC_SUBST(QBERT) @@ -24,7 +24,7 @@ END : > Makefile.am -$ACLOCAL || exit 1 -$AUTOMAKE || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE || Exit 1 grep '^QBERT' Makefile.in diff --git a/tests/confvar2.test b/tests/confvar2.test index 3e36c051b..058d0e1d9 100755 --- a/tests/confvar2.test +++ b/tests/confvar2.test @@ -16,7 +16,7 @@ # Test for bug reported by Jim Meyering. -. ./defs || exit 1 +. ./defs || Exit 1 cat >> configure.in << 'END' AC_SUBST(OTHER_SCRIPTS) @@ -26,5 +26,5 @@ cat > Makefile.am << 'END' bin_SCRIPTS = foo END -$ACLOCAL || exit 1 +$ACLOCAL || Exit 1 $AUTOMAKE diff --git a/tests/copy.test b/tests/copy.test index 3e0bf4ce5..57a5d72b4 100755 --- a/tests/copy.test +++ b/tests/copy.test @@ -16,10 +16,10 @@ # Test to make sure `-c' works. Report from Andris Pavenis. -. ./defs || exit 1 +. ./defs || Exit 1 : > Makefile.am rm -f install-sh -$ACLOCAL || exit 1 +$ACLOCAL || Exit 1 $AUTOMAKE -c -a diff --git a/tests/ctarget1.test b/tests/ctarget1.test index 5fee6dd82..937cb6cb4 100755 --- a/tests/ctarget1.test +++ b/tests/ctarget1.test @@ -16,7 +16,7 @@ # Check basic use of conditionals. -. ./defs || exit 1 +. ./defs || Exit 1 cat > configure.in << 'END' AC_INIT @@ -36,9 +36,9 @@ END set -e -$ACLOCAL || exit 1 +$ACLOCAL || Exit 1 $AUTOMAKE grep '^@TEST_TRUE@target: true' Makefile.in grep '^@TEST_TRUE@ action' Makefile.in grep '^@TEST_FALSE@target: false' Makefile.in -exit 0 +Exit 0 diff --git a/tests/cxx.test b/tests/cxx.test index e75fbc21e..f2748a04d 100755 --- a/tests/cxx.test +++ b/tests/cxx.test @@ -17,7 +17,7 @@ # Test that `.c++' extension works. # From Ralf Corsepius. -. ./defs || exit 1 +. ./defs || Exit 1 cat >> configure.in << 'END' AC_PROG_CXX @@ -28,7 +28,7 @@ bin_PROGRAMS = hello hello_SOURCES = hello.c++ END -$ACLOCAL || exit 1 -$AUTOMAKE || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE || Exit 1 grep '^\.SUFFIXES:.*c[+][+]' Makefile.in diff --git a/tests/cxx2.test b/tests/cxx2.test index 5b153cf70..fd145c27f 100755 --- a/tests/cxx2.test +++ b/tests/cxx2.test @@ -16,7 +16,7 @@ # Test that Automake suggests using AC_PROG_CXX if C++ sources are used. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/cxxansi.test b/tests/cxxansi.test index 684b2dab8..f2e0826da 100755 --- a/tests/cxxansi.test +++ b/tests/cxxansi.test @@ -17,7 +17,7 @@ # Test to make sure ansi2knr doesn't use `$U' for C++. # Report from Robert Boehne. -. ./defs || exit 1 +. ./defs || Exit 1 cat >> configure.in << 'END' AC_PROG_CXX @@ -36,10 +36,10 @@ END : > doe.C : > jane.C -$ACLOCAL || exit 1 -$AUTOMAKE || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE || Exit 1 -$FGREP 'jane$U' Makefile.in && exit 1 -$FGREP 'doe$U' Makefile.in || exit 1 +$FGREP 'jane$U' Makefile.in && Exit 1 +$FGREP 'doe$U' Makefile.in || Exit 1 -exit 0 +Exit 0 diff --git a/tests/cxxcpp.test b/tests/cxxcpp.test index 70dde39da..0609bbf5a 100755 --- a/tests/cxxcpp.test +++ b/tests/cxxcpp.test @@ -16,7 +16,7 @@ # Make sure automake sees AC_PROG_CXXCPP. From Garth Corral. -. ./defs || exit 1 +. ./defs || Exit 1 cat >> configure.in << 'END' AC_PROG_CXXCPP @@ -25,7 +25,7 @@ END : > Makefile.am -$ACLOCAL || exit 1 -$AUTOMAKE || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE || Exit 1 grep '^CXXCPP' Makefile.in diff --git a/tests/cxxlibobj.test b/tests/cxxlibobj.test index 0b99d5aad..b9c267284 100755 --- a/tests/cxxlibobj.test +++ b/tests/cxxlibobj.test @@ -16,7 +16,7 @@ # Test to make sure LIBOBJS and C++ sources work right. -. ./defs || exit 1 +. ./defs || Exit 1 cat >> configure.in << 'END' AC_PROG_CXX @@ -34,7 +34,7 @@ END : > doe.C : > jane.C -$ACLOCAL || exit 1 -$AUTOMAKE || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE || Exit 1 grep CC Makefile.in diff --git a/tests/cxxlink.test b/tests/cxxlink.test index c55ba52f8..ce743b77d 100755 --- a/tests/cxxlink.test +++ b/tests/cxxlink.test @@ -16,7 +16,7 @@ # Test to make sure C++ linker is used when appropriate. -. ./defs || exit 1 +. ./defs || Exit 1 cat >> configure.in << 'END' AC_PROG_CC @@ -31,8 +31,8 @@ END : > lava.c : > lamp.cxx -$ACLOCAL || exit 1 -$AUTOMAKE || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE || Exit 1 # Look for this macro not at the beginning of any line; that will have # to be good enough for now. diff --git a/tests/cxxnoc.test b/tests/cxxnoc.test index e61b5b805..218e64ac9 100755 --- a/tests/cxxnoc.test +++ b/tests/cxxnoc.test @@ -16,7 +16,7 @@ # Test to make sure pure C++ sources don't include C-specific code. -. ./defs || exit 1 +. ./defs || Exit 1 set -e @@ -35,5 +35,5 @@ END $ACLOCAL $AUTOMAKE -$FGREP '(CC)' Makefile.in && exit 1 -exit 0 +$FGREP '(CC)' Makefile.in && Exit 1 +Exit 0 diff --git a/tests/cxxo.test b/tests/cxxo.test index 43f7d3702..30fe611d5 100755 --- a/tests/cxxo.test +++ b/tests/cxxo.test @@ -15,7 +15,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # Make sure C++ files are rewritten to ".o" and not just "o". -. ./defs || exit 1 +. ./defs || Exit 1 cat >> configure.in << 'END' AC_PROG_CXX @@ -28,7 +28,7 @@ END : > doe.C -$ACLOCAL || exit 1 -$AUTOMAKE || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE || Exit 1 $FGREP 'doe.$(OBJEXT)' Makefile.in diff --git a/tests/cygwin32.test b/tests/cygwin32.test index 42a9d0e2c..5cf53b2fb 100755 --- a/tests/cygwin32.test +++ b/tests/cygwin32.test @@ -16,7 +16,7 @@ # Test basic Cygwin32 functionality. -. ./defs || exit 1 +. ./defs || Exit 1 cat >> configure.in << 'END' AC_PROG_CC @@ -32,8 +32,8 @@ END : > www.c : > xtra.c -$ACLOCAL || exit 1 -$AUTOMAKE || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE || Exit 1 -grep '^CYGWIN' Makefile.in && exit 1 +grep '^CYGWIN' Makefile.in && Exit 1 grep 'EXEEXT' Makefile.in diff --git a/tests/dash.test b/tests/dash.test index 7b5a53b81..4c0d789b7 100755 --- a/tests/dash.test +++ b/tests/dash.test @@ -17,7 +17,7 @@ # Test to make sure `-' can be used in path. # Report from Matthew D. Langston. -. ./defs || exit 1 +. ./defs || Exit 1 cat > Makefile.am << 'END' include Make-lang @@ -25,5 +25,5 @@ END : > Make-lang -$ACLOCAL || exit 1 +$ACLOCAL || Exit 1 $AUTOMAKE diff --git a/tests/defs.in b/tests/defs.in index a797a82f9..91724275f 100644 --- a/tests/defs.in +++ b/tests/defs.in @@ -231,6 +231,18 @@ case "$srcdir" in ;; esac +# We use a trap below for cleanup. This requires us to go through +# hoops to get the right exit status transported through the signal. +# So use `Exit STATUS' instead of `exit STATUS' inside of the tests. +# Turn off errexit here so that we don't trip the bug with OSF1/Tru64 +# sh inside this function. +Exit () +{ + set +e + (exit $1) + exit $1 +} + curdir=`pwd` testSubDir=$me.dir chmod -R u+rwx $testSubDir > /dev/null 2>&1 @@ -250,13 +262,13 @@ trap 'exit_status=$? exit $exit_status ' 0 for signal in 1 2 13 15; do - trap 'signal='$signal'; { (exit 1); exit 1; }' $signal + trap 'signal='$signal'; { Exit 1; }' $signal done signal=0 # Copy in some files we need. for file in install-sh missing depcomp; do - cp "$srcdir/../lib/$file" "$testSubDir/$file" || exit 1 + cp "$srcdir/../lib/$file" "$testSubDir/$file" || Exit 1 done cd ./$testSubDir @@ -313,14 +325,14 @@ case $required in fi done case $required in - *libtool* ) test $libtool_found = yes || exit 77 ;; - *gettext* ) test $gettext_found = yes || exit 77 ;; + *libtool* ) test $libtool_found = yes || Exit 77 ;; + *gettext* ) test $gettext_found = yes || Exit 77 ;; esac # Libtool cannot cope with spaces in the build tree. Our testsuite setup # cannot cope with spaces in the source tree name for Libtool and gettext # tests. case $srcdir,`pwd` in - *\ * | *\ *) exit 77 ;; + *\ * | *\ *) Exit 77 ;; esac ACLOCAL="$ACLOCAL -Wno-syntax -I $srcdir/../m4 $extra_includes -I $aclocaldir" ;; @@ -372,7 +384,7 @@ AUTOMAKE_run () $AUTOMAKE ${1+"$@"} >stdout 2>stderr || exitcode=$? cat stderr cat stdout - test $exitcode = $expected_exitcode || exit 1 + test $exitcode = $expected_exitcode || Exit 1 } # AUTOMAKE_fails [options...] diff --git a/tests/defun.test b/tests/defun.test index 44b3dc3b0..69cf7a12e 100755 --- a/tests/defun.test +++ b/tests/defun.test @@ -16,7 +16,7 @@ # Make sure aclocal picks up on all macro definitions. -. ./defs || exit 1 +. ./defs || Exit 1 cat > acinclude.m4 << 'END' AC_DEFUN([AM_FUNC_TWO]) diff --git a/tests/defun2.test b/tests/defun2.test index 9eb9366af..faecf8a98 100755 --- a/tests/defun2.test +++ b/tests/defun2.test @@ -17,7 +17,7 @@ # Make sure we don't mistake a macro definition for an invocation. # From Jim Meyering. -. ./defs || exit 1 +. ./defs || Exit 1 cat >> configure.in << 'END' dnl if buggy this will require getloadavg.c @@ -34,5 +34,5 @@ END : > memcmp.c -$ACLOCAL || exit 1 +$ACLOCAL || Exit 1 $AUTOMAKE diff --git a/tests/dejagnu.test b/tests/dejagnu.test index bdbe16e0b..8ccb9a17a 100755 --- a/tests/dejagnu.test +++ b/tests/dejagnu.test @@ -16,7 +16,7 @@ # Test to make sure dejagnu tests and automake-style tests can coexist. -. ./defs || exit 1 +. ./defs || Exit 1 cat > Makefile.am << 'END' AUTOMAKE_OPTIONS = dejagnu @@ -25,8 +25,8 @@ END : > frob.test -$ACLOCAL || exit 1 -$AUTOMAKE || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE || Exit 1 grep '^check-TESTS' Makefile.in grep '^check-DEJAGNU' Makefile.in diff --git a/tests/dejagnu2.test b/tests/dejagnu2.test index e32a58ae6..dd9fd4687 100755 --- a/tests/dejagnu2.test +++ b/tests/dejagnu2.test @@ -16,7 +16,7 @@ # Make sure we don't override the user's site.exp rule. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/dejagnu3.test b/tests/dejagnu3.test index 34ebc3149..56106b452 100755 --- a/tests/dejagnu3.test +++ b/tests/dejagnu3.test @@ -17,7 +17,7 @@ # Check that the DejaGnu rules work for a simple program and test case. required=runtest -. ./defs || exit 1 +. ./defs || Exit 1 set -e @@ -65,5 +65,5 @@ $MAKE distcheck # Ensure that the envvar RUNTESTFLAGS is used. # Report from Mark Mitchell. -RUNTESTFLAGS=--unknown-option $MAKE check && exit 1 -exit 0 +RUNTESTFLAGS=--unknown-option $MAKE check && Exit 1 +Exit 0 diff --git a/tests/dejagnu4.test b/tests/dejagnu4.test index b23faaf12..40b58346a 100755 --- a/tests/dejagnu4.test +++ b/tests/dejagnu4.test @@ -18,7 +18,7 @@ # Also check PR 488: Failure of the first of several tools tested. required=runtest -. ./defs || exit 1 +. ./defs || Exit 1 set -e @@ -89,5 +89,5 @@ sed 's/E\(verything\)/Not e\1/' hammer > thammer mv thammer hammer chmod +x hammer -$MAKE check && exit 1 +$MAKE check && Exit 1 : diff --git a/tests/dejagnu5.test b/tests/dejagnu5.test index b9a5c1887..0b8dacac5 100755 --- a/tests/dejagnu5.test +++ b/tests/dejagnu5.test @@ -18,7 +18,7 @@ # the package by default. required=runtest -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/dejagnu6.test b/tests/dejagnu6.test index db0f52971..7d9b23999 100755 --- a/tests/dejagnu6.test +++ b/tests/dejagnu6.test @@ -17,7 +17,7 @@ # Check that "make check" fails, when a DejaGnu test fails. required=runtest -. ./defs || exit 1 +. ./defs || Exit 1 set -e @@ -54,7 +54,7 @@ $AUTOMAKE --add-missing ./configure -$MAKE check && exit 1 +$MAKE check && Exit 1 test -f faildeja.log test -f faildeja.sum $FGREP 'FAIL: test' faildeja.sum diff --git a/tests/dejagnu7.test b/tests/dejagnu7.test index 135909782..14d082dba 100755 --- a/tests/dejagnu7.test +++ b/tests/dejagnu7.test @@ -18,10 +18,10 @@ # (to detect TCL errors) on a file with TCL errors. required=runtest -. ./defs || exit 1 +. ./defs || Exit 1 # Check whether DejaGnu supports --status -runtest --help | $FGREP -e --status || exit 77 +runtest --help | $FGREP -e --status || Exit 77 cat > failtcl << 'END' #! /bin/sh @@ -56,7 +56,7 @@ $AUTOMAKE --add-missing ./configure -$MAKE check && exit 1 +$MAKE check && Exit 1 test -f failtcl.log test -f failtcl.sum $FGREP 'missing close-brace' failtcl.sum diff --git a/tests/depacl2.test b/tests/depacl2.test index c56c015bd..8ee3463e8 100755 --- a/tests/depacl2.test +++ b/tests/depacl2.test @@ -17,7 +17,7 @@ # Test to make sure dependencies work when required macro is part of # autoconf. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/depcomp.test b/tests/depcomp.test index fc87064ae..a75e455c4 100755 --- a/tests/depcomp.test +++ b/tests/depcomp.test @@ -17,7 +17,7 @@ # Test to make sure depcomp is installed and found properly # when required for multiple directories -. ./defs || exit 1 +. ./defs || Exit 1 cat > configure.in << 'END' AC_INIT @@ -40,9 +40,9 @@ cp subdir/Makefile.am subdir2/Makefile.am : > subdir/foo.c : > subdir2/foo.c -$ACLOCAL || exit 1 -$AUTOMAKE --add-missing || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE --add-missing || Exit 1 # There used to be a bug where this was created in the first subdir with C # sources in it instead of in $top_srcdir or $ac_auxdir -test -f depcomp || exit 1 +test -f depcomp || Exit 1 diff --git a/tests/depcomp2.test b/tests/depcomp2.test index f503e7854..a538df830 100755 --- a/tests/depcomp2.test +++ b/tests/depcomp2.test @@ -18,7 +18,7 @@ # From Pavel Roskin. required=gcc -. ./defs || exit 1 +. ./defs || Exit 1 cat > configure.in << 'END' AC_INIT(subdir/foo.c) @@ -45,8 +45,8 @@ END CFLAGS= export CFLAGS -$ACLOCAL || exit 1 -$AUTOMAKE --add-missing || exit 1 -$AUTOCONF || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE --add-missing || Exit 1 +$AUTOCONF || Exit 1 ./configure CC='gcc' 2>error.log test -z "`cat error.log`" diff --git a/tests/depcomp3.test b/tests/depcomp3.test index 62b03248c..9f712df85 100755 --- a/tests/depcomp3.test +++ b/tests/depcomp3.test @@ -17,7 +17,7 @@ # Make sure dashmstdout generates dependencies. required='gcc' -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/depcomp4.test b/tests/depcomp4.test index 5aaf93ec7..1f886fb45 100755 --- a/tests/depcomp4.test +++ b/tests/depcomp4.test @@ -17,7 +17,7 @@ # Test for PR 385: makedepend doesn't work with Libtool. required='libtoolize gcc makedepend' -. ./defs || exit 1 +. ./defs || Exit 1 set -e @@ -53,5 +53,5 @@ grep am_cv_CC_dependencies_compiler_type configure ./configure am_cv_CC_dependencies_compiler_type=makedepend $MAKE >output 2>&1 cat output -grep 'unknown directive' output && exit 1 +grep 'unknown directive' output && Exit 1 $MAKE grepdeps diff --git a/tests/depcomp5.test b/tests/depcomp5.test index 610a5aa40..75a5eaafa 100755 --- a/tests/depcomp5.test +++ b/tests/depcomp5.test @@ -17,7 +17,7 @@ # Check icc's dependency mode. required='icc' -. ./defs || exit 1 +. ./defs || Exit 1 # Automake supports icc since version 7.0 through a dedicated depcomp mode. # icc 8.0 and greater understand gcc options, so depmode is set to gcc. diff --git a/tests/depcomp6.test b/tests/depcomp6.test index d3cebefc0..aafac1361 100755 --- a/tests/depcomp6.test +++ b/tests/depcomp6.test @@ -16,7 +16,7 @@ # Check dependency generation (non libtool case). -. ./defs || exit 1 +. ./defs || Exit 1 set -e @@ -94,6 +94,6 @@ else cd sub2 $sleep echo 'choke me' > sub3/ba3.h - if $MAKE; then exit 1; fi + if $MAKE; then Exit 1; fi fi : diff --git a/tests/depcomp7.test b/tests/depcomp7.test index f3cbd2407..d34d5f0c3 100755 --- a/tests/depcomp7.test +++ b/tests/depcomp7.test @@ -17,7 +17,7 @@ # Check dependency generation (libtool case). required='libtoolize' -. ./defs || exit 1 +. ./defs || Exit 1 set -e @@ -97,7 +97,7 @@ for staticshared in --disable-shared "" --disable-static; do cd sub2 $sleep echo 'choke me' > sub3/ba3.h - if $MAKE; then exit 1; fi + if $MAKE; then Exit 1; fi cd .. fi diff --git a/tests/depdist.test b/tests/depdist.test index 3ec88a9c1..8afb60d47 100755 --- a/tests/depdist.test +++ b/tests/depdist.test @@ -17,7 +17,7 @@ # Make sure depcomp is found for the distribution. # From Eric Magnien. -. ./defs || exit 1 +. ./defs || Exit 1 rm -f configure.in diff --git a/tests/depend.test b/tests/depend.test index 8e160cf60..e3090a367 100755 --- a/tests/depend.test +++ b/tests/depend.test @@ -18,7 +18,7 @@ # In some cases the auto-dependency can get confused and try # to `-include' a directory (if a backslash-newline appears in _SOURCES). -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/depend2.test b/tests/depend2.test index 0d0b186f0..15624a03e 100755 --- a/tests/depend2.test +++ b/tests/depend2.test @@ -20,7 +20,7 @@ # Report from Robert Boehne required=gcc -. ./defs || exit 1 +. ./defs || Exit 1 cat > configure.in << 'END' AC_INIT(hello.c) diff --git a/tests/depend3.test b/tests/depend3.test index 5753a2f1a..21eb440f5 100755 --- a/tests/depend3.test +++ b/tests/depend3.test @@ -16,7 +16,7 @@ # Test _DEPENDENCIES variable. From Lee Iverson. -. ./defs || exit 1 +. ./defs || Exit 1 cat > configure.in << 'END' AC_INIT @@ -45,5 +45,5 @@ DEPS = @DEPS@ TerraVision_DEPENDENCIES = $(DEPS) END -$ACLOCAL || exit 1 +$ACLOCAL || Exit 1 $AUTOMAKE diff --git a/tests/depend4.test b/tests/depend4.test index 893efecee..542692a25 100755 --- a/tests/depend4.test +++ b/tests/depend4.test @@ -16,7 +16,7 @@ # Check that dependencies are included when there are many header files. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/destdir.test b/tests/destdir.test index 57709270e..50ccb1a21 100755 --- a/tests/destdir.test +++ b/tests/destdir.test @@ -21,7 +21,7 @@ # It will only work for non-root users. required='ro-dir' -. ./defs || exit 1 +. ./defs || Exit 1 set -e @@ -47,5 +47,5 @@ $ACLOCAL $AUTOCONF $AUTOMAKE -a ./configure -$MAKE distcheck && exit 1 +$MAKE distcheck && Exit 1 : diff --git a/tests/dirforbid.test b/tests/dirforbid.test index 330688fd1..648ce5aa2 100755 --- a/tests/dirforbid.test +++ b/tests/dirforbid.test @@ -18,7 +18,7 @@ # Automake should flag them as errors. # For PR/294 -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/dirlist.test b/tests/dirlist.test index 98c26bb4a..5cd5f3a5c 100755 --- a/tests/dirlist.test +++ b/tests/dirlist.test @@ -17,7 +17,7 @@ # Check dirlist support. # This test relies on m4/dirlist -. ./defs || exit 1 +. ./defs || Exit 1 set -e @@ -47,13 +47,13 @@ $AUTOCONF # there should be no m4_include in aclocal.m4, even tho m4/dirlist contains # `./dirlist-test' as a relative directory. Only -I directories are subject # to file inclusion. -grep m4_include aclocal.m4 && exit 1 +grep m4_include aclocal.m4 && Exit 1 grep 'GUILE-VERSION' configure # This bug can occur only when we do a VPATH build of Automake # (because of the `-I' passed to aclocal in tests/defs/aclocal.in) but # it's OK because VPATH builds are done by `make distcheck'. -grep 'I should not be included' configure && exit 1 +grep 'I should not be included' configure && Exit 1 : diff --git a/tests/dirlist2.test b/tests/dirlist2.test index 628c0246a..c40f57de2 100755 --- a/tests/dirlist2.test +++ b/tests/dirlist2.test @@ -17,7 +17,7 @@ # Check dirlist globbing support. # This test relies on m4/dirlist -. ./defs || exit 1 +. ./defs || Exit 1 set -e @@ -49,7 +49,7 @@ $AUTOCONF # there should be no m4_include in aclocal.m4, even tho m4/dirlist contains # `./dirlist-test' as a relative directory. Only -I directories are subject # to file inclusion. -grep m4_include aclocal.m4 && exit 1 +grep m4_include aclocal.m4 && Exit 1 grep 'GUILE-VERSION' configure grep 'foo bar baz' configure diff --git a/tests/discover.test b/tests/discover.test index 4feeba578..292060f9c 100755 --- a/tests/discover.test +++ b/tests/discover.test @@ -16,7 +16,7 @@ # Test to make sure LIBOBJS file cannot be mentioned explicitly. -. ./defs || exit 1 +. ./defs || Exit 1 cat >> configure.in << 'END' AC_PROG_RANLIB @@ -33,6 +33,6 @@ END : > fsusage.c -$ACLOCAL || exit 1 -$AUTOMAKE 2>&1 | $FGREP fsusage.c || exit 1 -exit 0 +$ACLOCAL || Exit 1 +$AUTOMAKE 2>&1 | $FGREP fsusage.c || Exit 1 +Exit 0 diff --git a/tests/distcom2.test b/tests/distcom2.test index ed21e3014..2399b140b 100755 --- a/tests/distcom2.test +++ b/tests/distcom2.test @@ -17,7 +17,7 @@ # Test to make sure that depcomp and compile are added to DIST_COMMON # From Pavel Roskin. -. ./defs || exit 1 +. ./defs || Exit 1 cat >> configure.in << 'END' AC_PROG_CC @@ -41,11 +41,11 @@ END rm -f compile depcomp -$ACLOCAL || exit 1 -$AUTOMAKE --add-missing || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE --add-missing || Exit 1 -test -f compile || exit 1 -test -f depcomp || exit 1 +test -f compile || Exit 1 +test -f depcomp || Exit 1 sed -n -e '/^DIST_COMMON =.*\\$/ { :loop @@ -57,7 +57,7 @@ sed -n -e '/^DIST_COMMON =.*\\$/ { t loop p n - }' -e '/^DIST_COMMON =/ p' Makefile.in | grep compile || exit 1 + }' -e '/^DIST_COMMON =/ p' Makefile.in | grep compile || Exit 1 sed -n -e '/^DIST_COMMON =.*\\$/ { :loop @@ -69,4 +69,4 @@ sed -n -e '/^DIST_COMMON =.*\\$/ { t loop p n - }' -e '/^DIST_COMMON =/ p' Makefile.in | grep depcomp || exit 1 + }' -e '/^DIST_COMMON =/ p' Makefile.in | grep depcomp || Exit 1 diff --git a/tests/distcom3.test b/tests/distcom3.test index 2f9c221d1..be2ea6edf 100755 --- a/tests/distcom3.test +++ b/tests/distcom3.test @@ -17,7 +17,7 @@ # Test to make sure that non-existing common files are distributed # if they are buildable. -. ./defs || exit 1 +. ./defs || Exit 1 set -e @@ -36,7 +36,7 @@ $ACLOCAL # Should not warn about missing README, since it is a target. $AUTOMAKE --add-missing --gnu >stdout 2>&1 cat stdout -grep README stdout && exit 1 +grep README stdout && Exit 1 sed -n -e '/^DIST_COMMON =.*\\$/ { :loop diff --git a/tests/distcom4.test b/tests/distcom4.test index f5ba1987d..24810b405 100755 --- a/tests/distcom4.test +++ b/tests/distcom4.test @@ -20,7 +20,7 @@ # test with a Makefile in the directory. # Also make sure that README appears first in DIST_COMMON. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/distcom5.test b/tests/distcom5.test index c8d2752c8..bb14f86cd 100755 --- a/tests/distcom5.test +++ b/tests/distcom5.test @@ -19,7 +19,7 @@ # a Makefile in that directory. distcom4.test performs the same # test without Makefile in the directory. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/distcom6.test b/tests/distcom6.test index 340f836d1..2b4e24e3c 100755 --- a/tests/distcom6.test +++ b/tests/distcom6.test @@ -19,7 +19,7 @@ # This is similar to distcom2.test, but with --no-force added. # Report from Scott James Remnant (Debian #206299). -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/distcom7.test b/tests/distcom7.test index fb028a0a8..34fccbd58 100755 --- a/tests/distcom7.test +++ b/tests/distcom7.test @@ -17,7 +17,7 @@ # Test to make sure that Automake complains when an auxfile (here depcomp) # is installed, but the Makefile tht distributes it is not processed. -. ./defs || exit 1 +. ./defs || Exit 1 cat > configure.in << 'END' AC_INIT(subdir/foo.c) diff --git a/tests/distdir.test b/tests/distdir.test index 96760c20b..641a307b7 100755 --- a/tests/distdir.test +++ b/tests/distdir.test @@ -19,7 +19,7 @@ # EXTRA_DIST = ./joe # does not work portably: it fails with HP-UX and Tru64 make. -. ./defs || exit 1 +. ./defs || Exit 1 set -e @@ -46,7 +46,7 @@ cd build ../configure $MAKE distdir # Check to make sure `foo' isn't made in build directory. -test -d foo && exit 1 +test -d foo && Exit 1 rm -rf distdir-1.0 # Remove the dot from VERSION for the next grep. @@ -54,10 +54,10 @@ VERSION=10 MKDIR_P='echo MKDIR_P' $MAKE -e distdir >make.log || : # Make sure no `./' appear in the directory names. srcdir is `..', so # this also checks that no directory is created in the source tree. -grep 'MKDIR_P.*\.' make.log && exit 1 +grep 'MKDIR_P.*\.' make.log && Exit 1 cd .. ./configure --prefix "`pwd`" $MAKE distcheck -exit 0 +Exit 0 diff --git a/tests/distname.test b/tests/distname.test index fb06190f0..258eaf6fc 100755 --- a/tests/distname.test +++ b/tests/distname.test @@ -17,7 +17,7 @@ # Test of names in tar file. # From Rainer Orth -. ./defs || exit 1 +. ./defs || Exit 1 cat > configure.in << 'END' AC_INIT(a.c) @@ -43,5 +43,5 @@ $AUTOMAKE --include-deps --copy --add-missing $MAKE dist gunzip nonesuch-0.23.tar.gz -(tar tf nonesuch-0.23.tar | $FGREP './nonesuch-0.23/a.c') && exit 1 -exit 0 +(tar tf nonesuch-0.23.tar | $FGREP './nonesuch-0.23/a.c') && Exit 1 +Exit 0 diff --git a/tests/dollar.test b/tests/dollar.test index 40cb5fc25..ae9662396 100755 --- a/tests/dollar.test +++ b/tests/dollar.test @@ -21,7 +21,7 @@ # Require GNU make for this test. SunOS Make does not support # `$$' in a target or a dependency (it outputs the empty string instead). required=GNUmake -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/double.test b/tests/double.test index 20e6f308a..16bf42ffd 100755 --- a/tests/double.test +++ b/tests/double.test @@ -17,7 +17,7 @@ # Test to make sure listing a program twice is ok. # Report from Manu Rouat. -. ./defs || exit 1 +. ./defs || Exit 1 echo AC_PROG_CC >> configure.in @@ -25,5 +25,5 @@ cat > Makefile.am << 'END' bin_PROGRAMS = spice nutmeg help sconvert multidec nutmeg END -$ACLOCAL || exit 1 +$ACLOCAL || Exit 1 $AUTOMAKE diff --git a/tests/dup2.test b/tests/dup2.test index 9a6a2c11f..66e1202ab 100755 --- a/tests/dup2.test +++ b/tests/dup2.test @@ -16,7 +16,7 @@ # Make sure aclocal only warns about definitions overridden by acinclude.m4. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/else.test b/tests/else.test index 6f80ff5e0..58d13a79d 100755 --- a/tests/else.test +++ b/tests/else.test @@ -16,7 +16,7 @@ # Test to make sure line numbers are correct in some error reports. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/empty.test b/tests/empty.test index e07996b32..b90079627 100755 --- a/tests/empty.test +++ b/tests/empty.test @@ -18,7 +18,7 @@ # Test for bug where if the list of installables is empty, invalid sh # code is generated. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/empty2.test b/tests/empty2.test index 67d4d66f3..d838456f7 100755 --- a/tests/empty2.test +++ b/tests/empty2.test @@ -17,7 +17,7 @@ # Test to make sure empty _SOURCES suppresses assumption about default # name. Report from Pavel Roskin. -. ./defs || exit 1 +. ./defs || Exit 1 cat >> configure.in << 'END' AC_PROG_CC @@ -28,8 +28,8 @@ bin_PROGRAMS = pavel pavel_SOURCES = END -$ACLOCAL || exit 1 -$AUTOMAKE || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE || Exit 1 -grep 'pavel\.[co]' Makefile.in && exit 1 -exit 0 +grep 'pavel\.[co]' Makefile.in && Exit 1 +Exit 0 diff --git a/tests/empty3.test b/tests/empty3.test index ce296a4c1..59d327f9c 100755 --- a/tests/empty3.test +++ b/tests/empty3.test @@ -16,7 +16,7 @@ # A test for missing _SOURCES variable. -. ./defs || exit 1 +. ./defs || Exit 1 cat >> configure.in << 'END' AC_PROG_CC @@ -26,7 +26,7 @@ cat > Makefile.am << 'END' bin_PROGRAMS = pavel END -$ACLOCAL || exit 1 -$AUTOMAKE || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE || Exit 1 grep 'pavel\.[co]' Makefile.in diff --git a/tests/empty4.test b/tests/empty4.test index 68971fe3a..e1914402b 100755 --- a/tests/empty4.test +++ b/tests/empty4.test @@ -17,7 +17,7 @@ # Test to make sure empty _SOURCES works. # From Paul Berrevoets. -. ./defs || exit 1 +. ./defs || Exit 1 cat >> configure.in << 'END' AC_PROG_CC @@ -32,7 +32,7 @@ zoo_DEPENDENCIES = $(ZOO_OBJ) zoo_LDADD = $(zoo_DEPENDENCIES) END -$ACLOCAL || exit 1 -$AUTOMAKE || exit 1 -$FGREP zoo. Makefile.in && exit 1 -exit 0 +$ACLOCAL || Exit 1 +$AUTOMAKE || Exit 1 +$FGREP zoo. Makefile.in && Exit 1 +Exit 0 diff --git a/tests/exdir.test b/tests/exdir.test index 968ce726a..2754ef1f7 100755 --- a/tests/exdir.test +++ b/tests/exdir.test @@ -16,7 +16,7 @@ # Check to make sure new extended directory mechanism works. -. ./defs || exit 1 +. ./defs || Exit 1 cat > Makefile.am << 'EOF' htmldir = $(prefix)/html @@ -24,7 +24,7 @@ html_DATA = zot.html pkgdata_DATA = qbert EOF -$ACLOCAL || exit 1 -$AUTOMAKE || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE || Exit 1 grep '^DATA' Makefile.in | grep html diff --git a/tests/exdir2.test b/tests/exdir2.test index 9f5a842f6..2c5060f62 100755 --- a/tests/exdir2.test +++ b/tests/exdir2.test @@ -16,7 +16,7 @@ # Test to make sure undefined directories are invalid. -. ./defs || exit 1 +. ./defs || Exit 1 set -e @@ -27,5 +27,5 @@ EOF $ACLOCAL AUTOMAKE_fails -grep 'pkgdatadir' stderr && exit 1 +grep 'pkgdatadir' stderr && Exit 1 grep 'Makefile.am:1:.*quuzdir.*undefined' stderr diff --git a/tests/exdir3.test b/tests/exdir3.test index ed2c2fa5c..55fd6bf75 100755 --- a/tests/exdir3.test +++ b/tests/exdir3.test @@ -16,7 +16,7 @@ # Test to make sure pkgdatadir can be overridden via AC_SUBST. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/exeext.test b/tests/exeext.test index ad0e4a238..638318fa0 100755 --- a/tests/exeext.test +++ b/tests/exeext.test @@ -21,7 +21,7 @@ # Also make sure the old definitions of bin_PROGRAMS and friend # aren't left around. Report from Jim Meyering. -. ./defs || exit 1 +. ./defs || Exit 1 cat >> configure.in << 'END' AC_PROG_CC @@ -66,7 +66,7 @@ grep '^rmt$(EXEEXT):' Makefile.in test `grep '^bin_PROGRAMS =' Makefile.in | wc -l` = 1 # Make sure $(EXEEXT) gets stripped before canonicalization. -grep 'maude3__EXEEXT__OBJECTS' Makefile.in && exit 1 +grep 'maude3__EXEEXT__OBJECTS' Makefile.in && Exit 1 ./configure diff --git a/tests/exeext2.test b/tests/exeext2.test index 0909552bc..489426818 100755 --- a/tests/exeext2.test +++ b/tests/exeext2.test @@ -16,7 +16,7 @@ # Make sure no-exeext option works. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/exeext3.test b/tests/exeext3.test index f1471fe8c..f012ff3be 100755 --- a/tests/exeext3.test +++ b/tests/exeext3.test @@ -16,7 +16,7 @@ # Make sure we can override a program rule. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/exeext4.test b/tests/exeext4.test index d311d7023..344945df2 100755 --- a/tests/exeext4.test +++ b/tests/exeext4.test @@ -17,7 +17,7 @@ # Make sure $(EXEEXT) is appended to programs and to tests that are # programs, but not to @substitutions@. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/exsource.test b/tests/exsource.test index d36ae89c0..cb586f04c 100755 --- a/tests/exsource.test +++ b/tests/exsource.test @@ -18,7 +18,7 @@ # Test to make sure EXTRA_..._SOURCES actually works. # Bug report from Henrik Frystyk Nielsen. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/ext.test b/tests/ext.test index 758f2fe5e..f478af280 100755 --- a/tests/ext.test +++ b/tests/ext.test @@ -16,7 +16,7 @@ # Test to make sure extensions are set correctly for various languages. -. ./defs || exit 1 +. ./defs || Exit 1 cat >> configure.in << 'END' AC_PROG_F77 @@ -30,11 +30,11 @@ bin_PROGRAMS = foo foo_SOURCES = 1.f 2.for 3.f90 4.f95 5.F 6.F90 7.F95 8.r 9.m 10.upc END -$ACLOCAL || exit 1 -$AUTOMAKE || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE || Exit 1 for ext in f for f90 f95 F F90 F95 r m upc do - grep "^$ext\.o:" Makefile.in && exit 1 + grep "^$ext\.o:" Makefile.in && Exit 1 done -exit 0 +Exit 0 diff --git a/tests/extra.test b/tests/extra.test index 81f0bd67f..2d1f4dd66 100755 --- a/tests/extra.test +++ b/tests/extra.test @@ -19,7 +19,7 @@ # targets should always be generated. However, they should not be # built by default. -. ./defs || exit 1 +. ./defs || Exit 1 cat >> configure.in << 'END' AC_PROG_CC @@ -30,11 +30,11 @@ bin_PROGRAMS = @foo@ EXTRA_PROGRAMS = zardoz END -$ACLOCAL || exit 1 -$AUTOMAKE || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE || Exit 1 -grep "^zardoz" Makefile.in || exit 1 +grep "^zardoz" Makefile.in || Exit 1 # Can't have EXTRA clean rules. -grep 'clean.*EXTRA' Makefile.in && exit 1 -exit 0 +grep 'clean.*EXTRA' Makefile.in && Exit 1 +Exit 0 diff --git a/tests/extra2.test b/tests/extra2.test index 2a14824cd..628792fb6 100755 --- a/tests/extra2.test +++ b/tests/extra2.test @@ -16,7 +16,7 @@ # Check to make sure EXTRA_foo_SOURCES not defined unnecessarily. -. ./defs || exit 1 +. ./defs || Exit 1 cat >> configure.in << 'END' AC_PROG_CC @@ -26,8 +26,8 @@ cat > Makefile.am << 'END' bin_PROGRAMS = foo END -$ACLOCAL || exit 1 -$AUTOMAKE || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE || Exit 1 -grep EXTRA_foo_SOURCES Makefile.in && exit 1 -exit 0 +grep EXTRA_foo_SOURCES Makefile.in && Exit 1 +Exit 0 diff --git a/tests/extra3.test b/tests/extra3.test index 68baa4ef6..0d70c428b 100755 --- a/tests/extra3.test +++ b/tests/extra3.test @@ -16,7 +16,7 @@ # Check to make sure EXTRA_DATA not required. -. ./defs || exit 1 +. ./defs || Exit 1 echo 'AC_SUBST(CODICIL)' >> configure.in @@ -24,5 +24,5 @@ cat > Makefile.am << 'END' sysconf_DATA = @CODICIL@ END -$ACLOCAL || exit 1 +$ACLOCAL || Exit 1 $AUTOMAKE diff --git a/tests/extra4.test b/tests/extra4.test index 33dc61638..983afb4f1 100755 --- a/tests/extra4.test +++ b/tests/extra4.test @@ -16,7 +16,7 @@ # Check to make sure EXTRA_DATA can be specified. -. ./defs || exit 1 +. ./defs || Exit 1 echo 'AC_SUBST(CODICIL)' >> configure.in @@ -25,5 +25,5 @@ sysconf_DATA = @CODICIL@ EXTRA_DATA = codicil.txt END -$ACLOCAL || exit 1 +$ACLOCAL || Exit 1 $AUTOMAKE diff --git a/tests/extra5.test b/tests/extra5.test index c63aa3c0d..fd61628c2 100755 --- a/tests/extra5.test +++ b/tests/extra5.test @@ -17,7 +17,7 @@ # Check to make sure EXTRA_DIST can contain a directory from $buildir. # From Dean Povey. -. ./defs || exit 1 +. ./defs || Exit 1 echo AC_OUTPUT >> configure.in diff --git a/tests/extra6.test b/tests/extra6.test index 3e4982bf3..5629f4a33 100755 --- a/tests/extra6.test +++ b/tests/extra6.test @@ -17,7 +17,7 @@ # Check to make sure EXTRA_DIST can contain a directory or # a subdirectory, in $(builddir) or $(srcdir). -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/extra7.test b/tests/extra7.test index a11c39ae7..a481506bd 100755 --- a/tests/extra7.test +++ b/tests/extra7.test @@ -19,7 +19,7 @@ # $(srcdir)/X and ./X, with the files from the later overriding the # files from the former. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/f90only.test b/tests/f90only.test index b4697f723..4a2cbe4a2 100755 --- a/tests/f90only.test +++ b/tests/f90only.test @@ -17,7 +17,7 @@ # Make sure programs with only Fortran 90 source are handled properly. # (copied from fonly.test) Mike Nolta <mrnolta@princeton.edu> -. ./defs || exit 1 +. ./defs || Exit 1 cat >> configure.in << 'END' AC_PROG_FC @@ -44,7 +44,7 @@ END : > zardoz.f90 -$ACLOCAL || exit 1 -$AUTOMAKE || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE || Exit 1 grep 'zardoz.f90' Makefile.in diff --git a/tests/flibs.test b/tests/flibs.test index 45f23cbe3..b688d722c 100755 --- a/tests/flibs.test +++ b/tests/flibs.test @@ -17,7 +17,7 @@ # Make sure `AC_F77_LIBRARY_LDFLAGS' works properly. # Matthew D. Langston <langston@SLAC.Stanford.EDU> -. ./defs || exit 1 +. ./defs || Exit 1 cat >> configure.in << 'END' AC_PROG_F77 @@ -46,7 +46,7 @@ END : > zardoz.f -$ACLOCAL || exit 1 -$AUTOMAKE || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE || Exit 1 grep '@FLIBS@' Makefile.in diff --git a/tests/fn99.test b/tests/fn99.test index 04fcb093b..a23b169f9 100755 --- a/tests/fn99.test +++ b/tests/fn99.test @@ -16,7 +16,7 @@ # Check the filename-length-max=99 option. -. ./defs || exit 1 +. ./defs || Exit 1 set -e @@ -29,10 +29,10 @@ END (for i in 1 2 3 4 5 6 7 8 9 do - mkdir -p 12345678 || exit 77 + mkdir -p 12345678 || Exit 77 cd 12345678 touch x -done) || exit 77 +done) || Exit 77 $ACLOCAL $AUTOCONF @@ -42,12 +42,12 @@ $MAKE distcheck (for i in 1 2 3 4 5 6 7 8 9 10 11 do - mkdir -p 12345678 || exit 77 + mkdir -p 12345678 || Exit 77 cd 12345678 touch x -done) || exit 77 +done) || Exit 77 -$MAKE dist 2>stderr && exit 1 +$MAKE dist 2>stderr && Exit 1 cat stderr grep 'filenames are too long' stderr test 2 = `grep 12345678 stderr | wc -l` diff --git a/tests/fn99subdir.test b/tests/fn99subdir.test index f4003030b..e7b16c103 100755 --- a/tests/fn99subdir.test +++ b/tests/fn99subdir.test @@ -17,7 +17,7 @@ # PR 507: Check the filename-length-max=99 option # in conjunction with AC_CONFIG_SUBDIRS. -. ./defs || exit 1 +. ./defs || Exit 1 set -e @@ -34,7 +34,7 @@ AUTOMAKE_OPTIONS = filename-length-max=99 SUBDIRS = ${subdirname} END -mkdir ${subdirname} || exit 1 +mkdir ${subdirname} || Exit 1 cat >> ${subdirname}/configure.in <<EOF AC_INIT([${subdirname}], [1.0]) @@ -50,30 +50,30 @@ END (cd ${subdirname}; for i in 1 2 3 4 5 6 7 8 do - mkdir -p 12345678 || exit 77 + mkdir -p 12345678 || Exit 77 cd 12345678 touch x done) for init_dir in ${subdirname} .; do ( - cd ${init_dir} || exit 1 + cd ${init_dir} || Exit 1 $ACLOCAL $AUTOCONF $AUTOMAKE - ) || exit 1 + ) || Exit 1 done ./configure $MAKE distcheck (cd ${subdirname}; for i in 1 2 3 4 5 6 7 8 9 do - mkdir -p 12345678 || exit 77 + mkdir -p 12345678 || Exit 77 cd 12345678 touch x done) -$MAKE dist 2>stderr && exit 1 +$MAKE dist 2>stderr && Exit 1 cat stderr grep 'filenames are too long' stderr test 1 = `grep 12345678 stderr | wc -l` diff --git a/tests/fnoc.test b/tests/fnoc.test index 8186cc85c..f791fa075 100755 --- a/tests/fnoc.test +++ b/tests/fnoc.test @@ -18,7 +18,7 @@ # C-specific code. # Matthew D. Langston <langston@SLAC.Stanford.EDU> -. ./defs || exit 1 +. ./defs || Exit 1 cat >> configure.in << 'END' AC_PROG_F77 @@ -32,8 +32,8 @@ END : > doe.f : > jane.f -$ACLOCAL || exit 1 -$AUTOMAKE || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE || Exit 1 -grep '[^F]CC' Makefile.in | grep -v MKDEP && exit 1 -exit 0 +grep '[^F]CC' Makefile.in | grep -v MKDEP && Exit 1 +Exit 0 diff --git a/tests/fo.test b/tests/fo.test index 84b826555..2d78463e4 100755 --- a/tests/fo.test +++ b/tests/fo.test @@ -17,7 +17,7 @@ # Make sure Fortran 77 files are rewritten to ".o" and not just "o". # Matthew D. Langston <langston@SLAC.Stanford.EDU> -. ./defs || exit 1 +. ./defs || Exit 1 cat >> configure.in << 'END' AC_PROG_F77 @@ -30,7 +30,7 @@ END : > doe.f -$ACLOCAL || exit 1 -$AUTOMAKE || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE || Exit 1 $FGREP 'doe.$(OBJEXT)' Makefile.in diff --git a/tests/fonly.test b/tests/fonly.test index 59f594554..3006adad7 100755 --- a/tests/fonly.test +++ b/tests/fonly.test @@ -17,7 +17,7 @@ # Make sure programs with only Fortran 77 source are handled properly. # Matthew D. Langston <langston@SLAC.Stanford.EDU> -. ./defs || exit 1 +. ./defs || Exit 1 cat >> configure.in << 'END' AC_PROG_F77 @@ -44,7 +44,7 @@ END : > zardoz.f -$ACLOCAL || exit 1 -$AUTOMAKE || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE || Exit 1 grep 'zardoz.f' Makefile.in diff --git a/tests/fort1.test b/tests/fort1.test index f8249cf51..08cf00350 100755 --- a/tests/fort1.test +++ b/tests/fort1.test @@ -17,7 +17,7 @@ # Test that Automake suggests using AC_PROG_F77/FC if Fortran sources # are used. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/fort2.test b/tests/fort2.test index ee25592c3..3c591615a 100755 --- a/tests/fort2.test +++ b/tests/fort2.test @@ -19,7 +19,7 @@ # Cf. fort1.test and link_f90_only.test. -. ./defs || exit 1 +. ./defs || Exit 1 set -e @@ -45,18 +45,18 @@ $ACLOCAL $AUTOMAKE # The following tests aren't fool-proof, but they don't # need a Fortran compiler. -grep '.\$(LINK)' Makefile.in && exit 1 +grep '.\$(LINK)' Makefile.in && Exit 1 grep '.\$(FCLINK)' Makefile.in grep '.\$(FCCOMPILE)' Makefile.in > stdout -grep -v '\$(FCFLAGS_f' stdout && exit 1 -grep '.\$(FC.*\$(FCFLAGS_blabla' Makefile.in && exit 1 +grep -v '\$(FCFLAGS_f' stdout && Exit 1 +grep '.\$(FC.*\$(FCFLAGS_blabla' Makefile.in && Exit 1 # Notice the TAB: grep '^[ ].*\$(FC.*\$(FCFLAGS_f90).*\.f90' Makefile.in grep '^[ ].*\$(FC.*\$(FCFLAGS_f95).*\.f95' Makefile.in grep '^[ ].*\$(FC.*\$(FCFLAGS_f03).*\.f03' Makefile.in grep '^[ ].*\$(FC.*\$(FCFLAGS_f08).*\.f08' Makefile.in -grep '^[ ].*\$(FC.*\$(FCFLAGS_f90).*\.f95' Makefile.in && exit 1 -grep '^[ ].*\$(FC.*\$(FCFLAGS_f95).*\.f90' Makefile.in && exit 1 -grep '^[ ].*\$(FC.*\$(FCFLAGS_f90).*\.f03' Makefile.in && exit 1 -grep '^[ ].*\$(FC.*\$(FCFLAGS_f08).*\.f90' Makefile.in && exit 1 +grep '^[ ].*\$(FC.*\$(FCFLAGS_f90).*\.f95' Makefile.in && Exit 1 +grep '^[ ].*\$(FC.*\$(FCFLAGS_f95).*\.f90' Makefile.in && Exit 1 +grep '^[ ].*\$(FC.*\$(FCFLAGS_f90).*\.f03' Makefile.in && Exit 1 +grep '^[ ].*\$(FC.*\$(FCFLAGS_f08).*\.f90' Makefile.in && Exit 1 : diff --git a/tests/fort4.test b/tests/fort4.test index 37791214a..d6740cabc 100755 --- a/tests/fort4.test +++ b/tests/fort4.test @@ -19,7 +19,7 @@ # For now, require the GNU compilers (to avoid some Libtool/Autoconf # issues). required='g77 gfortran' -. ./defs || exit 1 +. ./defs || Exit 1 set -e @@ -69,10 +69,10 @@ END $ACLOCAL $AUTOMAKE # The Fortran 77 linker should be preferred: -grep '.\$(FCLINK)' Makefile.in && exit 1 +grep '.\$(FCLINK)' Makefile.in && Exit 1 $AUTOCONF -# configure may exit 77 if no compiler is found, +# configure may Exit 77 if no compiler is found, # or if the compiler cannot compile Fortran 90 files). ./configure $MAKE diff --git a/tests/fort5.test b/tests/fort5.test index 344cac971..d39bb215d 100755 --- a/tests/fort5.test +++ b/tests/fort5.test @@ -19,7 +19,7 @@ # For now, require the GNU compilers (to avoid some Libtool/Autoconf # issues). required='libtoolize g77 gfortran' -. ./defs || exit 1 +. ./defs || Exit 1 set -e @@ -82,9 +82,9 @@ $AUTOCONF # This test requires Libtool >= 2.0. Earlier Libtool does not # have the LT_PREREQ macro to cause autoconf failure, so let's # skip in this case: -grep LT_PREREQ configure && exit 77 +grep LT_PREREQ configure && Exit 77 -# configure may exit 77 if no compiler is found, +# configure may Exit 77 if no compiler is found, # or if the compiler cannot compile Fortran 90 files). ./configure $MAKE diff --git a/tests/fortdep.test b/tests/fortdep.test index 2012029ce..e16089561 100755 --- a/tests/fortdep.test +++ b/tests/fortdep.test @@ -17,7 +17,7 @@ # Test to make sure dependency tracking doesn't interfere with Fortran. # For PR 75. -. ./defs || exit 1 +. ./defs || Exit 1 cat > configure.in << 'END' AC_INIT(foo, 1.0, martin@tropos.de) @@ -35,8 +35,8 @@ END : > foo.f -$ACLOCAL || exit 1 -$AUTOMAKE || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE || Exit 1 -grep 'foo\.Po' Makefile.in && exit 1 -exit 0 +grep 'foo\.Po' Makefile.in && Exit 1 +Exit 0 diff --git a/tests/fpinst2.test b/tests/fpinst2.test index 4f4be2328..6bc551c3b 100755 --- a/tests/fpinst2.test +++ b/tests/fpinst2.test @@ -17,7 +17,7 @@ # Test to make sure "reversed" order of AC_PROG_INSTALL and # AC_PROG_INSTALL is not buggy. -. ./defs || exit 1 +. ./defs || Exit 1 cat > configure.in << 'END' AC_INIT @@ -29,5 +29,5 @@ cat > Makefile.am <<'END' bin_SCRIPTS = zot END -$ACLOCAL || exit 1 -$AUTOMAKE || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE || Exit 1 diff --git a/tests/fpinstall.test b/tests/fpinstall.test index fb63775a8..980805f3a 100755 --- a/tests/fpinstall.test +++ b/tests/fpinstall.test @@ -17,7 +17,7 @@ # Test for bug reported by Thomas Morgan. If both AC_PROG_INSTALL and # AC_PROG_INSTALL appear in configure.in, bad error results. -. ./defs || exit 1 +. ./defs || Exit 1 cat > configure.in << 'END' AC_INIT @@ -29,5 +29,5 @@ cat > Makefile.am <<'END' bin_SCRIPTS = zot END -$ACLOCAL || exit 1 -$AUTOMAKE || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE || Exit 1 diff --git a/tests/gcj.test b/tests/gcj.test index 280b1044c..bbb385def 100755 --- a/tests/gcj.test +++ b/tests/gcj.test @@ -16,7 +16,7 @@ # Test of compiled java. -. ./defs || exit 1 +. ./defs || Exit 1 cat >> configure.in << 'END' _AM_DEPENDENCIES(GCJ) @@ -28,7 +28,7 @@ bin_PROGRAMS = convert convert_SOURCES = x/y/convert.java END -$ACLOCAL || exit 1 -$AUTOMAKE || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE || Exit 1 grep '^x/y/convert' Makefile.in diff --git a/tests/gcj2.test b/tests/gcj2.test index 4a44b624b..9ddfb0a98 100755 --- a/tests/gcj2.test +++ b/tests/gcj2.test @@ -16,7 +16,7 @@ # Make sure `..' invalid in subdir .o's. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/gcj3.test b/tests/gcj3.test index 994c980fa..e7eecd1cc 100755 --- a/tests/gcj3.test +++ b/tests/gcj3.test @@ -16,7 +16,7 @@ # Make sure dependency tracking works for java. -. ./defs || exit 1 +. ./defs || Exit 1 cat >> configure.in << 'END' _AM_DEPENDENCIES(GCJ) @@ -28,8 +28,8 @@ bin_PROGRAMS = convert convert_SOURCES = x/y/convert.java END -$ACLOCAL || exit 1 -$AUTOMAKE || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE || Exit 1 num=`grep depcomp Makefile.in | wc -l` test $num -gt 1 diff --git a/tests/gcj4.test b/tests/gcj4.test index e2bbf25fb..16d15c15e 100755 --- a/tests/gcj4.test +++ b/tests/gcj4.test @@ -17,7 +17,7 @@ # Make sure dependency tracking works for Java. required=gcj -. ./defs || exit 1 +. ./defs || Exit 1 cat >> configure.in << 'END' AM_PROG_GCJ diff --git a/tests/gcj5.test b/tests/gcj5.test index 4f19e43fd..0361cf300 100755 --- a/tests/gcj5.test +++ b/tests/gcj5.test @@ -16,7 +16,7 @@ # Make sure Automake suggests AM_PROG_GCJ when GCJ is needed. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/getopt.test b/tests/getopt.test index 252b286e2..46fcb4e81 100755 --- a/tests/getopt.test +++ b/tests/getopt.test @@ -15,9 +15,9 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # Automake --help, and --version should have priority over any other option -# so that their `exit 0' is coherent. +# so that their `Exit 0' is coherent. -. ./defs || exit 1 +. ./defs || Exit 1 set -e @@ -27,7 +27,7 @@ grep ':.*nonexistent' stderr # ... but this should not. AUTOMAKE_run 0 -Wnonexistent --help -grep ':.*nonexistent' stderr && exit 1 +grep ':.*nonexistent' stderr && Exit 1 # Similarly, this should fail ... @@ -36,6 +36,6 @@ grep ':.*nonexistent' stderr # ... but this should not. AUTOMAKE_run 0 --nonexistent --help -grep ':.*nonexistent' stderr && exit 1 +grep ':.*nonexistent' stderr && Exit 1 : diff --git a/tests/gettext.test b/tests/gettext.test index 2fb87ea6a..61dea1c17 100755 --- a/tests/gettext.test +++ b/tests/gettext.test @@ -17,7 +17,7 @@ # Check gettext support. required='gettext' -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/gettext2.test b/tests/gettext2.test index 36ca64fe0..dfb7b4796 100755 --- a/tests/gettext2.test +++ b/tests/gettext2.test @@ -18,7 +18,7 @@ # PR/338, reported by Charles Wilson. required='gettext' -. ./defs || exit 1 +. ./defs || Exit 1 set -e @@ -51,7 +51,7 @@ $AUTOMAKE --add-missing # Don't try running ./configure --with-included-gettext if the # user is using AM_GNU_GETTEXT([external]). -grep 'with-included-gettext' Makefile.in && exit 1 +grep 'with-included-gettext' Makefile.in && Exit 1 : # intl/ isn't wanted with AM_GNU_GETTEXT([external]). diff --git a/tests/gettext3.test b/tests/gettext3.test index 2c2ac67ef..02e68ad03 100755 --- a/tests/gettext3.test +++ b/tests/gettext3.test @@ -17,7 +17,7 @@ # Check gettext `AM_GNU_GETTEXT_INTL_SUBDIR' support. required='gettext' -. ./defs || exit 1 +. ./defs || Exit 1 set -e @@ -32,7 +32,7 @@ mkdir po # if aclocal fails, assume the gettext macros are too old and do not # define AM_GNU_GETTEXT_INTL_SUBDIR. -$ACLOCAL || exit 77 +$ACLOCAL || Exit 77 # config.rpath is required. : >config.rpath diff --git a/tests/gnits.test b/tests/gnits.test index 71ee38955..4e5b73ef8 100755 --- a/tests/gnits.test +++ b/tests/gnits.test @@ -16,7 +16,7 @@ # Test to ensure --gnits version checking is correct. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/gnits2.test b/tests/gnits2.test index 7758593f5..cd1a39e64 100755 --- a/tests/gnits2.test +++ b/tests/gnits2.test @@ -17,7 +17,7 @@ # Test to ensure std-options checking is correct. required=gcc -. ./defs || exit 1 +. ./defs || Exit 1 cat >> configure.in << 'END' AC_PROG_CC @@ -96,7 +96,7 @@ $ACLOCAL $AUTOCONF $AUTOMAKE -a -grep README-alpha Makefile.in && exit 1 +grep README-alpha Makefile.in && Exit 1 mkdir build cd build diff --git a/tests/gnits3.test b/tests/gnits3.test index 6676d917d..5a826c232 100755 --- a/tests/gnits3.test +++ b/tests/gnits3.test @@ -17,7 +17,7 @@ # Check that AM_INSTALLCHECK_STD_OPTIONS_EXEMPT works. required=gcc -. ./defs || exit 1 +. ./defs || Exit 1 cat >> configure.in << 'END' AC_PROG_CC diff --git a/tests/gnumake.test b/tests/gnumake.test index be00fd84d..838c0a21f 100755 --- a/tests/gnumake.test +++ b/tests/gnumake.test @@ -18,7 +18,7 @@ # Report from Braden McDaniel. required=GNUmake -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/gnuwarn.test b/tests/gnuwarn.test index fb22f6399..d4aa62bf8 100755 --- a/tests/gnuwarn.test +++ b/tests/gnuwarn.test @@ -16,7 +16,7 @@ # Check that Automake warns about user variables being overridden. -. ./defs || exit 1 +. ./defs || Exit 1 set -e @@ -46,6 +46,6 @@ AUTOMAKE_fails -Wnone --add-missing --gnu grep 'Makefile.am:1:.*CFLAGS' stderr grep 'Makefile.am:2:.*LDFLAGS' stderr # No reason to warn about CXXFLAGS since it's not used. -grep CXXFLAGS stderr && exit 1 +grep CXXFLAGS stderr && Exit 1 # Don't warn if -Wno-gnu. $AUTOMAKE -Wnone --gnu -Wno-gnu diff --git a/tests/gnuwarn2.test b/tests/gnuwarn2.test index 0c7caa840..d0eba3480 100755 --- a/tests/gnuwarn2.test +++ b/tests/gnuwarn2.test @@ -16,7 +16,7 @@ # Check diagnostics about no-installman being disallowed in `gnu'. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/header.test b/tests/header.test index cd8ffec64..5f2cb810e 100755 --- a/tests/header.test +++ b/tests/header.test @@ -16,7 +16,7 @@ # Test for PR 68. -. ./defs || exit 1 +. ./defs || Exit 1 cat >> configure.in << 'END' AC_SUBST(MY_HEADERS) @@ -31,8 +31,8 @@ END : > joe.c : > qq.h -$ACLOCAL || exit 1 -$AUTOMAKE || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE || Exit 1 -grep '[^@]MY_HEADERS' Makefile.in && exit 1 -exit 0 +grep '[^@]MY_HEADERS' Makefile.in && Exit 1 +Exit 0 diff --git a/tests/help.test b/tests/help.test index fc035ff54..82f73dd98 100755 --- a/tests/help.test +++ b/tests/help.test @@ -17,7 +17,7 @@ # Make sure --help and --version work, even when no configure.ac # is in the current directory. -. ./defs || exit 1 +. ./defs || Exit 1 set -e @@ -32,7 +32,7 @@ $AUTOMAKE --version $AUTOMAKE --help # aclocal and automake cannot work without configure.ac or configure.in -$ACLOCAL 2>stderr && exit 1 +$ACLOCAL 2>stderr && Exit 1 grep configure.ac stderr grep configure.in stderr AUTOMAKE_fails diff --git a/tests/hosts.test b/tests/hosts.test index 55a424c25..a4d16196b 100755 --- a/tests/hosts.test +++ b/tests/hosts.test @@ -19,7 +19,7 @@ # those cases. # From Norman Gray. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/implicit.test b/tests/implicit.test index f150878f4..961711b4d 100755 --- a/tests/implicit.test +++ b/tests/implicit.test @@ -17,7 +17,7 @@ # Test to make sure implicit .o's are listed as appropriate. Report # from Henrik Frystyk Nielsen. -. ./defs || exit 1 +. ./defs || Exit 1 cat >> configure.in << 'END' AC_PROG_CC @@ -27,7 +27,7 @@ cat > Makefile.am << 'END' noinst_PROGRAMS = libapp_1 END -$ACLOCAL || exit 1 -$AUTOMAKE || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE || Exit 1 grep '^libapp_1_OBJECTS' Makefile.in | $FGREP '.$(OBJEXT)' diff --git a/tests/include.test b/tests/include.test index 245fc0021..e7922dfd1 100755 --- a/tests/include.test +++ b/tests/include.test @@ -17,7 +17,7 @@ # Test to make sure header vars defined only once when including. # Report from Marcus G. Daniels. -. ./defs || exit 1 +. ./defs || Exit 1 echo AC_OUTPUT >> configure.in @@ -27,11 +27,11 @@ END : > foo -$ACLOCAL || exit 1 -$AUTOMAKE || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE || Exit 1 len="`grep '^srcdir' Makefile.in | wc -l`" echo "len = $len" -test $len -eq 1 || exit 1 +test $len -eq 1 || Exit 1 # Also make sure include file is distributed. (sed -n -e '/^DIST_COMMON =.*\\$/ { diff --git a/tests/include2.test b/tests/include2.test index 2e7e884e5..ea70b1605 100755 --- a/tests/include2.test +++ b/tests/include2.test @@ -16,7 +16,7 @@ # Make sure included files in parent directory are distributed. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/info.test b/tests/info.test index 3c7dca4e6..bcd40bf4b 100755 --- a/tests/info.test +++ b/tests/info.test @@ -16,7 +16,7 @@ # Test to make sure info files are distributed correctly. -. ./defs || exit 1 +. ./defs || Exit 1 cat > Makefile.am << 'END' info_TEXINFOS = foo.texi @@ -28,8 +28,8 @@ END echo '@setfilename foo.info' > foo.texi : > texinfo.tex -$ACLOCAL || exit 1 -$AUTOMAKE || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE || Exit 1 for i in `grep '^INFOS =' Makefile.in | sed -e 's/^INFOS = //'`; do echo $i @@ -37,7 +37,7 @@ for i in `grep '^INFOS =' Makefile.in | sed -e 's/^INFOS = //'`; do foo*) ;; *) - exit 1 + Exit 1 ;; esac done diff --git a/tests/init.test b/tests/init.test index 40e41fa8c..914a221c8 100755 --- a/tests/init.test +++ b/tests/init.test @@ -17,7 +17,7 @@ # Make sure we give a sensible error message when neither AC_INIT nor # AM_INIT_AUTOMAKE are given arguments. -. ./defs || exit 1 +. ./defs || Exit 1 set -e @@ -27,7 +27,7 @@ AM_INIT_AUTOMAKE END # The error message should mension AC_INIT, not AC_PACKAGE_VERSION. -($ACLOCAL && $AUTOCONF) 2>stderr && exit 1 +($ACLOCAL && $AUTOCONF) 2>stderr && Exit 1 cat stderr -grep AC_PACKAGE_VERSION stderr && exit 1 +grep AC_PACKAGE_VERSION stderr && Exit 1 grep AC_INIT stderr diff --git a/tests/insh2.test b/tests/insh2.test index afd4200d6..766855dbf 100755 --- a/tests/insh2.test +++ b/tests/insh2.test @@ -17,7 +17,7 @@ # Test for bug where install-sh not included in distribution. -. ./defs || exit 1 +. ./defs || Exit 1 cat > Makefile.am << 'END' pkgdata_DATA = @@ -25,8 +25,8 @@ magic: @echo $(DISTFILES) END -$ACLOCAL || exit 1 -$AUTOMAKE || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE || Exit 1 $FGREP -v @SET_MAKE@ Makefile.in > Makefile.sed $MAKE -s -f Makefile.sed SHELL=$SHELL magic | grep install-sh diff --git a/tests/install2.test b/tests/install2.test index ca5d2d954..1024487b2 100755 --- a/tests/install2.test +++ b/tests/install2.test @@ -18,7 +18,7 @@ # From Pavel Roskin. required=gzip -. ./defs || exit 1 +. ./defs || Exit 1 set -e cat > configure.in << 'END' @@ -40,13 +40,13 @@ $AUTOMAKE -a chmod 000 Makefile.am # On some systems (like DOS and Windows), files are always readable. -test ! -r Makefile.am || exit 77 +test ! -r Makefile.am || Exit 77 ./configure # `dist' should fail because we can't copy Makefile.am. if $MAKE dist; then - exit 1 + Exit 1 else - exit 0 + Exit 0 fi diff --git a/tests/installdir.test b/tests/installdir.test index 24af5dd9f..f9207117e 100755 --- a/tests/installdir.test +++ b/tests/installdir.test @@ -16,7 +16,7 @@ # Test for PR 203. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/instdat.test b/tests/instdat.test index dae9b792d..fc1d20994 100755 --- a/tests/instdat.test +++ b/tests/instdat.test @@ -17,14 +17,14 @@ # Test to see if defining INSTALL_DATA causes problems. From EGCS # list. -. ./defs || exit 1 +. ./defs || Exit 1 echo 'AC_SUBST(INSTALL_DATA)' >> configure.in : > Makefile.am -$ACLOCAL || exit 1 -$AUTOMAKE || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE || Exit 1 -(grep '^DATA =' Makefile.in | grep INSTALL_DATA) && exit 1 -exit 0 +(grep '^DATA =' Makefile.in | grep INSTALL_DATA) && Exit 1 +Exit 0 diff --git a/tests/instdat2.test b/tests/instdat2.test index a96583fbe..115586ffc 100755 --- a/tests/instdat2.test +++ b/tests/instdat2.test @@ -17,7 +17,7 @@ # Test that installing under $exec_prefix is handled by install-exec. # Testing with headers for instance. -. ./defs || exit 1 +. ./defs || Exit 1 cat >Makefile.am << 'EOF' # User directories. @@ -63,7 +63,7 @@ pkgdata_SCRIPTS = script EOF set -e -$ACLOCAL || exit 1 +$ACLOCAL || Exit 1 $AUTOMAKE # install-SCRIPTS targets. @@ -87,4 +87,4 @@ EOF diff expected produced -exit 0 +Exit 0 diff --git a/tests/instexec.test b/tests/instexec.test index d6cffde74..36ed0f0ea 100755 --- a/tests/instexec.test +++ b/tests/instexec.test @@ -17,11 +17,11 @@ # Test for this bug: when a Makefile.am builds nothing, no # install-exec target is generated. -. ./defs || exit 1 +. ./defs || Exit 1 : > Makefile.am -$ACLOCAL || exit 1 -$AUTOMAKE || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE || Exit 1 grep '^install-exec:' Makefile.in diff --git a/tests/insthook.test b/tests/insthook.test index e3a3e3ec8..b9c48ed14 100755 --- a/tests/insthook.test +++ b/tests/insthook.test @@ -16,7 +16,7 @@ # Make sure the install-exec-hook example we give in the manual works. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/instman.test b/tests/instman.test index 79042bacb..07d1ca1b1 100755 --- a/tests/instman.test +++ b/tests/instman.test @@ -18,7 +18,7 @@ # Make sure the MKDIR_P invocation is correct in install-man # target. Bug reported by Gordon Irlam <gordoni@cygnus.com>. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/instman2.test b/tests/instman2.test index e350c7d93..b21d5ecf6 100755 --- a/tests/instman2.test +++ b/tests/instman2.test @@ -17,7 +17,7 @@ # Test to make sure mkinstalldirs invocation correct in install-man # target. Bug reported by Gordon Irlam <gordoni@cygnus.com>. -. ./defs || exit 1 +. ./defs || Exit 1 cat > Makefile.am << 'EOF' man8_MANS = frob.8 @@ -25,7 +25,7 @@ EOF : > frob.8 -$ACLOCAL || exit 1 -$AUTOMAKE || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE || Exit 1 grep '^install-man' Makefile.in diff --git a/tests/instsh.test b/tests/instsh.test index b56d9461a..c3522855b 100755 --- a/tests/instsh.test +++ b/tests/instsh.test @@ -18,7 +18,7 @@ # automake: Makefile.am: required file "../../install-sh" not found; installing # This also makes sure that install-sh is created in the correct directory. -. ./defs || exit 1 +. ./defs || Exit 1 set -e @@ -36,6 +36,6 @@ $AUTOMAKE --add-missing > output 2>&1 # Only one `/' should appear in the output. cat output -grep '/.*/' output && exit 1 +grep '/.*/' output && Exit 1 test -f install-sh diff --git a/tests/instsh2.test b/tests/instsh2.test index f0b729e94..4a8084397 100755 --- a/tests/instsh2.test +++ b/tests/instsh2.test @@ -16,12 +16,12 @@ # Various install-sh checks -. ./defs || exit 1 +. ./defs || Exit 1 set -e # Basic errors -./install-sh && exit 1 -./install-sh -m 644 dest && exit 1 +./install-sh && Exit 1 +./install-sh -m 644 dest && Exit 1 # Directories @@ -74,8 +74,8 @@ test -f d4/z ./install-sh -T x d3/y test -f x test -f d3/y -./install-sh -T x d3 && exit 1 -./install-sh -T x d4// && exit 1 +./install-sh -T x d3 && Exit 1 +./install-sh -T x d4// && Exit 1 # Ensure that install-sh works with names that include spaces touch 'a b' diff --git a/tests/instsh3.test b/tests/instsh3.test index 4ed67b965..0937a7a0f 100755 --- a/tests/instsh3.test +++ b/tests/instsh3.test @@ -17,11 +17,11 @@ # More install-sh checks: check -C. required=non-root -. ./defs || exit 1 +. ./defs || Exit 1 set -e # Solaris /usr/ucb/touch does not accept -t. -touch -t $old_timestamp foo || exit 77 +touch -t $old_timestamp foo || Exit 77 ./install-sh -d d1 diff --git a/tests/instspc.test b/tests/instspc.test index 243be25f2..a59177df6 100755 --- a/tests/instspc.test +++ b/tests/instspc.test @@ -25,7 +25,7 @@ required='gcc' -. ./defs || exit 1 +. ./defs || Exit 1 set -e @@ -131,7 +131,7 @@ do esac # Make sure this system supports this character in file names. - mkdir sub1 "./$file" || exit 77 + mkdir sub1 "./$file" || Exit 77 cd "$build" @@ -184,4 +184,4 @@ EOF esac done -exit $fail +Exit $fail diff --git a/tests/interp.test b/tests/interp.test index f882a18b4..797882b79 100755 --- a/tests/interp.test +++ b/tests/interp.test @@ -16,7 +16,7 @@ # Test to make sure variable interpolation works. -. ./defs || exit 1 +. ./defs || Exit 1 cat >> configure.in << 'END' AC_PROG_CC @@ -28,7 +28,7 @@ s1 = z.c qqq_SOURCES = $(s1) END -$ACLOCAL || exit 1 -$AUTOMAKE || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE || Exit 1 $FGREP 'z.$(OBJEXT)' Makefile.in diff --git a/tests/interp2.test b/tests/interp2.test index 47d133f13..d04637be3 100755 --- a/tests/interp2.test +++ b/tests/interp2.test @@ -17,7 +17,7 @@ # Test to make sure variable interpolation doesn't break other # features. Report from Joel N. Weber, II. -. ./defs || exit 1 +. ./defs || Exit 1 cat >> configure.in << 'END' AC_PROG_CC @@ -31,5 +31,5 @@ x_SOURCES = x.c x_LDADD = $(X_EXTRA_LIBS) END -$ACLOCAL || exit 1 +$ACLOCAL || Exit 1 $AUTOMAKE diff --git a/tests/java.test b/tests/java.test index 0a4caa036..939a793f4 100755 --- a/tests/java.test +++ b/tests/java.test @@ -16,7 +16,7 @@ # Minimal test of Java functionality. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/java2.test b/tests/java2.test index 970c5ab60..d3a054607 100755 --- a/tests/java2.test +++ b/tests/java2.test @@ -18,7 +18,7 @@ # no classes to compile. # Report from Braden McDaniel. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/java3.test b/tests/java3.test index c15192688..f2e592e3d 100755 --- a/tests/java3.test +++ b/tests/java3.test @@ -18,7 +18,7 @@ # there are none. # Report from Johannes Nicolai (PR/441). -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/javaprim.test b/tests/javaprim.test index 16794ca7b..aa3d618cd 100755 --- a/tests/javaprim.test +++ b/tests/javaprim.test @@ -16,7 +16,7 @@ # Test to make sure JAVA variable can be defined. -. ./defs || exit 1 +. ./defs || Exit 1 echo 'AC_SUBST(JAVA)' >> configure.in @@ -25,5 +25,5 @@ javadir = $(datadir)/java java_JAVA = a.java b.java c.java END -$ACLOCAL || exit 1 +$ACLOCAL || Exit 1 $AUTOMAKE diff --git a/tests/javasubst.test b/tests/javasubst.test index 800aa53c7..f805218c4 100755 --- a/tests/javasubst.test +++ b/tests/javasubst.test @@ -16,7 +16,7 @@ # Test to make sure redefining JAVAC works. -. ./defs || exit 1 +. ./defs || Exit 1 echo 'AC_SUBST(JAVAC)' >> configure.in @@ -25,7 +25,7 @@ javadir = $(datadir)/java java_JAVA = a.java b.java c.java END -$ACLOCAL || exit 1 -$AUTOMAKE || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE || Exit 1 grep 'JAVAC.*@JAVAC@' Makefile.in diff --git a/tests/ldadd.test b/tests/ldadd.test index b5ed5babe..a2a212b79 100755 --- a/tests/ldadd.test +++ b/tests/ldadd.test @@ -17,7 +17,7 @@ # Check to make sure incorrect LDADD usage is diagnosed. required=libtool -. ./defs || exit 1 +. ./defs || Exit 1 cat >> configure.in << 'END' AC_PROG_CC @@ -38,6 +38,6 @@ END : > config.sub : > q.c -$ACLOCAL || exit 1 -$AUTOMAKE 2>&1 | grep LDADD || exit 1 -exit 0 +$ACLOCAL || Exit 1 +$AUTOMAKE 2>&1 | grep LDADD || Exit 1 +Exit 0 diff --git a/tests/ldflags.test b/tests/ldflags.test index 5cf245dd6..fdb296520 100755 --- a/tests/ldflags.test +++ b/tests/ldflags.test @@ -17,7 +17,7 @@ # Check for LDFLAGS in conditional. # PR 77. required=libtool -. ./defs || exit 1 +. ./defs || Exit 1 cat >> configure.in << 'END' AC_PROG_CC @@ -41,5 +41,5 @@ END : > config.sub : > q.c -$ACLOCAL || exit 1 +$ACLOCAL || Exit 1 $AUTOMAKE diff --git a/tests/lex.test b/tests/lex.test index 7bddc6f78..584f94ea0 100755 --- a/tests/lex.test +++ b/tests/lex.test @@ -14,7 +14,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. ./defs || exit 1 +. ./defs || Exit 1 set -e @@ -42,6 +42,6 @@ $FGREP '$(LEX)' Makefile.in # Test to make sure that lex source generates correct clean rule. # From Ralf Corsepius. -$FGREP joel Makefile.in && exit 1 +$FGREP joel Makefile.in && Exit 1 : diff --git a/tests/lex2.test b/tests/lex2.test index 6ca9a6fe9..d9cde245f 100755 --- a/tests/lex2.test +++ b/tests/lex2.test @@ -16,7 +16,7 @@ # Make sure that Automake suggest using AM_PROG_LEX when a lexer is used. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/lex3.test b/tests/lex3.test index 5ed74f75b..e44f5d502 100755 --- a/tests/lex3.test +++ b/tests/lex3.test @@ -18,7 +18,7 @@ # From Matthew D. Langston. required='gcc gzip flex GNUmake' -. ./defs || exit 1 +. ./defs || Exit 1 # Ignore user CFLAGS. CFLAGS= diff --git a/tests/lex4.test b/tests/lex4.test index 1c17a9248..bab43b8bf 100755 --- a/tests/lex4.test +++ b/tests/lex4.test @@ -17,7 +17,7 @@ # Test to make sure dependencies work with .ll files. # Test synthesized from PR automake/6. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/lex5.test b/tests/lex5.test index ee622a4e0..604593c8f 100755 --- a/tests/lex5.test +++ b/tests/lex5.test @@ -17,7 +17,7 @@ # Test for subdir lexers. required='gcc GNUmake gzip flex' -. ./defs || exit 1 +. ./defs || Exit 1 set -e @@ -96,4 +96,4 @@ $MAKE foo/foo2.o test -f foo/foo2.c test -f foo/foo2.o -exit 0 +Exit 0 diff --git a/tests/libexec.test b/tests/libexec.test index e01ddca63..8403dee30 100755 --- a/tests/libexec.test +++ b/tests/libexec.test @@ -16,7 +16,7 @@ # PROGRAMS and LIBRARIES can be installed in (pkg)libexecdir. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/libobj10.test b/tests/libobj10.test index ca583543c..a5b872629 100755 --- a/tests/libobj10.test +++ b/tests/libobj10.test @@ -17,7 +17,7 @@ # Do not complain about the nonexistence of a source for LIBOBJS if # it's in BUILT_SOURCES. Reported by Erez Zadok. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/libobj11.test b/tests/libobj11.test index 1611db4a0..164db9c4f 100755 --- a/tests/libobj11.test +++ b/tests/libobj11.test @@ -16,7 +16,7 @@ # AC_LIBOBJ must allow [] around its argument. -. ./defs || exit 1 +. ./defs || Exit 1 cat > configure.in << 'END' AC_INIT @@ -35,5 +35,5 @@ END : > mountlist.c -$ACLOCAL || exit 1 -$AUTOMAKE || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE || Exit 1 diff --git a/tests/libobj12.test b/tests/libobj12.test index 7e1f6a52f..5152c5ca6 100755 --- a/tests/libobj12.test +++ b/tests/libobj12.test @@ -18,7 +18,7 @@ # Test if a file can be mentioned in LIBOBJS and explicitly. # (See libobj13.test for the LTLIBRARIES check.) -. ./defs || exit 1 +. ./defs || Exit 1 set -e cat >> configure.in << 'END' diff --git a/tests/libobj13.test b/tests/libobj13.test index f04b3ba41..ae0632ce9 100755 --- a/tests/libobj13.test +++ b/tests/libobj13.test @@ -19,7 +19,7 @@ # (Like libobj12.test, but for Libtool libraries.) required='libtoolize' -. ./defs || exit 1 +. ./defs || Exit 1 set -e cat >> configure.in << 'END' diff --git a/tests/libobj2.test b/tests/libobj2.test index 4103eddf7..3dbe5ba98 100755 --- a/tests/libobj2.test +++ b/tests/libobj2.test @@ -18,7 +18,7 @@ # Test to make sure LIBOBJS works in subdirs. # Bug from Josh MacDonald. -. ./defs || exit 1 +. ./defs || Exit 1 cat > configure.in << 'END' AC_INIT @@ -39,7 +39,7 @@ END : > subdir/fsusage.c -$ACLOCAL || exit 1 -$AUTOMAKE || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE || Exit 1 grep 'fsusage\.c' subdir/Makefile.in diff --git a/tests/libobj3.test b/tests/libobj3.test index 36c868be2..78af16aeb 100755 --- a/tests/libobj3.test +++ b/tests/libobj3.test @@ -16,7 +16,7 @@ # Make sure we complain if @LIBOBJS@ is used without being set in configure.in -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/libobj4.test b/tests/libobj4.test index b873cdb40..9e1360e8b 100755 --- a/tests/libobj4.test +++ b/tests/libobj4.test @@ -17,7 +17,7 @@ # Test to make sure LIBOBJS error only occurs if LIBOBJS seen. Report # from Jim Meyering. -. ./defs || exit 1 +. ./defs || Exit 1 cat > Makefile.am << 'END' bin_PROGRAMS = foo @@ -28,5 +28,5 @@ AC_PROG_CC AC_REPLACE_FUNCS(foo) END -$ACLOCAL || exit 1 +$ACLOCAL || Exit 1 $AUTOMAKE diff --git a/tests/libobj5.test b/tests/libobj5.test index 47492f612..48d417ba8 100755 --- a/tests/libobj5.test +++ b/tests/libobj5.test @@ -17,7 +17,7 @@ # Test to make sure AC_REPLACE_FUNCS works across lines. Report from # Jim Meyering. -. ./defs || exit 1 +. ./defs || Exit 1 cat > Makefile.am << 'END' bin_PROGRAMS = joe @@ -32,6 +32,6 @@ END : > foo.c -$ACLOCAL || exit 1 -$AUTOMAKE || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE || Exit 1 $FGREP foo.c Makefile.in diff --git a/tests/libobj7.test b/tests/libobj7.test index 0c4a9595d..a00dfa29d 100755 --- a/tests/libobj7.test +++ b/tests/libobj7.test @@ -16,7 +16,7 @@ # Test for multiple replacement functions. -. ./defs || exit 1 +. ./defs || Exit 1 cat > configure.in << 'END' AC_INIT @@ -37,8 +37,8 @@ END : > dirname.c : > strsignal.c -$ACLOCAL || exit 1 -$AUTOMAKE || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE || Exit 1 sed -n -e ': again /^DIST_COMMON.*[^\]$/ p diff --git a/tests/libobj8.test b/tests/libobj8.test index 5a8287fef..9cdec3d3d 100755 --- a/tests/libobj8.test +++ b/tests/libobj8.test @@ -17,7 +17,7 @@ # Test to make sure `_.c' dependencies are generated for LIBOBJS # objects. -. ./defs || exit 1 +. ./defs || Exit 1 cat > configure.in << 'END' AC_INIT @@ -44,7 +44,7 @@ END : > ansi2knr.1 : > ansi2knr.c -$ACLOCAL || exit 1 -$AUTOMAKE || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE || Exit 1 grep 'strsignal_.c:' Makefile.in diff --git a/tests/library.test b/tests/library.test index ef374ad7f..05518e632 100755 --- a/tests/library.test +++ b/tests/library.test @@ -16,7 +16,7 @@ # Test for _DEPENDENCIES with libraries. -. ./defs || exit 1 +. ./defs || Exit 1 cat >> configure.in << 'END' AC_PROG_RANLIB @@ -30,5 +30,5 @@ lib_LIBRARIES = libfoo.a libfoo_a_DEPENDENCIES = libzot.a END -$ACLOCAL || exit 1 +$ACLOCAL || Exit 1 $AUTOMAKE diff --git a/tests/library2.test b/tests/library2.test index 622d52cf2..991135a04 100755 --- a/tests/library2.test +++ b/tests/library2.test @@ -16,7 +16,7 @@ # Make sure Automake suggest using AC_PROG_RANLIB when *_LIBRARIES is used. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/library3.test b/tests/library3.test index dd6cb5a2c..d459e1f9b 100755 --- a/tests/library3.test +++ b/tests/library3.test @@ -16,7 +16,7 @@ # Make sure Automake simplify conditions in diagnostics. -. ./defs || exit 1 +. ./defs || Exit 1 set -e @@ -51,4 +51,4 @@ $ACLOCAL AUTOMAKE_fails grep '^Makefile.am:.*: !A and !C and !D$' stderr # Is there only one missing condition? -test `grep ': !' stderr | wc -l` = 1 || exit 1 +test `grep ': !' stderr | wc -l` = 1 || Exit 1 diff --git a/tests/libtoo10.test b/tests/libtoo10.test index 50e6e6953..ad245b00b 100755 --- a/tests/libtoo10.test +++ b/tests/libtoo10.test @@ -18,7 +18,7 @@ # Report from Guillermo Ontañón. required=libtoolize -. ./defs || exit 1 +. ./defs || Exit 1 set -e cat >> configure.in << 'END' diff --git a/tests/libtool.test b/tests/libtool.test index 26671246a..f1da8f0c9 100755 --- a/tests/libtool.test +++ b/tests/libtool.test @@ -17,7 +17,7 @@ # Make sure libtool is removed. # Report from Kevin Dalley required=libtool -. ./defs || exit 1 +. ./defs || Exit 1 cat >> configure.in << 'END' AC_LIBTOOL_DLOPEN @@ -32,7 +32,7 @@ END : > config.guess : > config.sub -$ACLOCAL || exit 1 -$AUTOMAKE || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE || Exit 1 grep 'rm -f libtool' Makefile.in diff --git a/tests/libtool2.test b/tests/libtool2.test index 0654a49c5..3faa0b49d 100755 --- a/tests/libtool2.test +++ b/tests/libtool2.test @@ -17,7 +17,7 @@ # Make sure libtool clean targets exist. # Report from Eric Magnien. required=libtoolize -. ./defs || exit 1 +. ./defs || Exit 1 cat > configure.in << 'END' AC_INIT @@ -45,8 +45,8 @@ lib_LTLIBRARIES = libfoo.la libfoo_la_SOURCES = foo.c END -$ACLOCAL || exit 1 +$ACLOCAL || Exit 1 : > ltmain.sh -$AUTOMAKE -a || exit 1 +$AUTOMAKE -a || Exit 1 grep 'rm -f .*\.lo' sub/Makefile.in diff --git a/tests/libtool3.test b/tests/libtool3.test index 81e49cc1b..674a18cf1 100755 --- a/tests/libtool3.test +++ b/tests/libtool3.test @@ -18,7 +18,7 @@ # Also make sure we do not bloat the Makefile with unneeded rules. required='libtoolize gcc' -. ./defs || exit 1 +. ./defs || Exit 1 set -e @@ -79,8 +79,8 @@ $AUTOMAKE --add-missing --copy # We need explicit rules to build 1.o and a.lo. Make sure # Automake did not output additional rules for 1.lo and and a.lo. $FGREP '1.o:' Makefile.in -$FGREP '1.lo:' Makefile.in && exit 1 -$FGREP 'a.o:' Makefile.in && exit 1 +$FGREP '1.lo:' Makefile.in && Exit 1 +$FGREP 'a.o:' Makefile.in && Exit 1 $FGREP 'a.lo:' Makefile.in ./configure diff --git a/tests/libtool4.test b/tests/libtool4.test index 655612ed0..4751d77f5 100755 --- a/tests/libtool4.test +++ b/tests/libtool4.test @@ -16,7 +16,7 @@ # Make sure Automake suggests AC_PROG_LIBTOOL when *_LTLIBRARIES is used. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/libtool5.test b/tests/libtool5.test index 399bcc11f..dcb5f96bf 100755 --- a/tests/libtool5.test +++ b/tests/libtool5.test @@ -19,7 +19,7 @@ # Report from Harlan Stenn. required='libtoolize' -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/libtool6.test b/tests/libtool6.test index 22c366bf8..1b8baa76a 100755 --- a/tests/libtool6.test +++ b/tests/libtool6.test @@ -18,7 +18,7 @@ # in different directories. PR/285. required='libtoolize' -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/libtool7.test b/tests/libtool7.test index 6959fb5c3..53e632645 100755 --- a/tests/libtool7.test +++ b/tests/libtool7.test @@ -18,7 +18,7 @@ # Also check basic support for AM_LIBTOOLFLAGS/LIBTOOLFLAGS required='libtoolize gcc' -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/libtool8.test b/tests/libtool8.test index faa8a61b6..1306011e6 100755 --- a/tests/libtool8.test +++ b/tests/libtool8.test @@ -17,7 +17,7 @@ # Make sure Automake diagnoses conflicting installations. required='libtoolize' -. ./defs || exit 1 +. ./defs || Exit 1 set -e @@ -47,7 +47,7 @@ END libtoolize $ACLOCAL AUTOMAKE_fails --add-missing -grep libb stderr && exit 1 +grep libb stderr && Exit 1 grep 'Makefile.am:3:.*libc.la.*multiply defined' stderr grep 'Makefile.am:9:.*`pkglib' stderr grep 'Makefile.am:2:.*`lib' stderr diff --git a/tests/libtool9.test b/tests/libtool9.test index 06508d304..c2705378b 100755 --- a/tests/libtool9.test +++ b/tests/libtool9.test @@ -19,7 +19,7 @@ # Quite similar to libtool7.test, using AM_LDFLAGS in addition to xxx_LDFLAGS. required='libtoolize gcc' -. ./defs || exit 1 +. ./defs || Exit 1 set -e @@ -95,9 +95,9 @@ cat output grep '1BEG: libmod1.la mod2.la :END1' output grep '2BEG: mod2.la :END2' output grep '3BEG:.* am_cflags cflags .*lm1_la_ldflags ldflags.* :END3' output -grep '3BEG: .*am_ldflags.* :END3' output && exit 1 +grep '3BEG: .*am_ldflags.* :END3' output && Exit 1 grep '4BEG: :END4' output grep '5BEG: :END5' output grep '6BEG:.* prg2_cflags cflags .*am_ldflags ldflags.* :END6' output -grep '6BEG: .*am_cflags.* :END6' output && exit 1 +grep '6BEG: .*am_cflags.* :END6' output && Exit 1 $MAKE diff --git a/tests/license.test b/tests/license.test index e3374c917..42bd4d2e2 100755 --- a/tests/license.test +++ b/tests/license.test @@ -17,7 +17,7 @@ # Make sure COPYING is not overwritten, even with -a -f. required=makeinfo -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/link_c_cxx.test b/tests/link_c_cxx.test index cc0c88e4f..eae532dee 100755 --- a/tests/link_c_cxx.test +++ b/tests/link_c_cxx.test @@ -17,7 +17,7 @@ # Test to make sure the C++ linker is used when appropriate. # Matthew D. Langston <langston@SLAC.Stanford.EDU> -. ./defs || exit 1 +. ./defs || Exit 1 cat >> configure.in << 'END' AC_PROG_CC @@ -32,18 +32,18 @@ END : > lava.c : > lamp.cxx -$ACLOCAL || exit 1 -$AUTOMAKE || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE || Exit 1 # We should only see the C++ linker in the rules of `Makefile.in'. # Look for this macro not at the beginning of any line; that will have # to be good enough for now. -grep '.\$(CXXLINK)' Makefile.in || exit 1 +grep '.\$(CXXLINK)' Makefile.in || Exit 1 # We should not see these patterns: -grep '.\$(FLINK)' Makefile.in && exit 1 -grep '.\$(LINK)' Makefile.in && exit 1 +grep '.\$(FLINK)' Makefile.in && Exit 1 +grep '.\$(LINK)' Makefile.in && Exit 1 -exit 0 +Exit 0 diff --git a/tests/link_dist.test b/tests/link_dist.test index 731fab4df..9b449d56e 100755 --- a/tests/link_dist.test +++ b/tests/link_dist.test @@ -18,7 +18,7 @@ # *_SOURCES # Richard Boulton <richard@tartarus.org> -. ./defs || exit 1 +. ./defs || Exit 1 cat >> configure.in << 'END' AC_PROG_CC @@ -34,18 +34,18 @@ END : > lava.c : > lamp.cxx -$ACLOCAL || exit 1 -$AUTOMAKE || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE || Exit 1 # We should only see the C++ linker in the rules of `Makefile.in'. # Look for this macro not at the beginning of any line; that will have # to be good enough for now. -grep '.\$(CXXLINK)' Makefile.in || exit 1 +grep '.\$(CXXLINK)' Makefile.in || Exit 1 # We should not see these patterns: -grep '.\$(FLINK)' Makefile.in && exit 1 -grep '.\$(LINK)' Makefile.in && exit 1 +grep '.\$(FLINK)' Makefile.in && Exit 1 +grep '.\$(LINK)' Makefile.in && Exit 1 -exit 0 +Exit 0 diff --git a/tests/link_f90_only.test b/tests/link_f90_only.test index 08f8bf4b0..c3083e30b 100755 --- a/tests/link_f90_only.test +++ b/tests/link_f90_only.test @@ -17,7 +17,7 @@ # Test to make sure the Fortran 90 linker is used when appropriate. # (copied from link_f_only.test) Mike Nolta <mrnolta@princeton.edu> -. ./defs || exit 1 +. ./defs || Exit 1 cat >> configure.in << 'END' AC_PROG_FC @@ -30,18 +30,18 @@ END : > lamp.f90 -$ACLOCAL || exit 1 -$AUTOMAKE || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE || Exit 1 # We should only see the Fortran linker in the rules of `Makefile.in'. # Look for this macro not at the beginning of any line; that will have # to be good enough for now. -grep '.\$(FCLINK)' Makefile.in || exit 1 +grep '.\$(FCLINK)' Makefile.in || Exit 1 # We should not see these patterns: -grep '.\$(CXXLINK)' Makefile.in && exit 1 -grep '.\$(LINK)' Makefile.in && exit 1 +grep '.\$(CXXLINK)' Makefile.in && Exit 1 +grep '.\$(LINK)' Makefile.in && Exit 1 -exit 0 +Exit 0 diff --git a/tests/link_f_only.test b/tests/link_f_only.test index 9c905f923..ee22d59d1 100755 --- a/tests/link_f_only.test +++ b/tests/link_f_only.test @@ -17,7 +17,7 @@ # Test to make sure the Fortran 77 linker is used when appropriate. # Matthew D. Langston <langston@SLAC.Stanford.EDU> -. ./defs || exit 1 +. ./defs || Exit 1 cat >> configure.in << 'END' AC_PROG_F77 @@ -30,18 +30,18 @@ END : > lamp.f -$ACLOCAL || exit 1 -$AUTOMAKE || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE || Exit 1 # We should only see the Fortran linker in the rules of `Makefile.in'. # Look for this macro not at the beginning of any line; that will have # to be good enough for now. -grep '.\$(F77LINK)' Makefile.in || exit 1 +grep '.\$(F77LINK)' Makefile.in || Exit 1 # We should not see these patterns: -grep '.\$(CXXLINK)' Makefile.in && exit 1 -grep '.\$(LINK)' Makefile.in && exit 1 +grep '.\$(CXXLINK)' Makefile.in && Exit 1 +grep '.\$(LINK)' Makefile.in && Exit 1 -exit 0 +Exit 0 diff --git a/tests/link_fc.test b/tests/link_fc.test index d506ac590..dcbf55ded 100755 --- a/tests/link_fc.test +++ b/tests/link_fc.test @@ -17,7 +17,7 @@ # Test to make sure the Fortran 77 linker is used when appropriate. # Matthew D. Langston <langston@SLAC.Stanford.EDU> -. ./defs || exit 1 +. ./defs || Exit 1 cat >> configure.in << 'END' AC_PROG_CC @@ -32,8 +32,8 @@ END : > lava.c : > lamp.f -$ACLOCAL || exit 1 -$AUTOMAKE || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE || Exit 1 # We should only see the Fortran 77 linker in the rules of @@ -41,10 +41,10 @@ $AUTOMAKE || exit 1 # Look for this macro not at the beginning of any line; that will have # to be good enough for now. -grep '.\$(F77LINK)' Makefile.in || exit 1 +grep '.\$(F77LINK)' Makefile.in || Exit 1 # We should not see these patterns: -grep '.\$(LINK)' Makefile.in && exit 1 -grep '.\$(CXXLINK)' Makefile.in && exit 1 +grep '.\$(LINK)' Makefile.in && Exit 1 +grep '.\$(CXXLINK)' Makefile.in && Exit 1 -exit 0 +Exit 0 diff --git a/tests/link_fccxx.test b/tests/link_fccxx.test index 54cb5491e..2403cee95 100755 --- a/tests/link_fccxx.test +++ b/tests/link_fccxx.test @@ -17,7 +17,7 @@ # Test to make sure the C++ linker is used when appropriate. # Matthew D. Langston <langston@SLAC.Stanford.EDU> -. ./defs || exit 1 +. ./defs || Exit 1 cat >> configure.in << 'END' AC_PROG_CC @@ -34,18 +34,18 @@ END : > lamp.cxx : > lamp2.f -$ACLOCAL || exit 1 -$AUTOMAKE || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE || Exit 1 # We should only see the C++ linker in the rules of `Makefile.in'. # Look for this macro not at the beginning of any line; that will have # to be good enough for now. -grep '.\$(CXXLINK)' Makefile.in || exit 1 +grep '.\$(CXXLINK)' Makefile.in || Exit 1 # We should not see these patterns: -grep '.\$(F77LINK)' Makefile.in && exit 1 -grep '.\$(LINK)' Makefile.in && exit 1 +grep '.\$(F77LINK)' Makefile.in && Exit 1 +grep '.\$(LINK)' Makefile.in && Exit 1 -exit 0 +Exit 0 diff --git a/tests/link_fcxx.test b/tests/link_fcxx.test index 956d13abc..263e58a6d 100755 --- a/tests/link_fcxx.test +++ b/tests/link_fcxx.test @@ -17,7 +17,7 @@ # Test to make sure the C++ linker is used when appropriate. # Matthew D. Langston <langston@SLAC.Stanford.EDU> -. ./defs || exit 1 +. ./defs || Exit 1 cat >> configure.in << 'END' AC_PROG_CXX @@ -32,18 +32,18 @@ END : > lava.cxx : > lamp.f -$ACLOCAL || exit 1 -$AUTOMAKE || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE || Exit 1 # We should only see the C++ linker in the rules of `Makefile.in'. # Look for this macro not at the beginning of any line; that will have # to be good enough for now. -grep '.\$(CXXLINK)' Makefile.in || exit 1 +grep '.\$(CXXLINK)' Makefile.in || Exit 1 # We should not see these patterns: -grep '.\$(F77LINK)' Makefile.in && exit 1 -grep '.\$(LINK)' Makefile.in && exit 1 +grep '.\$(F77LINK)' Makefile.in && Exit 1 +grep '.\$(LINK)' Makefile.in && Exit 1 -exit 0 +Exit 0 diff --git a/tests/lisp2.test b/tests/lisp2.test index 8b8d3bae9..02b3c9a6a 100755 --- a/tests/lisp2.test +++ b/tests/lisp2.test @@ -16,7 +16,7 @@ # Make sure that Automake suggest using AM_PATH_LISPDIR to define lispdir. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/lisp3.test b/tests/lisp3.test index a178504ad..11e3d0fef 100755 --- a/tests/lisp3.test +++ b/tests/lisp3.test @@ -17,7 +17,7 @@ # Test that compiling interdependent elisp files works. required=emacs -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/lisp4.test b/tests/lisp4.test index d10b1565f..43bab6a22 100755 --- a/tests/lisp4.test +++ b/tests/lisp4.test @@ -18,7 +18,7 @@ # Report from Simon Josefsson. required=emacs -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/lisp5.test b/tests/lisp5.test index d15a0f4ad..93d76e899 100755 --- a/tests/lisp5.test +++ b/tests/lisp5.test @@ -18,7 +18,7 @@ # non-bytecompiled *.el files. required=emacs -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/lisp6.test b/tests/lisp6.test index 257152370..eccd18236 100755 --- a/tests/lisp6.test +++ b/tests/lisp6.test @@ -17,7 +17,7 @@ # Test for conditional _LISP. required=emacs -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/lisp7.test b/tests/lisp7.test index 7672ac0e9..40ccb859d 100755 --- a/tests/lisp7.test +++ b/tests/lisp7.test @@ -16,7 +16,7 @@ # Make sure that lisp_LISP also works when emacs is not installed. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/lisp8.test b/tests/lisp8.test index 5193a29cb..fe6a7142c 100755 --- a/tests/lisp8.test +++ b/tests/lisp8.test @@ -17,7 +17,7 @@ # Check the recover rule of lisp_LISP with parallel make. required='GNUmake emacs' -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/listval.test b/tests/listval.test index 57cb53309..0b2aeb5cb 100755 --- a/tests/listval.test +++ b/tests/listval.test @@ -17,7 +17,7 @@ # Test to make sure variable is expanded properly. # From Adam J. Richter. required=libtool -. ./defs || exit 1 +. ./defs || Exit 1 cat >> configure.in << 'END' AC_SUBST(LTLIBOBJS) @@ -37,5 +37,5 @@ END : > config.guess : > config.sub -$ACLOCAL || exit 1 +$ACLOCAL || Exit 1 $AUTOMAKE diff --git a/tests/location.test b/tests/location.test index 971520a2c..4efaa7235 100755 --- a/tests/location.test +++ b/tests/location.test @@ -16,7 +16,7 @@ # Test for locations in error messages. -. ./defs || exit 1 +. ./defs || Exit 1 set -e @@ -70,4 +70,4 @@ program.am: ... `ctags$(EXEEXT)' previously defined here Makefile.am:6: while processing program `ctags' EOF -diff expected observed || exit 1 +diff expected observed || Exit 1 diff --git a/tests/longlin2.test b/tests/longlin2.test index 8013fe8ef..0dfa27606 100755 --- a/tests/longlin2.test +++ b/tests/longlin2.test @@ -17,7 +17,7 @@ # Long lines should be wrapped. # Report from Albert Chin. -. ./defs || exit 1 +. ./defs || Exit 1 set -e @@ -46,5 +46,5 @@ EOF $ACLOCAL $AUTOMAKE -grep $match Makefile.in && exit 1 +grep $match Makefile.in && Exit 1 grep 'filenameb100 grepme' Makefile.in diff --git a/tests/longline.test b/tests/longline.test index c69dae372..7b5d3079f 100755 --- a/tests/longline.test +++ b/tests/longline.test @@ -17,7 +17,7 @@ # Long lines of += should be wrapped. # Report from Simon Josefsson. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/ltcond.test b/tests/ltcond.test index 622880d1c..1febf2c21 100755 --- a/tests/ltcond.test +++ b/tests/ltcond.test @@ -18,7 +18,7 @@ # This combines two examples from the manual. required='libtoolize gcc' -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/ltcond2.test b/tests/ltcond2.test index 0214316d3..1d4bfca3c 100755 --- a/tests/ltcond2.test +++ b/tests/ltcond2.test @@ -17,7 +17,7 @@ # Test for bug in conditionals. required='libtoolize gcc' -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/ltconv.test b/tests/ltconv.test index 9be02c7a8..251c58b1d 100755 --- a/tests/ltconv.test +++ b/tests/ltconv.test @@ -18,7 +18,7 @@ # This example is taken from the manual. required='libtoolize gcc' -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/ltdeps.test b/tests/ltdeps.test index d8c5358ca..77db501a6 100755 --- a/tests/ltdeps.test +++ b/tests/ltdeps.test @@ -17,7 +17,7 @@ # Test to make sure libtool library dependencies are correct. # Report from Lars J. Aas. required=libtool -. ./defs || exit 1 +. ./defs || Exit 1 cat >> configure.in << 'END' AC_PROG_LIBTOOL @@ -52,8 +52,8 @@ END : > config.guess : > config.sub -$ACLOCAL || exit 1 -$AUTOMAKE || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE || Exit 1 -grep 'OBJECTS =$' Makefile.in && exit 1 -exit 0 +grep 'OBJECTS =$' Makefile.in && Exit 1 +Exit 0 diff --git a/tests/ltlibobjs.test b/tests/ltlibobjs.test index 8366091a3..1308e53dc 100755 --- a/tests/ltlibobjs.test +++ b/tests/ltlibobjs.test @@ -17,7 +17,7 @@ # Test to make sure LTLIBOBJS alone works ok. # Report from Vadim Zeitlin. required=libtool -. ./defs || exit 1 +. ./defs || Exit 1 cat >> configure.in << 'END' AC_SUBST(LTLIBOBJS) @@ -35,5 +35,5 @@ END : > config.guess : > config.sub -$ACLOCAL || exit 1 +$ACLOCAL || Exit 1 $AUTOMAKE diff --git a/tests/ltlibsrc.test b/tests/ltlibsrc.test index 9a4cc7172..98b87a644 100755 --- a/tests/ltlibsrc.test +++ b/tests/ltlibsrc.test @@ -17,7 +17,7 @@ # Test to make sure a sensible default source for libraries is used. required='libtool gcc' -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/lzma.test b/tests/lzma.test index f656bc69e..9cb404183 100755 --- a/tests/lzma.test +++ b/tests/lzma.test @@ -17,7 +17,7 @@ # Check support for no-dist-gzip with lzma required=lzma -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/maintclean.test b/tests/maintclean.test index 56867c3d3..98146292a 100755 --- a/tests/maintclean.test +++ b/tests/maintclean.test @@ -16,7 +16,7 @@ # Make sure distclean and maintainer-clean erase the right files. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/make.test b/tests/make.test index 187e7a337..06a181329 100755 --- a/tests/make.test +++ b/tests/make.test @@ -18,7 +18,7 @@ # From Ralf Corsepius. required=GNUmake -. ./defs || exit 1 +. ./defs || Exit 1 cat > configure.in << 'END' AC_INIT(Makefile.am) @@ -56,4 +56,4 @@ for flag in '' -w; do rm -f config.cache done -exit 0 +Exit 0 diff --git a/tests/makej.test b/tests/makej.test index 3bfdecacc..030a9829b 100755 --- a/tests/makej.test +++ b/tests/makej.test @@ -22,7 +22,7 @@ # via autom4te. required=GNUmake -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/makevars.test b/tests/makevars.test index 435e8f53c..e0f19095f 100755 --- a/tests/makevars.test +++ b/tests/makevars.test @@ -17,17 +17,17 @@ # Test to make sure that automake includes the needed variables, # but not too many. -. ./defs || exit 1 +. ./defs || Exit 1 # Find the macros wanted by Automake. -$ACLOCAL || exit 1 +$ACLOCAL || Exit 1 # Create some dummy Makefile.in. : > Makefile.am -$AUTOMAKE || exit 1 +$AUTOMAKE || Exit 1 # We are definitely not needing a compiler or preprocessor. -$EGREP '^(CC|CPP|CXX|CXXCPP) =' Makefile.in && exit 1 +$EGREP '^(CC|CPP|CXX|CXXCPP) =' Makefile.in && Exit 1 -exit 0 +Exit 0 diff --git a/tests/man.test b/tests/man.test index d152360cb..6dfe7a857 100755 --- a/tests/man.test +++ b/tests/man.test @@ -16,7 +16,7 @@ # Test to make sure `dist' prefix works with man pages. -. ./defs || exit 1 +. ./defs || Exit 1 cat > Makefile.am << 'END' dist_man_MANS = foo.1 @@ -26,6 +26,6 @@ END : > foo.1 : > bar.man -$ACLOCAL || exit 1 -$AUTOMAKE || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE || Exit 1 grep '^MANS ' Makefile.in diff --git a/tests/man2.test b/tests/man2.test index 6add1262f..538f864b5 100755 --- a/tests/man2.test +++ b/tests/man2.test @@ -17,7 +17,7 @@ # Make sure that man pages listed in man_MANS are installed and # renamed as documented. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/man3.test b/tests/man3.test index fe9394d9f..436e2c230 100755 --- a/tests/man3.test +++ b/tests/man3.test @@ -16,7 +16,7 @@ # PR 516: Prefer generated manpages to distributed ones. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/mclean.test b/tests/mclean.test index f016ff7b9..d35299935 100755 --- a/tests/mclean.test +++ b/tests/mclean.test @@ -17,7 +17,7 @@ # Make sure MAINTAINERCLEANFILES works. # Report from Paul D. Smith. -. ./defs || exit 1 +. ./defs || Exit 1 cat > Makefile.am << 'END' MAINTAINERCLEANFILES = foo @@ -25,7 +25,7 @@ END : > FOO -$ACLOCAL || exit 1 -$AUTOMAKE || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE || Exit 1 grep 'rm -f .*MAINTAINERCLEANFILES' Makefile.in diff --git a/tests/mdate.test b/tests/mdate.test index 15af138de..8068a23e2 100755 --- a/tests/mdate.test +++ b/tests/mdate.test @@ -16,7 +16,7 @@ # Test that mdate-sh is required when Texinfo used and version.texi needed. -. ./defs || exit 1 +. ./defs || Exit 1 cat > Makefile.am << 'END' info_TEXINFOS = textutils.texi @@ -30,5 +30,5 @@ END # Required when using Texinfo. : > texinfo.tex -$ACLOCAL || exit 1 +$ACLOCAL || Exit 1 $AUTOMAKE 2>&1 > /dev/null | grep 'required file.*mdate-sh' diff --git a/tests/mdate2.test b/tests/mdate2.test index 8c91274c8..849772880 100755 --- a/tests/mdate2.test +++ b/tests/mdate2.test @@ -16,7 +16,7 @@ # Test to make sure mdate-sh is included in distribution. -. ./defs || exit 1 +. ./defs || Exit 1 cat > Makefile.am << 'END' info_TEXINFOS = textutils.texi @@ -32,7 +32,7 @@ END echo '@setfilename textutils' > textutils.texi # Use "././" to confuse Automake into thinking this is a subdir build. -$ACLOCAL || exit 1 -$AUTOMAKE ././Makefile || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE ././Makefile || Exit 1 grep 'mdate-sh' Makefile.in | grep -v SHELL diff --git a/tests/mdate3.test b/tests/mdate3.test index 5dd2c5f44..07da78180 100755 --- a/tests/mdate3.test +++ b/tests/mdate3.test @@ -16,7 +16,7 @@ # Test to make sure mdate-sh run correctly. -. ./defs || exit 1 +. ./defs || Exit 1 cat > configure.in << 'END' AC_INIT([mdate3], [1.0]) @@ -44,8 +44,8 @@ mv missing foo mv mkinstalldirs foo mv depcomp foo -$ACLOCAL || exit 1 -$AUTOMAKE || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE || Exit 1 -grep '[^/]mdate-sh' Makefile.in && exit 1 -exit 0 +grep '[^/]mdate-sh' Makefile.in && Exit 1 +Exit 0 diff --git a/tests/mdate4.test b/tests/mdate4.test index 551a12d42..4b35d45f1 100755 --- a/tests/mdate4.test +++ b/tests/mdate4.test @@ -17,7 +17,7 @@ # Test to make sure that mdate-sh is added to the right directory. # Report from Kevin Dalley -. ./defs || exit 1 +. ./defs || Exit 1 cat > configure.in << 'END' AC_INIT @@ -40,6 +40,6 @@ cat > sub/textutils.texi << 'END' @setfilename textutils.info END -$ACLOCAL || exit 1 -$AUTOMAKE -a || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE -a || Exit 1 test -f sub/mdate-sh diff --git a/tests/mdate5.test b/tests/mdate5.test index eb22197e4..ce9f7db71 100755 --- a/tests/mdate5.test +++ b/tests/mdate5.test @@ -17,7 +17,7 @@ # Test to make sure mdate-sh works correctly. -. ./defs || exit 1 +. ./defs || Exit 1 set -e cat >> configure.in << 'END' @@ -40,5 +40,5 @@ set x `$SHELL ./mdate-sh Makefile.am` shift # Check that mdate output looks like a date: test $# = 3 -case $1$3 in *[!0-9]*) exit 1;; esac +case $1$3 in *[!0-9]*) Exit 1;; esac test $1 -lt 32 diff --git a/tests/missing.test b/tests/missing.test index 274226cbf..7d541837a 100755 --- a/tests/missing.test +++ b/tests/missing.test @@ -16,7 +16,7 @@ # Test missing with version mismatches. -. ./defs || exit 1 +. ./defs || Exit 1 set -e @@ -51,5 +51,5 @@ $MAKE # Make sure $MAKE fails when timestamps aren't updated and missing is not used. $sleep touch aclocal.m4 -$MAKE && exit 1 +$MAKE && Exit 1 : diff --git a/tests/missing2.test b/tests/missing2.test index fd04f8ba6..bf6111f70 100755 --- a/tests/missing2.test +++ b/tests/missing2.test @@ -16,7 +16,7 @@ # Test missing with version mismatches. -. ./defs || exit 1 +. ./defs || Exit 1 set -e @@ -53,5 +53,5 @@ $MAKE # Make sure $MAKE fail when timestamps aren't updated and missing is not used. $sleep touch v.m4 -$MAKE && exit 1 +$MAKE && Exit 1 : diff --git a/tests/missing3.test b/tests/missing3.test index 57c3e76fe..9d6a57478 100755 --- a/tests/missing3.test +++ b/tests/missing3.test @@ -16,30 +16,30 @@ # Test missing when running a tool's --version. -. ./defs || exit 1 +. ./defs || Exit 1 set -e # b7cb8259 assumed not to exist. -./missing b7cb8259 --version 2>stderr && exit 1 -grep . stderr && exit 1 -./missing b7cb8259 --grep 2>stderr && exit 1 +./missing b7cb8259 --version 2>stderr && Exit 1 +grep . stderr && Exit 1 +./missing b7cb8259 --grep 2>stderr && Exit 1 grep WARNING stderr -./missing --run b7cb8259 --version && exit 1 -./missing --run b7cb8259 --grep 2>stderr && exit 1 +./missing --run b7cb8259 --version && Exit 1 +./missing --run b7cb8259 --grep 2>stderr && Exit 1 grep WARNING stderr # missing itself it known to exist :) -./missing ./missing --version 2>stderr && exit 1 -grep . stderr && exit 1 -./missing ./missing --grep 2>stderr && exit 1 +./missing ./missing --version 2>stderr && Exit 1 +grep . stderr && Exit 1 +./missing ./missing --grep 2>stderr && Exit 1 grep WARNING stderr ./missing --run ./missing --version 2>stderr -grep . stderr && exit 1 -./missing --run ./missing --grep 2>stderr && exit 1 -grep WARNING stderr && exit 1 +grep . stderr && Exit 1 +./missing --run ./missing --grep 2>stderr && Exit 1 +grep WARNING stderr && Exit 1 grep Unknown stderr diff --git a/tests/missing4.test b/tests/missing4.test index 137b99907..68420407c 100755 --- a/tests/missing4.test +++ b/tests/missing4.test @@ -17,7 +17,7 @@ # See how well the rebuild rule handles an aclocal.m4 that was # generated for another version of autoconf. -. ./defs || exit 1 +. ./defs || Exit 1 set -e @@ -32,7 +32,7 @@ $AUTOMAKE $MAKE sed '1,20 s/m4_defn(\[AC_AUTOCONF_VERSION\]),/9999,/' < aclocal.m4 > aclocal.tmp -cmp aclocal.m4 aclocal.tmp && exit 1 +cmp aclocal.m4 aclocal.tmp && Exit 1 mv aclocal.tmp aclocal.m4 @@ -43,7 +43,7 @@ grep -c 'aclocal.m4:.*this file was generated for' stderr $MAKE 2>stderr cat stderr -grep 'You have another version of autoconf' stderr && exit 1 -grep 'aclocal.m4:.*this file was generated for' stderr && exit 1 +grep 'You have another version of autoconf' stderr && Exit 1 +grep 'aclocal.m4:.*this file was generated for' stderr && Exit 1 : diff --git a/tests/missing5.test b/tests/missing5.test index cd284ac9d..f3773cc6f 100755 --- a/tests/missing5.test +++ b/tests/missing5.test @@ -17,7 +17,7 @@ # test how well `missing' finds output file names of various tools. # PR automake/483. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/missing6.test b/tests/missing6.test index f65e2ab97..15767b02a 100755 --- a/tests/missing6.test +++ b/tests/missing6.test @@ -16,7 +16,7 @@ # Make sure autoconf version checks in aclocal.m4 are robust. -. ./defs || exit 1 +. ./defs || Exit 1 set -e @@ -39,7 +39,7 @@ $AUTOMAKE $MAKE sed 's/\[b\]/[a]/' < configure.ac > configure.tmp -cmp configure.ac configure.tmp && exit 1 +cmp configure.ac configure.tmp && Exit 1 mv configure.tmp configure.ac diff --git a/tests/mkinst2.test b/tests/mkinst2.test index a7e3ed128..e066767a3 100755 --- a/tests/mkinst2.test +++ b/tests/mkinst2.test @@ -16,7 +16,7 @@ # Test to make sure no-installman suppresses man dir creation. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/mkinst3.test b/tests/mkinst3.test index c641cf0fb..c1e843087 100755 --- a/tests/mkinst3.test +++ b/tests/mkinst3.test @@ -16,13 +16,13 @@ # Test mkinstalldirs with spaces in directory names. -. ./defs || exit 1 +. ./defs || Exit 1 set -e # Make sure the directory we will create can be created... -mkdir '~a b' || exit 77 -mkdir '~a b/-x y' || exit 77 +mkdir '~a b' || Exit 77 +mkdir '~a b/-x y' || Exit 77 rm -rf '~a b' cp "$testsrcdir/../lib/mkinstalldirs" . diff --git a/tests/mkinstall.test b/tests/mkinstall.test index 356d8d159..843cb7623 100755 --- a/tests/mkinstall.test +++ b/tests/mkinstall.test @@ -16,7 +16,7 @@ # Test for bug where mkinstalldirs variable can be set incorrectly. -. ./defs || exit 1 +. ./defs || Exit 1 cat > Makefile.am << 'END' pkgdata_DATA = @@ -24,8 +24,8 @@ END # The "././" prefix confuses Automake into thinking it is doing a # subdir build. Yes, this is hacky. -$ACLOCAL || exit 1 -$AUTOMAKE ././Makefile || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE ././Makefile || Exit 1 -grep ' /mkinstalldirs' Makefile.in && exit 1 -exit 0 +grep ' /mkinstalldirs' Makefile.in && Exit 1 +Exit 0 diff --git a/tests/mmode.test b/tests/mmode.test index c067ccc89..1f3e59112 100755 --- a/tests/mmode.test +++ b/tests/mmode.test @@ -16,7 +16,7 @@ # Check for AM_MAINTAINER_MODE defaults. -. ./defs || exit 1 +. ./defs || Exit 1 set -e @@ -39,7 +39,7 @@ grep '^MAINT.*#' Makefile grep '^MAINT.*#' Makefile ./configure --enable-maintainer-mode -grep '^MAINT.*#' Makefile && exit 1 +grep '^MAINT.*#' Makefile && Exit 1 sed 's/\(AM_MAINTAINER_MODE\).*/\1([disable])/' configure.in > configure.int mv -f configure.int configure.in @@ -53,15 +53,15 @@ $AUTOCONF --force ./configure --help | grep 'disable-maintainer-mode.*disable make rules' ./configure -grep '^MAINT.*#' Makefile && exit 1 +grep '^MAINT.*#' Makefile && Exit 1 ./configure --enable-maintainer-mode -grep '^MAINT.*#' Makefile && exit 1 +grep '^MAINT.*#' Makefile && Exit 1 ./configure --disable-maintainer-mode grep '^MAINT.*#' Makefile sed 's/\(AM_MAINTAINER_MODE\).*/\1([foo])/' configure.in > configure.int mv -f configure.int configure.in -$AUTOCONF --force -Werror && exit 1 +$AUTOCONF --force -Werror && Exit 1 : diff --git a/tests/mmodely.test b/tests/mmodely.test index 6f1249df2..fd11ac211 100755 --- a/tests/mmodely.test +++ b/tests/mmodely.test @@ -19,7 +19,7 @@ # From Derek R. Price. required=gcc -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/multlib.test b/tests/multlib.test index 18b8a31b0..e2857a793 100755 --- a/tests/multlib.test +++ b/tests/multlib.test @@ -18,7 +18,7 @@ # Based on a test case from Ralf Corsepius. required='gcc GNUmake' -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/nobase-libtool.test b/tests/nobase-libtool.test index c0b998ce8..bb027c622 100755 --- a/tests/nobase-libtool.test +++ b/tests/nobase-libtool.test @@ -20,7 +20,7 @@ # up for greater exposure of nobase.test. required='libtoolize gcc' -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/nobase-python.test b/tests/nobase-python.test index 28854fe6e..e7e857ec0 100755 --- a/tests/nobase-python.test +++ b/tests/nobase-python.test @@ -17,7 +17,7 @@ # Make sure nobase_* works for python files. required=python -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/nobase.test b/tests/nobase.test index f65bb8631..7ffc4894d 100755 --- a/tests/nobase.test +++ b/tests/nobase.test @@ -18,7 +18,7 @@ # Make sure nobase_* works. required='gcc' -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/nodef.test b/tests/nodef.test index 04a08cb9c..1477f1c0e 100755 --- a/tests/nodef.test +++ b/tests/nodef.test @@ -16,7 +16,7 @@ # Make sure that PACKAGE and VERSION are AC_DEFINEd when requested. -. ./defs || exit 1 +. ./defs || Exit 1 set -e @@ -55,5 +55,5 @@ $ACLOCAL $AUTOCONF ./configure -grep 'DEFS.*-DVERSION=\\"UnIqUe' output && exit 1 +grep 'DEFS.*-DVERSION=\\"UnIqUe' output && Exit 1 : diff --git a/tests/nodef2.test b/tests/nodef2.test index d5f895e7e..65c77c9f5 100755 --- a/tests/nodef2.test +++ b/tests/nodef2.test @@ -16,7 +16,7 @@ # Make sure that PACKAGE and VERSION are AC_DEFINEd when requested. -. ./defs || exit 1 +. ./defs || Exit 1 set -e @@ -51,5 +51,5 @@ $AUTOCONF $AUTOMAKE # Dummy call to make sure Automake grok `no-define' silently. ./configure -grep 'DEFS.*-DVERSION=\\"UnIqUe' output && exit 1 +grep 'DEFS.*-DVERSION=\\"UnIqUe' output && Exit 1 : diff --git a/tests/nodep.test b/tests/nodep.test index b0c7bb8cc..60bf28290 100755 --- a/tests/nodep.test +++ b/tests/nodep.test @@ -17,7 +17,7 @@ # Test to make sure no-dependencies option does the right thing. # Bug report from Greg A. Woods. -. ./defs || exit 1 +. ./defs || Exit 1 cat > Makefile.am << 'END' AUTOMAKE_OPTIONS = no-dependencies @@ -33,8 +33,8 @@ mkdir x : > y.c -$ACLOCAL || exit 1 -$AUTOMAKE || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE || Exit 1 -grep '%' Makefile.in && exit 1 -exit 0 +grep '%' Makefile.in && Exit 1 +Exit 0 diff --git a/tests/nodep2.test b/tests/nodep2.test index 1e43ca40c..8cd8d42bf 100755 --- a/tests/nodep2.test +++ b/tests/nodep2.test @@ -16,7 +16,7 @@ # Another test to make sure no-dependencies option does the right thing. -. ./defs || exit 1 +. ./defs || Exit 1 set -e @@ -48,5 +48,5 @@ END $ACLOCAL $AUTOMAKE -grep DEPMODE Makefile.in && exit 1 +grep DEPMODE Makefile.in && Exit 1 : diff --git a/tests/nodepcomp.test b/tests/nodepcomp.test index 7068c8b7a..e578a5941 100755 --- a/tests/nodepcomp.test +++ b/tests/nodepcomp.test @@ -16,11 +16,11 @@ # Test to make sure depcomp isn't always required. -. ./defs || exit 1 +. ./defs || Exit 1 rm -f depcomp : > Makefile.am -$ACLOCAL || exit 1 +$ACLOCAL || Exit 1 $AUTOMAKE diff --git a/tests/nodist.test b/tests/nodist.test index 6d11aa532..50e55230b 100755 --- a/tests/nodist.test +++ b/tests/nodist.test @@ -16,7 +16,7 @@ # Test to make sure dist_*_SOURCES and nodist_*_SOURCES work. -. ./defs || exit 1 +. ./defs || Exit 1 echo AC_PROG_CC >> configure.in @@ -32,11 +32,11 @@ END : > b.c : > c.c -$ACLOCAL || exit 1 -$AUTOMAKE || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE || Exit 1 -grep '^am_eyeball_OBJECTS' Makefile.in || exit 1 -grep '^DIST_SOURCES =' Makefile.in || exit 1 -grep '^DIST_SOURCES =.*nodist' Makefile.in && exit 1 +grep '^am_eyeball_OBJECTS' Makefile.in || Exit 1 +grep '^DIST_SOURCES =' Makefile.in || Exit 1 +grep '^DIST_SOURCES =.*nodist' Makefile.in && Exit 1 -exit 0 +Exit 0 diff --git a/tests/nodist2.test b/tests/nodist2.test index f9ad9982c..80a89c73e 100755 --- a/tests/nodist2.test +++ b/tests/nodist2.test @@ -17,7 +17,7 @@ # Test to make sure nodist_noinst_HEADERS work. # For PR 249. -. ./defs || exit 1 +. ./defs || Exit 1 cat >> configure.in <<'EOF' AC_OUTPUT diff --git a/tests/nodist3.test b/tests/nodist3.test index a85ac01e5..9f830fcaf 100755 --- a/tests/nodist3.test +++ b/tests/nodist3.test @@ -16,7 +16,7 @@ # Test to make sure no-dist option works. -. ./defs || exit 1 +. ./defs || Exit 1 echo AC_PROG_CC >> configure.in @@ -28,10 +28,10 @@ END : > a.c -$ACLOCAL || exit 1 -$AUTOMAKE || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE || Exit 1 -grep '^dist:' Makefile.in && exit 1 -grep '^DIST_SOURCES =' Makefile.in && exit 1 +grep '^dist:' Makefile.in && Exit 1 +grep '^DIST_SOURCES =' Makefile.in && Exit 1 -exit 0 +Exit 0 diff --git a/tests/nogzip.test b/tests/nogzip.test index acf4d1d76..c1429e006 100755 --- a/tests/nogzip.test +++ b/tests/nogzip.test @@ -17,7 +17,7 @@ # Check support for no-dist-gzip required=bzip2 -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/nogzip2.test b/tests/nogzip2.test index 4f75620f2..338754f5e 100755 --- a/tests/nogzip2.test +++ b/tests/nogzip2.test @@ -16,7 +16,7 @@ # Check diagnostic for no-dist-gzip without dist-*. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/noinst.test b/tests/noinst.test index f6a8a8d2c..a59816f0e 100755 --- a/tests/noinst.test +++ b/tests/noinst.test @@ -17,14 +17,14 @@ # Check to make sure "make install" will build all in directory with # nothing to install. -. ./defs || exit 1 +. ./defs || Exit 1 cat > Makefile.am << 'END' all-local: exit 1 END -$ACLOCAL || exit 1 -$AUTOMAKE || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE || Exit 1 grep '^install[-a-z]*:.* all' Makefile.in diff --git a/tests/noinstdir.test b/tests/noinstdir.test index abe5f5ac8..9395795b4 100755 --- a/tests/noinstdir.test +++ b/tests/noinstdir.test @@ -17,7 +17,7 @@ # Test to make sure that noinst_* and check_* are not installed. # From Pavel Roskin. -. ./defs || exit 1 +. ./defs || Exit 1 cat > Makefile.am << 'END' noinst_SCRIPTS = foo.sh @@ -37,9 +37,9 @@ AC_PROG_CC AC_PROG_RANLIB END -$ACLOCAL || exit 1 -$AUTOMAKE || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE || Exit 1 -grep 'noinstdir' Makefile.in && exit 1 -grep 'checkdir' Makefile.in && exit 1 -exit 0 +grep 'noinstdir' Makefile.in && Exit 1 +grep 'checkdir' Makefile.in && Exit 1 +Exit 0 diff --git a/tests/nolink.test b/tests/nolink.test index a08488b7f..dbfeee8dd 100755 --- a/tests/nolink.test +++ b/tests/nolink.test @@ -16,7 +16,7 @@ # Make sure Automake does not emit a link rule for unknown languages. -. ./defs || exit 1 +. ./defs || Exit 1 set -e @@ -33,6 +33,6 @@ END $ACLOCAL $AUTOMAKE -Wno-override -grep '^meal.*:' Makefile.in | grep -v beef.meat && exit 1 +grep '^meal.*:' Makefile.in | grep -v beef.meat && Exit 1 -exit 0 +Exit 0 diff --git a/tests/nostdinc.test b/tests/nostdinc.test index 19b1046bb..bda75233a 100755 --- a/tests/nostdinc.test +++ b/tests/nostdinc.test @@ -16,7 +16,7 @@ # Test to make sure nostdinc option works correctly. -. ./defs || exit 1 +. ./defs || Exit 1 cat >> configure.in << 'END' AC_PROG_CC @@ -28,8 +28,8 @@ bin_PROGRAMS = foo foo_SOURCES = foo.c END -$ACLOCAL || exit 1 -$AUTOMAKE || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE || Exit 1 -$FGREP -e '-I.' Makefile.in && exit 1 -exit 0 +$FGREP -e '-I.' Makefile.in && Exit 1 +Exit 0 diff --git a/tests/notrans.test b/tests/notrans.test index bf7ad7fed..e00566c89 100755 --- a/tests/notrans.test +++ b/tests/notrans.test @@ -17,7 +17,7 @@ # Check all notrans_, dist_, nodist_ prefix combinations for MANS # primary and install-man dependencies. -. ./defs || exit 1 +. ./defs || Exit 1 set -e @@ -109,8 +109,8 @@ grep '^install-man4:' Makefile.in | grep '\$(notrans_man_MANS)' grep '^install-man5:' Makefile.in | grep '\$(notrans_dist_man_MANS)' grep '^install-man6:' Makefile.in | grep '\$(notrans_nodist_man_MANS)' -if grep '^install-man8:' Makefile.in; then exit 1; else :; fi -if grep '^install-man9:' Makefile.in; then exit 1; else :; fi +if grep '^install-man8:' Makefile.in; then Exit 1; else :; fi +if grep '^install-man9:' Makefile.in; then Exit 1; else :; fi ./configure --program-prefix=gnu- --prefix "`pwd`"/inst --mandir "`pwd`"/inst/man $MAKE @@ -129,5 +129,5 @@ test -d inst/man/man4 test -d inst/man/man5 test -d inst/man/man6 test -d inst/man/man7 -if test -d inst/man/man8; then exit 1; else :; fi -if test -d inst/man/man9; then exit 1; else :; fi +if test -d inst/man/man8; then Exit 1; else :; fi +if test -d inst/man/man9; then Exit 1; else :; fi diff --git a/tests/number.test b/tests/number.test index bcee2c9fc..6a0887df2 100755 --- a/tests/number.test +++ b/tests/number.test @@ -17,7 +17,7 @@ # Test to make sure _OBJECTS only generated once. Bug reported by # Joerg-Martin Schwarz. -. ./defs || exit 1 +. ./defs || Exit 1 cat >> configure.in << 'END' AC_PROG_CC @@ -27,8 +27,8 @@ cat > Makefile.am << 'END' bin_PROGRAMS = zardoz END -$ACLOCAL || exit 1 -$AUTOMAKE || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE || Exit 1 count=`grep -c '^zardoz_OBJECTS' Makefile.in` test $count -eq 1 diff --git a/tests/objc.test b/tests/objc.test index 8c68602bc..5c04a27db 100755 --- a/tests/objc.test +++ b/tests/objc.test @@ -17,7 +17,7 @@ # Test that `.m' extension works. # From Ralf Corsepius (for C++). -. ./defs || exit 1 +. ./defs || Exit 1 cat >> configure.in << 'END' AC_PROG_OBJC @@ -28,7 +28,7 @@ bin_PROGRAMS = hello hello_SOURCES = hello.m END -$ACLOCAL || exit 1 -$AUTOMAKE || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE || Exit 1 grep '^\.SUFFIXES:.*\.m' Makefile.in diff --git a/tests/objc2.test b/tests/objc2.test index 6b2fe5c9b..cc1d2c4a1 100755 --- a/tests/objc2.test +++ b/tests/objc2.test @@ -17,7 +17,7 @@ # Test that Automake suggests using AC_PROG_OBJC if Objective C sources # are used. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/obsolete.test b/tests/obsolete.test index a27a21533..53e42613b 100755 --- a/tests/obsolete.test +++ b/tests/obsolete.test @@ -18,7 +18,7 @@ set x ${AUTOUPDATE-autoupdate} required=$2 -. ./defs || exit 1 +. ./defs || Exit 1 cat > configure.in << 'END' AC_INIT @@ -27,22 +27,22 @@ END $PERL -ne '/AU_DEFUN\(\[(\w+)\]/ && print "$1\n"' \ "$testsrcdir/../m4/obsolete.m4" >> obs cat obs >> configure.in -$PERL -ne 'chomp; print "grep $_ stderr || exit 1\n"; ' obs > obs.1 -$PERL -ne 'chomp; print "grep $_ configure.in && exit 1\n"; ' obs > obs.2 +$PERL -ne 'chomp; print "grep $_ stderr || Exit 1\n"; ' obs > obs.1 +$PERL -ne 'chomp; print "grep $_ configure.in && Exit 1\n"; ' obs > obs.2 # Sanity check. Make sure we have added something to configure.in. -test `cat configure.in | wc -l` -gt 1 || exit 1 +test `cat configure.in | wc -l` -gt 1 || Exit 1 -$ACLOCAL || exit 1 +$ACLOCAL || Exit 1 # Expect Autoconf to complain about each of the macros in obs. $AUTOCONF -Wobsolete >stderr 2>&1 . ./obs.1 # Make sure Autoupdate remove each of these macros. -$AUTOUPDATE || exit 1 +$AUTOUPDATE || Exit 1 . ./obs.2 # Autoconf should be able to grok the updated configure.in. -$AUTOCONF || exit 1 +$AUTOCONF || Exit 1 -exit 0 +Exit 0 diff --git a/tests/order.test b/tests/order.test index a101267bc..e56035b18 100755 --- a/tests/order.test +++ b/tests/order.test @@ -17,7 +17,7 @@ # Make sure AC_DEFUN is handled correctly. This test isn't named very # well. Report from Jim Meyering. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/outdir.test b/tests/outdir.test index aea43cdf0..e534ce1c3 100755 --- a/tests/outdir.test +++ b/tests/outdir.test @@ -17,7 +17,7 @@ # Test to ensure that --output-dir works. Bug report from Joshua # Cowan. -. ./defs || exit 1 +. ./defs || Exit 1 cat > Makefile.am <<'END' pkgdata_DATA = @@ -25,8 +25,8 @@ END mkdir zardir -$ACLOCAL || exit 1 -$AUTOMAKE -Wno-obsolete --output-dir=zardir || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE -Wno-obsolete --output-dir=zardir || Exit 1 -test -f Makefile.in && exit 1 +test -f Makefile.in && Exit 1 test -f zardir/Makefile.in diff --git a/tests/output-order.test b/tests/output-order.test index a2e65a7f9..8e0e5a4fe 100755 --- a/tests/output-order.test +++ b/tests/output-order.test @@ -17,7 +17,7 @@ # Test that `automake -a' output order is stable. # From report by Bruno Haible. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/output.test b/tests/output.test index 46f5b21fa..616587178 100755 --- a/tests/output.test +++ b/tests/output.test @@ -16,7 +16,7 @@ # Test to make sure files listed in AC_OUTPUT are found. -. ./defs || exit 1 +. ./defs || Exit 1 cat > configure.in << 'END' AC_INIT @@ -29,5 +29,5 @@ END mkdir frob : > frob/zardoz.in -$ACLOCAL || exit 1 +$ACLOCAL || Exit 1 $AUTOMAKE diff --git a/tests/output10.test b/tests/output10.test index 139aa6182..acaf29cf6 100755 --- a/tests/output10.test +++ b/tests/output10.test @@ -18,7 +18,7 @@ # This is comparable to output9.test, but testing Makefile rules. # PR/411 -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/output11.test b/tests/output11.test index 75c278476..4d5ccea6c 100755 --- a/tests/output11.test +++ b/tests/output11.test @@ -16,7 +16,7 @@ # Make sure an AC_CONFIG_FILES ignore filenames with shell variables. -. ./defs || exit 1 +. ./defs || Exit 1 set -e @@ -55,7 +55,7 @@ $ACLOCAL $AUTOCONF $AUTOMAKE -$FGREP ' $file' Makefile.in sub/Makefile.in && exit 1 +$FGREP ' $file' Makefile.in sub/Makefile.in && Exit 1 ./configure $MAKE distcheck diff --git a/tests/output12.test b/tests/output12.test index 90f100d08..b26fc0df3 100755 --- a/tests/output12.test +++ b/tests/output12.test @@ -16,7 +16,7 @@ # Make sure an AC_CONFIG_FILES process filenames with AC_SUBST variables. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/output13.test b/tests/output13.test index f5d214bca..23f997d1b 100755 --- a/tests/output13.test +++ b/tests/output13.test @@ -17,7 +17,7 @@ # Make sure an AC_CONFIG_FILES, AC_CONFIG_LINKS, and AC_CONFIG_COMMANDS # are not prerequisites of `all'. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/output2.test b/tests/output2.test index 6c98a8373..1a42c4319 100755 --- a/tests/output2.test +++ b/tests/output2.test @@ -16,7 +16,7 @@ # Another AC_OUTPUT test. From report by Ulrich Drepper. -. ./defs || exit 1 +. ./defs || Exit 1 cat > configure.in << 'END' AC_INIT @@ -31,8 +31,8 @@ mkdir intl po misc : > po/Makefile.in.am : > misc/gettextize.in -$ACLOCAL || exit 1 -$AUTOMAKE || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE || Exit 1 -grep '^gettextize' Makefile.in && exit 1 -exit 0 +grep '^gettextize' Makefile.in && Exit 1 +Exit 0 diff --git a/tests/output3.test b/tests/output3.test index a1650a419..997e54852 100755 --- a/tests/output3.test +++ b/tests/output3.test @@ -16,7 +16,7 @@ # Yet another AC_OUTPUT test. -. ./defs || exit 1 +. ./defs || Exit 1 cat > configure.in << 'END' AC_INIT @@ -32,5 +32,5 @@ mkdir tests : > tests/Makefile.am : > tests/defs.in -$ACLOCAL || exit 1 +$ACLOCAL || Exit 1 $AUTOMAKE diff --git a/tests/output4.test b/tests/output4.test index 62b30200d..ebd354824 100755 --- a/tests/output4.test +++ b/tests/output4.test @@ -16,7 +16,7 @@ # It's hard to believe there are so many AC_OUTPUT-related bugs. -. ./defs || exit 1 +. ./defs || Exit 1 cat > configure.in << 'END' AC_INIT @@ -28,8 +28,8 @@ mkdir tests : > tests/defs.in : > tests/Makefile.am -$ACLOCAL || exit 1 -$AUTOMAKE || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE || Exit 1 -grep tests/defs.in tests/Makefile.in && exit 1 -exit 0 +grep tests/defs.in tests/Makefile.in && Exit 1 +Exit 0 diff --git a/tests/output5.test b/tests/output5.test index 9de1654fe..80d8e7942 100755 --- a/tests/output5.test +++ b/tests/output5.test @@ -17,7 +17,7 @@ # Make sure Automake complains when there is no Makefile specified. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/output6.test b/tests/output6.test index 3e2548ac7..e7bef436c 100755 --- a/tests/output6.test +++ b/tests/output6.test @@ -17,7 +17,7 @@ # Check for support for colon separated input files in AC_CONFIG_FILES required=GNUmake -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/output7.test b/tests/output7.test index 47ab3164b..fbb9d5218 100755 --- a/tests/output7.test +++ b/tests/output7.test @@ -17,7 +17,7 @@ # Check for support for colon separated input files in AC_CONFIG_FILES, # with sources in sub directories. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/output8.test b/tests/output8.test index 233c9c96a..3e340709c 100755 --- a/tests/output8.test +++ b/tests/output8.test @@ -17,7 +17,7 @@ # Check AC_CONFIG_FILES support for files starting with `../'. # Report from Bruno Haible. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/output9.test b/tests/output9.test index 82993fe06..6da79be12 100755 --- a/tests/output9.test +++ b/tests/output9.test @@ -16,7 +16,7 @@ # Make sure an AC_CONFIG_FILES can have an AC_CONFIG_FILES output as input. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/overrid.test b/tests/overrid.test index 7ddcb7f6b..555b96f98 100755 --- a/tests/overrid.test +++ b/tests/overrid.test @@ -17,7 +17,7 @@ # Make sure automake -Woverride suggests using TARGET-local instead # of TARGET when possible. -. ./defs || exit 1 +. ./defs || Exit 1 set -e @@ -44,18 +44,18 @@ END $ACLOCAL $AUTOMAKE -Wno-override AUTOMAKE_fails -grep ':.*install-local' stderr && exit 1 # There is no such thing as install-local +grep ':.*install-local' stderr && Exit 1 # There is no such thing as install-local grep ':.*installcheck-local' stderr grep ':.*html-local' stderr # Make sure overriding *-am targets suggest using *-local, not *-am. -grep ':.*clean-am-local' stderr && exit 1 +grep ':.*clean-am-local' stderr && Exit 1 grep ':.*clean-local' stderr # Conditional overrides ought to be diagnosed, but it can't be done yet. # See the FIXME in Automake::Rule::define. Once this is fixed, the grep below # will fail. If you see the failure, it means you fixed Automake. Well done! -# Just strip out the next '&& exit 1' and this comment. -grep ':.*overrides.*ps' stderr && exit 1 +# Just strip out the next '&& Exit 1' and this comment. +grep ':.*overrides.*ps' stderr && Exit 1 # Test for another issue. Overriding html: should cause only one # html: rule to be output. diff --git a/tests/parse.test b/tests/parse.test index 8402a1bf3..80638dae3 100755 --- a/tests/parse.test +++ b/tests/parse.test @@ -16,7 +16,7 @@ # Test to make sure backslash-newline is treated as whitespace. -. ./defs || exit 1 +. ./defs || Exit 1 cat > configure.in << 'END' AC_INIT @@ -33,8 +33,8 @@ zar.c\ doz.c END -$ACLOCAL || exit 1 -$AUTOMAKE || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE || Exit 1 -$FGREP zar.cdoz Makefile.in && exit 1 -exit 0 +$FGREP zar.cdoz Makefile.in && Exit 1 +Exit 0 diff --git a/tests/pluseq.test b/tests/pluseq.test index 185b2111e..7b0b89e81 100755 --- a/tests/pluseq.test +++ b/tests/pluseq.test @@ -16,7 +16,7 @@ # Test `+=' functionality. -. ./defs || exit 1 +. ./defs || Exit 1 cat > Makefile.am << 'END' data_DATA = zar @@ -26,6 +26,6 @@ END : > zar : > doz -$ACLOCAL || exit 1 -$AUTOMAKE || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE || Exit 1 $FGREP 'zar doz' Makefile.in diff --git a/tests/pluseq10.test b/tests/pluseq10.test index 5e07b86c8..3324cbaa7 100755 --- a/tests/pluseq10.test +++ b/tests/pluseq10.test @@ -17,7 +17,7 @@ # Test for += and backslashes. # Reported by Ralf Corsepius. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/pluseq2.test b/tests/pluseq2.test index f7c1e56f9..a7fdc56e0 100755 --- a/tests/pluseq2.test +++ b/tests/pluseq2.test @@ -16,7 +16,7 @@ # Test `+=' with conditionals. -. ./defs || exit 1 +. ./defs || Exit 1 echo 'AM_CONDITIONAL(CHECK, true)' >> configure.in @@ -40,7 +40,7 @@ END : > doz : > dog -$ACLOCAL || exit 1 -$AUTOMAKE || exit 1 -grep 'CHECK_TRUE.*zar doz' Makefile.in || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE || Exit 1 +grep 'CHECK_TRUE.*zar doz' Makefile.in || Exit 1 grep 'CHECK_FALSE.*dog' Makefile.in diff --git a/tests/pluseq3.test b/tests/pluseq3.test index 12dc2274b..523d970a1 100755 --- a/tests/pluseq3.test +++ b/tests/pluseq3.test @@ -16,7 +16,7 @@ # Another `+=' test with conditionals. -. ./defs || exit 1 +. ./defs || Exit 1 echo 'AM_CONDITIONAL(CHECK, true)' >> configure.in @@ -43,7 +43,7 @@ END set -e -$ACLOCAL || exit 1 +$ACLOCAL || Exit 1 $AUTOMAKE grep '^@CHECK_TRUE@data_DATA = zarrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrr \\$' Makefile.in @@ -51,4 +51,4 @@ grep '^@CHECK_TRUE@ doz$' Makefile.in grep '^@CHECK_FALSE@data_DATA = dog$' Makefile.in -exit 0 +Exit 0 diff --git a/tests/pluseq4.test b/tests/pluseq4.test index 659ee76a3..7ab49389d 100755 --- a/tests/pluseq4.test +++ b/tests/pluseq4.test @@ -16,7 +16,7 @@ # Yet another `+=' test. -. ./defs || exit 1 +. ./defs || Exit 1 echo AC_PROG_CC >> configure.in @@ -27,6 +27,6 @@ END : > foo.c -$ACLOCAL || exit 1 -$AUTOMAKE || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE || Exit 1 $FGREP '@CC@ -Dwhatever' Makefile.in diff --git a/tests/pluseq5.test b/tests/pluseq5.test index 12d82d362..ed6ee83fe 100755 --- a/tests/pluseq5.test +++ b/tests/pluseq5.test @@ -16,7 +16,7 @@ # Test for another `+=' problem. Report from Brian Jones. -. ./defs || exit 1 +. ./defs || Exit 1 set -e @@ -53,6 +53,6 @@ grep AM_CPPFLAGS stderr # -Wno-obsolete: echo 'AUTOMAKE_OPTIONS = -Wno-obsolete' >> Makefile.am AUTOMAKE_fails -grep AM_CPPFLAGS stderr && exit 1 +grep AM_CPPFLAGS stderr && Exit 1 # !CHECK should still be mentioned. grep ':.*!CHECK$' stderr diff --git a/tests/pluseq6.test b/tests/pluseq6.test index 93c0d9c9f..d67e69f56 100755 --- a/tests/pluseq6.test +++ b/tests/pluseq6.test @@ -16,7 +16,7 @@ # Test that `+=' works with standard header-vars. -. ./defs || exit 1 +. ./defs || Exit 1 echo 'AC_SUBST(ZZZ)' >> configure.in @@ -26,9 +26,9 @@ mandir += foo zq = zzz END -$ACLOCAL || exit 1 -$AUTOMAKE || exit 1 -$FGREP '@mandir@ foo' Makefile.in || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE || Exit 1 +$FGREP '@mandir@ foo' Makefile.in || Exit 1 num=`grep '^mandir =' Makefile.in | wc -l` test $num -eq 1 diff --git a/tests/pluseq7.test b/tests/pluseq7.test index debb94f6c..367c0df5f 100755 --- a/tests/pluseq7.test +++ b/tests/pluseq7.test @@ -16,7 +16,7 @@ # Test that `+=' fails when required. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/pluseq8.test b/tests/pluseq8.test index 677f53e33..25b226b8b 100755 --- a/tests/pluseq8.test +++ b/tests/pluseq8.test @@ -16,7 +16,7 @@ # Another `+=' test. From Paul Berrevoets. -. ./defs || exit 1 +. ./defs || Exit 1 cat > Makefile.am << 'END' VAR = \ @@ -25,8 +25,8 @@ VAR = \ VAR += three END -$ACLOCAL || exit 1 -$AUTOMAKE || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE || Exit 1 sed -n -e '/^VAR =/ { :loop diff --git a/tests/pluseq9.test b/tests/pluseq9.test index 6e7b1d9fa..a10c7613e 100755 --- a/tests/pluseq9.test +++ b/tests/pluseq9.test @@ -16,7 +16,7 @@ # Test the += diagnostics. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/postproc.test b/tests/postproc.test index 0a06acaf5..254c93649 100755 --- a/tests/postproc.test +++ b/tests/postproc.test @@ -17,7 +17,7 @@ # Check to make sure we recognize a Makefile.in, even if post-processed # and renamed. -. ./defs || exit 1 +. ./defs || Exit 1 cat >configure.in <<'END' AC_INIT([mumble], [0.1]) @@ -32,16 +32,16 @@ bin_PROGRAMS = fred fred_SOURCES = fred.c END -$ACLOCAL || exit 1 -$AUTOCONF || exit 1 -$AUTOMAKE -- myMakefile || exit 1 +$ACLOCAL || Exit 1 +$AUTOCONF || Exit 1 +$AUTOMAKE -- myMakefile || Exit 1 mv myMakefile.in myMakefile.old echo '# Post-processed by post-processor 3.14.' > myMakefile.in cat myMakefile.old >> myMakefile.in -./configure || exit 1 +./configure || Exit 1 -test -f .deps/fred.Po || test -f _deps/fred.Po || exit 1 +test -f .deps/fred.Po || test -f _deps/fred.Po || Exit 1 : diff --git a/tests/ppf77.test b/tests/ppf77.test index 76a79ce02..61cbf16c1 100755 --- a/tests/ppf77.test +++ b/tests/ppf77.test @@ -17,7 +17,7 @@ # Test to make sure preprocessed F77 works. # Report from Jochen Kuepper. -. ./defs || exit 1 +. ./defs || Exit 1 cat >> configure.in << 'END' AC_PROG_F77 @@ -31,5 +31,5 @@ END : > foo.F : > q.r -$ACLOCAL || exit 1 +$ACLOCAL || Exit 1 $AUTOMAKE diff --git a/tests/pr2.test b/tests/pr2.test index df08ac5b1..cc4fbbdcf 100755 --- a/tests/pr2.test +++ b/tests/pr2.test @@ -17,7 +17,7 @@ # Test for bug reported in PR 2. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/pr204.test b/tests/pr204.test index 8aab3405a..19a0ef657 100755 --- a/tests/pr204.test +++ b/tests/pr204.test @@ -18,7 +18,7 @@ # Sources derived from nodist_ sources should not be distributed. required='bison gcc' -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/pr211.test b/tests/pr211.test index 975744e66..9dd6e1f4a 100755 --- a/tests/pr211.test +++ b/tests/pr211.test @@ -17,7 +17,7 @@ # Test for PR 211. required=libtoolize -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/pr220.test b/tests/pr220.test index c83cc7686..137436766 100755 --- a/tests/pr220.test +++ b/tests/pr220.test @@ -17,7 +17,7 @@ # Test for PR automake/220. required=gcc -. ./defs || exit 1 +. ./defs || Exit 1 set -e @@ -55,6 +55,6 @@ $AUTOMAKE -a cd build # configure should fail since we've done something invalid. -../configure 2>stderr && exit 1 +../configure 2>stderr && Exit 1 cat stderr grep NEVER_TRUE stderr diff --git a/tests/pr224.test b/tests/pr224.test index 7a401e3d4..5609c824f 100755 --- a/tests/pr224.test +++ b/tests/pr224.test @@ -17,7 +17,7 @@ # Test for $(top_srcdir) with dependencies. required=gcc -. ./defs || exit 1 +. ./defs || Exit 1 mkdir foo @@ -56,5 +56,5 @@ $MAKE test -d foo/.deps $MAKE distclean -test -d foo/.deps && exit 1 +test -d foo/.deps && Exit 1 : diff --git a/tests/pr229.test b/tests/pr229.test index 82f4208aa..c9ce9d578 100755 --- a/tests/pr229.test +++ b/tests/pr229.test @@ -17,7 +17,7 @@ # Make sure AC_CYGWIN requires config.{sub,guess}. # Reported by James Youngman. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/pr243.test b/tests/pr243.test index f4fc9c125..1a66e8e9a 100755 --- a/tests/pr243.test +++ b/tests/pr243.test @@ -16,7 +16,7 @@ # Test for PR 243. -. ./defs || exit 1 +. ./defs || Exit 1 cat > configure.in << 'END' AC_INIT(foo, 0.1, dev@null) @@ -37,9 +37,9 @@ noinst_PROGRAMS = fxmisc fxmisc_SOURCES = fx64.c fximg.c fxos.c linutil.c END -$ACLOCAL || exit 1 -$AUTOMAKE || exit 1 -$AUTOCONF || exit 1 -./configure || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE || Exit 1 +$AUTOCONF || Exit 1 +./configure || Exit 1 test -f .deps/fx64.Po diff --git a/tests/pr266.test b/tests/pr266.test index 5d0b417c1..e3fd58291 100755 --- a/tests/pr266.test +++ b/tests/pr266.test @@ -16,7 +16,7 @@ # Test for PR 266. -. ./defs || exit 1 +. ./defs || Exit 1 cat > configure.in << 'END' AC_INIT(foo, 0.1, dev@null) @@ -35,9 +35,9 @@ noinst_PROGRAMS = fxmisc fxmisc_SOURCES = fx64.c fximg.c fxos.c linutil.c END -$ACLOCAL || exit 1 -$AUTOMAKE || exit 1 -$AUTOCONF || exit 1 -./configure || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE || Exit 1 +$AUTOCONF || Exit 1 +./configure || Exit 1 test -f .deps/fx64.Po diff --git a/tests/pr279-2.test b/tests/pr279-2.test index 31a222496..3820574e6 100755 --- a/tests/pr279-2.test +++ b/tests/pr279-2.test @@ -16,7 +16,7 @@ # Another test related to PR 279. -. ./defs || exit 1 +. ./defs || Exit 1 cat > configure.in << 'END' AC_INIT(foo, 0.1, dev@null) @@ -39,8 +39,8 @@ endif bin_PROGRAMS = foo END -$ACLOCAL || exit 1 -$AUTOMAKE || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE || Exit 1 -grep '@foo_DEPENDENCIES = zardoz' Makefile.in || exit 1 -grep '@foo_DEPENDENCIES = maude' Makefile.in || exit 1 +grep '@foo_DEPENDENCIES = zardoz' Makefile.in || Exit 1 +grep '@foo_DEPENDENCIES = maude' Makefile.in || Exit 1 diff --git a/tests/pr279.test b/tests/pr279.test index 3be46e1d9..6a062dc74 100755 --- a/tests/pr279.test +++ b/tests/pr279.test @@ -16,7 +16,7 @@ # Test for PR 279. -. ./defs || exit 1 +. ./defs || Exit 1 cat > configure.in << 'END' AC_INIT(foo, 0.1, dev@null) @@ -41,5 +41,5 @@ foo_LDADD = ${xtralib} foo_DEPENDENCIES = END -$ACLOCAL || exit 1 +$ACLOCAL || Exit 1 $AUTOMAKE diff --git a/tests/pr287.test b/tests/pr287.test index 4e9679fca..1055921ab 100755 --- a/tests/pr287.test +++ b/tests/pr287.test @@ -16,7 +16,7 @@ # Test for PR 287: empty SUBDIRS. -. ./defs || exit 1 +. ./defs || Exit 1 cat > configure.in << 'END' AC_INIT(foo, 0.1, dev@null) diff --git a/tests/pr300-lib.test b/tests/pr300-lib.test index b6f0c0319..d813437e0 100755 --- a/tests/pr300-lib.test +++ b/tests/pr300-lib.test @@ -18,7 +18,7 @@ # PR/300 required=gcc -. ./defs || exit 1 +. ./defs || Exit 1 set -e @@ -59,8 +59,8 @@ test -f inst/lib/subdir/libb.a $MAKE uninstall -test -f inst/lib/liba.a && exit 1 -test -f inst/lib/subdir/libb.a && exit 1 +test -f inst/lib/liba.a && Exit 1 +test -f inst/lib/subdir/libb.a && Exit 1 $MAKE install-strip diff --git a/tests/pr300-ltlib.test b/tests/pr300-ltlib.test index aef79eb5a..c864d44a7 100755 --- a/tests/pr300-ltlib.test +++ b/tests/pr300-ltlib.test @@ -18,7 +18,7 @@ # PR/300 required='libtoolize gcc' -. ./defs || exit 1 +. ./defs || Exit 1 set -e @@ -60,8 +60,8 @@ test -f inst/lib/subdir/libb.la $MAKE uninstall -test -f inst/lib/liba.la && exit 1 -test -f inst/lib/subdir/libb.la && exit 1 +test -f inst/lib/liba.la && Exit 1 +test -f inst/lib/subdir/libb.la && Exit 1 $MAKE install-strip diff --git a/tests/pr300-prog.test b/tests/pr300-prog.test index 749860ee8..dd72448cb 100755 --- a/tests/pr300-prog.test +++ b/tests/pr300-prog.test @@ -18,7 +18,7 @@ # PR/300 required=gcc -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/pr307.test b/tests/pr307.test index f44628309..b3b35ee76 100755 --- a/tests/pr307.test +++ b/tests/pr307.test @@ -19,7 +19,7 @@ # (Also exercises check_LTLIBRARIES.) required='libtoolize gcc' -. ./defs || exit 1 +. ./defs || Exit 1 cat >> configure.in << 'END' AC_PROG_CC @@ -62,7 +62,7 @@ grep am_cv_CC_dependencies_compiler_type configure ./configure am_cv_CC_dependencies_compiler_type=dashmstdout $MAKE -test -f librace.la && exit 1 +test -f librace.la && Exit 1 $MAKE check # The failure we check usually occurs during the above build, diff --git a/tests/pr401.test b/tests/pr401.test index 6e66bf049..008c277e7 100755 --- a/tests/pr401.test +++ b/tests/pr401.test @@ -18,7 +18,7 @@ # (pr401b.test and pr401c.test do the same for LTLIBOBJS and ALLOCA) required=gcc -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/pr401b.test b/tests/pr401b.test index 8abfc2e25..81198186d 100755 --- a/tests/pr401b.test +++ b/tests/pr401b.test @@ -18,7 +18,7 @@ # (pr401.test and pr401c.test do the same for LIBOBJS and ALLOCA) required='gcc libtoolize' -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/pr401c.test b/tests/pr401c.test index 406e5859f..cfb6813f7 100755 --- a/tests/pr401c.test +++ b/tests/pr401c.test @@ -18,7 +18,7 @@ # (pr401.test and pr401b.test do the same for LIBOBJS and LTLIBOBJS) required=gcc -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/pr72.test b/tests/pr72.test index dee9de1bc..804694b13 100755 --- a/tests/pr72.test +++ b/tests/pr72.test @@ -16,7 +16,7 @@ # Test for PR 72 required=libtool -. ./defs || exit 1 +. ./defs || Exit 1 cat >> configure.in << 'END' AC_PROG_CC @@ -34,7 +34,7 @@ END : > config.guess : > config.sub -$ACLOCAL || exit 1 -$AUTOMAKE || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE || Exit 1 grep '^LINK ' Makefile.in diff --git a/tests/pr87.test b/tests/pr87.test index 3b4be145f..a656e0630 100755 --- a/tests/pr87.test +++ b/tests/pr87.test @@ -17,7 +17,7 @@ # Test for PR automake/87. required=gcc -. ./defs || exit 1 +. ./defs || Exit 1 subdirs="foo bar" @@ -53,19 +53,19 @@ mkdir build # Linux boxes (Red Hat 5.1 in particular). $ACLOCAL \ && $AUTOCONF \ - && $AUTOMAKE -a || exit 1 + && $AUTOMAKE -a || Exit 1 # Regression test for bug where `.c.o:' is followed by blank line. (while read line; do if test "$line" = ".c.o:"; then read next if test -z "$next"; then - exit 1 + Exit 1 fi break fi - done) < foo/Makefile.in || exit 1 + done) < foo/Makefile.in || Exit 1 cd build \ && ../configure \ - && $MAKE distcheck || exit 1 + && $MAKE distcheck || Exit 1 diff --git a/tests/pr9.test b/tests/pr9.test index 47c44d4e1..fa72ad1ec 100755 --- a/tests/pr9.test +++ b/tests/pr9.test @@ -17,7 +17,7 @@ # Test for bug in PR 9. required=gzip -. ./defs || exit 1 +. ./defs || Exit 1 cat > configure.in << 'END' AC_INIT(Makefile.am) @@ -30,14 +30,14 @@ END mkdir support -$ACLOCAL || exit 1 +$ACLOCAL || Exit 1 -$AUTOCONF || exit 1 -$AUTOMAKE -a -c || exit 1 -./configure || exit 1 -$MAKE || exit 1 -$MAKE distcheck || exit 1 +$AUTOCONF || Exit 1 +$AUTOMAKE -a -c || Exit 1 +./configure || Exit 1 +$MAKE || Exit 1 +$MAKE distcheck || Exit 1 -gunzip pr9-0.tar.gz || exit 1 +gunzip pr9-0.tar.gz || Exit 1 tar tf pr9-0.tar | $FGREP support diff --git a/tests/prefix.test b/tests/prefix.test index d6a2d7418..8e23d47cf 100755 --- a/tests/prefix.test +++ b/tests/prefix.test @@ -16,7 +16,7 @@ # Test to make sure range of prefixes can be extended -. ./defs || exit 1 +. ./defs || Exit 1 cat >> configure.in << 'END' AC_PROG_CC @@ -27,5 +27,5 @@ bnidir = $(prefix)/bni bni_PROGRAMS = zardoz EOF -$ACLOCAL || exit 1 +$ACLOCAL || Exit 1 $AUTOMAKE diff --git a/tests/primary.test b/tests/primary.test index 5357a1b44..e00b31137 100755 --- a/tests/primary.test +++ b/tests/primary.test @@ -16,7 +16,7 @@ # Test to make sure errors in am_install_var work. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/primary2.test b/tests/primary2.test index 2cc8e76e5..f22e87de8 100755 --- a/tests/primary2.test +++ b/tests/primary2.test @@ -16,7 +16,7 @@ # Test to make sure errors in am_install_var work. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/primary3.test b/tests/primary3.test index 9bb73e376..fdb28c905 100755 --- a/tests/primary3.test +++ b/tests/primary3.test @@ -17,7 +17,7 @@ # Make sure we can build programs ending in `.la' required=gcc -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/proginst.test b/tests/proginst.test index 534bbcd72..9d7a4d746 100755 --- a/tests/proginst.test +++ b/tests/proginst.test @@ -17,11 +17,11 @@ # Test for bug where when multiple scripts are installed, # the check for AC_PROG_INSTALL fails. -. ./defs || exit 1 +. ./defs || Exit 1 cat > Makefile.am << 'END' bin_SCRIPTS = zardoz qbert brownie END -$ACLOCAL || exit 1 +$ACLOCAL || Exit 1 $AUTOMAKE diff --git a/tests/python.test b/tests/python.test index db8290db7..e690a8b73 100755 --- a/tests/python.test +++ b/tests/python.test @@ -16,7 +16,7 @@ # Test to make sure py_compile is defined. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/python10.test b/tests/python10.test index aa808db05..1bfd4da35 100755 --- a/tests/python10.test +++ b/tests/python10.test @@ -17,7 +17,7 @@ # Test _PYTHON with conditionals. required=python -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/python11.test b/tests/python11.test index 32b900046..fb0eeb6f2 100755 --- a/tests/python11.test +++ b/tests/python11.test @@ -17,7 +17,7 @@ # Test missing python. # Python is not required for this test. -. ./defs || exit 1 +. ./defs || Exit 1 set -e @@ -35,7 +35,7 @@ EOF $ACLOCAL $AUTOCONF -./configure >stdout 2>stderr && exit 1 +./configure >stdout 2>stderr && Exit 1 cat stdout cat stderr grep 'checking for IShouldNotExist1' stdout @@ -50,6 +50,6 @@ $AUTOCONF ./configure # Any user setting should be used. -./configure PYTHON=foo >stdout && exit 1 +./configure PYTHON=foo >stdout && Exit 1 cat stdout grep 'PYTHON = foo' stdout diff --git a/tests/python12.test b/tests/python12.test index 8617d76c1..0f57d028f 100755 --- a/tests/python12.test +++ b/tests/python12.test @@ -17,7 +17,7 @@ # Ensure DESTDIR is not included in byte-compiled files. required=python -. ./defs || exit 1 +. ./defs || Exit 1 set -e @@ -53,6 +53,6 @@ test -f "$instdir/usr/share/my/my.pyo" # If DESTDIR has made it into the byte compiled files, fail the test $FGREP "$instdir" "$instdir/usr/share/my/my.pyo" \ - "$instdir/usr/share/my/my.pyc" && exit 1 + "$instdir/usr/share/my/my.pyc" && Exit 1 : diff --git a/tests/python2.test b/tests/python2.test index cca0620a4..3156f4df3 100755 --- a/tests/python2.test +++ b/tests/python2.test @@ -16,7 +16,7 @@ # Make sure that Automake suggests using AM_PATH_PYTHON. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/python3.test b/tests/python3.test index 1b3be2754..5e299c772 100755 --- a/tests/python3.test +++ b/tests/python3.test @@ -17,7 +17,7 @@ # Make sure we install built python files. required=python -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/python4.test b/tests/python4.test index 914f71b19..3fad96ab6 100755 --- a/tests/python4.test +++ b/tests/python4.test @@ -17,7 +17,7 @@ # Test detection of missing Python. # Python is not required for this test. -. ./defs || exit 1 +. ./defs || Exit 1 set -e @@ -33,6 +33,6 @@ $AUTOCONF $AUTOMAKE --add-missing # Simulate no Python -./configure PYTHON=: 2>stderr && exit 1 +./configure PYTHON=: 2>stderr && Exit 1 cat stderr grep 'no suitable Python interpreter found' stderr diff --git a/tests/python5.test b/tests/python5.test index f7dfe4280..6f789152f 100755 --- a/tests/python5.test +++ b/tests/python5.test @@ -18,7 +18,7 @@ # Same as python4.test, but requiring a version. # Python is not required for this test. -. ./defs || exit 1 +. ./defs || Exit 1 set -e @@ -34,6 +34,6 @@ $ACLOCAL $AUTOCONF $AUTOMAKE --add-missing -./configure 2>stderr && exit 1 +./configure 2>stderr && Exit 1 cat stderr grep 'no suitable Python interpreter found' stderr diff --git a/tests/python6.test b/tests/python6.test index 20a3c856d..7968692d3 100755 --- a/tests/python6.test +++ b/tests/python6.test @@ -18,7 +18,7 @@ # Same as python4.test, but using a custom ACTION-IF-NOT-FOUND. # Python is not required for this test. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/python7.test b/tests/python7.test index d696b7514..b3fb8e71c 100755 --- a/tests/python7.test +++ b/tests/python7.test @@ -18,7 +18,7 @@ # Same as python6.test, but requiring a version. # Python is not required for this test. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/python8.test b/tests/python8.test index f17b6f6d3..902a6d270 100755 --- a/tests/python8.test +++ b/tests/python8.test @@ -17,7 +17,7 @@ # Test ACTION-IF-TRUE in AM_PATH_PYTHON. required=python -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/python9.test b/tests/python9.test index c4a3f8536..372aa7916 100755 --- a/tests/python9.test +++ b/tests/python9.test @@ -18,7 +18,7 @@ # Same as python8.test, but requiring a version. required=python -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/recurs.test b/tests/recurs.test index 9c9ba8d38..4467aeebb 100755 --- a/tests/recurs.test +++ b/tests/recurs.test @@ -16,7 +16,7 @@ # Test to make sure recursive variable definitions die. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/recurs2.test b/tests/recurs2.test index d2362bba5..46cebd7f8 100755 --- a/tests/recurs2.test +++ b/tests/recurs2.test @@ -17,7 +17,7 @@ # Test to make sure recursive variable definitions die. # From Jim Meyering. -. ./defs || exit 1 +. ./defs || Exit 1 cat > configure.in << 'END' AC_INIT @@ -35,5 +35,5 @@ END > chgrp.1 > chgrp.x -$ACLOCAL || exit 1 +$ACLOCAL || Exit 1 $AUTOMAKE diff --git a/tests/regex.test b/tests/regex.test index dd8ea4034..43b1b15f6 100755 --- a/tests/regex.test +++ b/tests/regex.test @@ -16,7 +16,7 @@ # Make sure AM_WITH_REGEX compiles and runs. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/remake.test b/tests/remake.test index 15250fce6..2abd7f240 100755 --- a/tests/remake.test +++ b/tests/remake.test @@ -16,7 +16,7 @@ # Make sure remaking rules in subdir are correctly generated. -. ./defs || exit 1 +. ./defs || Exit 1 cat > configure.in << 'END' AC_INIT @@ -27,7 +27,7 @@ END mkdir sub : > sub/Makefile.am -$ACLOCAL || exit 1 -$AUTOMAKE || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE || Exit 1 grep '^Makefile' sub/Makefile.in diff --git a/tests/remake2.test b/tests/remake2.test index 2c87edce1..649ca49ee 100755 --- a/tests/remake2.test +++ b/tests/remake2.test @@ -16,7 +16,7 @@ # Make sure remaking rules in subdir are correct. -. ./defs || exit 1 +. ./defs || Exit 1 cat > configure.in << 'END' AC_INIT @@ -27,7 +27,7 @@ END mkdir sub : > sub/Makefile.am -$ACLOCAL || exit 1 -$AUTOMAKE || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE || Exit 1 grep 'AUTOMAKE.*sub/Makefile' sub/Makefile.in diff --git a/tests/remake3.test b/tests/remake3.test index 2c1340b73..92912f8f2 100755 --- a/tests/remake3.test +++ b/tests/remake3.test @@ -16,7 +16,7 @@ # Make sure remaking rules work when there is no subdir Makefile. -. ./defs || exit 1 +. ./defs || Exit 1 cat > configure.in << 'END' AC_INIT @@ -29,7 +29,7 @@ END mkdir sub : > sub/foo.in -$ACLOCAL || exit 1 -$AUTOMAKE || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE || Exit 1 grep '^sub/foo' Makefile.in diff --git a/tests/remake4.test b/tests/remake4.test index 8338b77d0..9031c7025 100755 --- a/tests/remake4.test +++ b/tests/remake4.test @@ -25,7 +25,7 @@ # # Report from Akim Demaille. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/remake5.test b/tests/remake5.test index a98da501c..847c549c3 100755 --- a/tests/remake5.test +++ b/tests/remake5.test @@ -19,7 +19,7 @@ # Report from Ralf Corsepius. required=GNUmake -. ./defs || exit 1 +. ./defs || Exit 1 set -e @@ -62,7 +62,7 @@ grep 'AUTOCONF.*=.*false' Makefile : > rebuild_ok ./configure --no-create $MAKE -grep 'AUTOCONF.*=.*false' Makefile && exit 1 +grep 'AUTOCONF.*=.*false' Makefile && Exit 1 # Make sure rebuild rules do work if --enable-maintainer-mode is given. ./configure --enable-maintainer-mode diff --git a/tests/remake6.test b/tests/remake6.test index b94dda393..a1b9fbeb5 100755 --- a/tests/remake6.test +++ b/tests/remake6.test @@ -16,7 +16,7 @@ # Make sure remaking rules work when subdir Makefile.in has been removed. -. ./defs || exit 1 +. ./defs || Exit 1 set -e cat > configure.in << 'END' diff --git a/tests/remake7.test b/tests/remake7.test index 720728560..2752c26e5 100755 --- a/tests/remake7.test +++ b/tests/remake7.test @@ -16,7 +16,7 @@ # Make sure remaking rules fail when they should. -. ./defs || exit 1 +. ./defs || Exit 1 set -e cat > configure.in << 'END' @@ -42,29 +42,29 @@ $sleep # Fail for broken input files. echo "if FOO" > sub/Makefile.am -$MAKE && exit 1 +$MAKE && Exit 1 : >sub/Makefile.am $MAKE mv Makefile.am backup echo "if FOO" > Makefile.am -$MAKE && exit 1 +$MAKE && Exit 1 # Fail for missing input files, with or without missing # Makefile.in files. cp backup Makefile.am mv sub/Makefile.am sub/backup -$MAKE && exit 1 +$MAKE && Exit 1 rm -f sub/Makefile.in -$MAKE && exit 1 +$MAKE && Exit 1 mv sub/backup sub/Makefile.am rm -f Makefile.am -$MAKE && exit 1 +$MAKE && Exit 1 rm -f Makefile.in -$MAKE && exit 1 +$MAKE && Exit 1 : diff --git a/tests/req.test b/tests/req.test index 43640b29b..4008ae0f9 100755 --- a/tests/req.test +++ b/tests/req.test @@ -16,7 +16,7 @@ # Test to make sure macro used in m4 file is included. -. ./defs || exit 1 +. ./defs || Exit 1 cat > configure.in <<EOF AC_INIT @@ -32,6 +32,6 @@ module=[$1] AC_SUBST(module)]) END -$ACLOCAL || exit 1 +$ACLOCAL || Exit 1 grep 'DEFUN.*INIT_AUTOMAKE' aclocal.m4 diff --git a/tests/reqd.test b/tests/reqd.test index ac3ce3429..f2880b1e5 100755 --- a/tests/reqd.test +++ b/tests/reqd.test @@ -17,7 +17,7 @@ # Make sure Automake will install several copies of required files if needed. # Reported by Marius Vollmer. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/reqd2.test b/tests/reqd2.test index ccabd672b..0c64ce117 100755 --- a/tests/reqd2.test +++ b/tests/reqd2.test @@ -19,7 +19,7 @@ # to fix the Makefiles.) required='libtoolize' -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/rulepat.test b/tests/rulepat.test index 7ce088ba8..d38592f0f 100755 --- a/tests/rulepat.test +++ b/tests/rulepat.test @@ -16,13 +16,13 @@ # Test to make sure RULE_PATTERN catches strange targets. -. ./defs || exit 1 +. ./defs || Exit 1 cat > Makefile.am << 'END' $(srcdir)/Makefile.am: END -$ACLOCAL || exit 1 -$AUTOMAKE || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE || Exit 1 grep '^$(srcdir)/Makefile\.am' Makefile.in diff --git a/tests/scripts.test b/tests/scripts.test index 47b238504..d749a1894 100755 --- a/tests/scripts.test +++ b/tests/scripts.test @@ -17,7 +17,7 @@ # Test for bug reported by Jim Meyering. # AC_PROG_INSTALL was required when only noinst_SCRIPTS was defined. -. ./defs || exit 1 +. ./defs || Exit 1 cat > configure.in << 'END' AC_INIT @@ -29,5 +29,5 @@ cat > Makefile.am << 'END' noinst_SCRIPTS = foo END -$ACLOCAL || exit 1 +$ACLOCAL || Exit 1 $AUTOMAKE diff --git a/tests/seenc.test b/tests/seenc.test index 9062d041b..8a6f157d2 100755 --- a/tests/seenc.test +++ b/tests/seenc.test @@ -16,7 +16,7 @@ # Test to make sure C-but-not-CC error works. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/sinclude.test b/tests/sinclude.test index 9a47bee5d..6b614fa31 100755 --- a/tests/sinclude.test +++ b/tests/sinclude.test @@ -16,7 +16,7 @@ # Test to see if `m4_sinclude' and `m4_include' works. -. ./defs || exit 1 +. ./defs || Exit 1 set -e @@ -55,7 +55,7 @@ echo 'm4_include(sub/h.m4)' >> aclocal.m4 $AUTOMAKE -grep doesntexist Makefile.in && exit 1 +grep doesntexist Makefile.in && Exit 1 grep MAGICALPIG Makefile.in grep MAGICALHOG Makefile.in grep GREPME Makefile.in diff --git a/tests/space.test b/tests/space.test index 482d295de..a8d366017 100755 --- a/tests/space.test +++ b/tests/space.test @@ -16,7 +16,7 @@ # Test leading space on macro assignment. -. ./defs || exit 1 +. ./defs || Exit 1 echo AC_PROG_CC >> configure.in @@ -25,5 +25,5 @@ cat > Makefile.am << 'END' foo_SOURCES = foo.c END -$ACLOCAL || exit 1 +$ACLOCAL || Exit 1 $AUTOMAKE diff --git a/tests/specflg.test b/tests/specflg.test index 664b8f739..388af2219 100755 --- a/tests/specflg.test +++ b/tests/specflg.test @@ -16,7 +16,7 @@ # Test of flags specific to executable. -. ./defs || exit 1 +. ./defs || Exit 1 set -e @@ -42,12 +42,12 @@ grep 'required.*compile' stderr $AUTOMAKE # Look for $(COMPILE) -c in .c.o rule. -grep 'COMPILE. [^-]' Makefile.in && exit 1 +grep 'COMPILE. [^-]' Makefile.in && Exit 1 # Look for foo-foo.o. -grep '[^-]foo\.o' Makefile.in && exit 1 +grep '[^-]foo\.o' Makefile.in && Exit 1 # Regression test for missing space. -$FGREP ')-c' Makefile.in && exit 1 +$FGREP ')-c' Makefile.in && Exit 1 -exit 0 +Exit 0 diff --git a/tests/specflg2.test b/tests/specflg2.test index 203912649..71208da98 100755 --- a/tests/specflg2.test +++ b/tests/specflg2.test @@ -16,7 +16,7 @@ # Test library-specific flags. -. ./defs || exit 1 +. ./defs || Exit 1 set -e @@ -45,14 +45,14 @@ grep 'required.*compile' stderr $AUTOMAKE # Look for $(COMPILE) -c in .c.o rule. -grep 'COMPILE. [^-]' Makefile.in && exit 1 +grep 'COMPILE. [^-]' Makefile.in && Exit 1 # Look for libfoo_a-foo.o. grep foo Makefile.in -grep '[^-]foo\.o' Makefile.in && exit 1 +grep '[^-]foo\.o' Makefile.in && Exit 1 # Look for libfoo_a-bar.o. grep bar Makefile.in -grep '[^-]bar\.o' Makefile.in && exit 1 +grep '[^-]bar\.o' Makefile.in && Exit 1 -exit 0 +Exit 0 diff --git a/tests/specflg3.test b/tests/specflg3.test index 68fccd6fd..e49e54ed9 100755 --- a/tests/specflg3.test +++ b/tests/specflg3.test @@ -16,7 +16,7 @@ # Test exe-specific flags with dependency tracking. -. ./defs || exit 1 +. ./defs || Exit 1 cat > configure.in << 'END' AC_INIT @@ -35,14 +35,14 @@ END : > compile -$ACLOCAL || exit 1 -$AUTOMAKE || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE || Exit 1 -$FGREP -e '-o foo-foo' Makefile.in || exit 1 +$FGREP -e '-o foo-foo' Makefile.in || Exit 1 -$FGREP 'foo.o.o' Makefile.in && exit 1 -$FGREP 'foo.$(OBJEXT).$(OBJEXT)' Makefile.in && exit 1 +$FGREP 'foo.o.o' Makefile.in && Exit 1 +$FGREP 'foo.$(OBJEXT).$(OBJEXT)' Makefile.in && Exit 1 -$FGREP '$(foo_CFLAGS)' Makefile.in || exit 1 +$FGREP '$(foo_CFLAGS)' Makefile.in || Exit 1 -exit 0 +Exit 0 diff --git a/tests/specflg6.test b/tests/specflg6.test index 5e974e5c8..d7b993834 100755 --- a/tests/specflg6.test +++ b/tests/specflg6.test @@ -18,7 +18,7 @@ # conditionals are present. # From Richard Boulton -. ./defs || exit 1 +. ./defs || Exit 1 cat >> configure.in << 'END' AC_PROG_CC @@ -38,8 +38,8 @@ END : > compile -$ACLOCAL || exit 1 -$AUTOMAKE || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE || Exit 1 uncondval=`$FGREP 'foo-foo.o: foo.c' Makefile.in` @@ -47,7 +47,7 @@ cat >> Makefile.am << 'END' foo_SOURCES += $(BAR_SRCS) END -$AUTOMAKE || exit 1 +$AUTOMAKE || Exit 1 condval=`$FGREP 'foo-foo.o: foo.c' Makefile.in` diff --git a/tests/specflg7.test b/tests/specflg7.test index f3b0491ec..b652a5a49 100755 --- a/tests/specflg7.test +++ b/tests/specflg7.test @@ -17,7 +17,7 @@ # The true/false example from the manual, plus a check for _SHORTNAME. required=gcc -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/specflg8.test b/tests/specflg8.test index 8153afbf9..cb913fb60 100755 --- a/tests/specflg8.test +++ b/tests/specflg8.test @@ -19,7 +19,7 @@ # use of _CPPFLAGS (PR/337). required=gcc -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/specflg9.test b/tests/specflg9.test index 49bda8901..9f83356fd 100755 --- a/tests/specflg9.test +++ b/tests/specflg9.test @@ -16,7 +16,7 @@ # Another check for per-target flag substitutions. -. ./defs || exit 1 +. ./defs || Exit 1 set -e @@ -38,10 +38,10 @@ $AUTOMAKE --add-missing $FGREP '$(AM_CFLAGS)' Makefile.in -$FGREP '$(zzfoo_CFLAGS)' Makefile.in && exit 1 -$FGREP '$(zzfoo_CPPFLAGS)' Makefile.in && exit 1 +$FGREP '$(zzfoo_CFLAGS)' Makefile.in && Exit 1 +$FGREP '$(zzfoo_CPPFLAGS)' Makefile.in && Exit 1 -$FGREP '$(zzbar_CFLAGS)' Makefile.in && exit 1 +$FGREP '$(zzbar_CFLAGS)' Makefile.in && Exit 1 $FGREP '$(zzbar_CPPFLAGS)' Makefile.in : diff --git a/tests/spell.test b/tests/spell.test index eeceac527..6ec30ba59 100755 --- a/tests/spell.test +++ b/tests/spell.test @@ -16,7 +16,7 @@ # Test to make sure misspellings in _SOURCES variables cause failure. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/spell2.test b/tests/spell2.test index 438b1a2a4..0caf39d7d 100755 --- a/tests/spell2.test +++ b/tests/spell2.test @@ -16,7 +16,7 @@ # Test to make sure misspellings in _SOURCES variables cause failure. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/spell3.test b/tests/spell3.test index 81fbaf21d..9910a259c 100755 --- a/tests/spell3.test +++ b/tests/spell3.test @@ -17,7 +17,7 @@ # Test to make sure some internal _DEPENDENCIES variables don't cause # errors. -. ./defs || exit 1 +. ./defs || Exit 1 cat > Makefile.am << 'END' TAGS_DEPENDENCIES = joe @@ -25,5 +25,5 @@ TAGS_DEPENDENCIES = joe ETAGS_ARGS = joe END -$ACLOCAL || exit 1 +$ACLOCAL || Exit 1 $AUTOMAKE diff --git a/tests/spelling.test b/tests/spelling.test index 7280f9edf..292d05e5b 100755 --- a/tests/spelling.test +++ b/tests/spelling.test @@ -16,14 +16,14 @@ # Test to make sure that misspelled prefixes actually cause error. -. ./defs || exit 1 +. ./defs || Exit 1 cat > Makefile.am << 'EOF' bni_PROGRAMS = zot EOF -if $ACLOCAL || exit 1 +if $ACLOCAL || Exit 1 $AUTOMAKE; then - exit 1 + Exit 1 fi -exit 0 +Exit 0 diff --git a/tests/spy.test b/tests/spy.test index 06acde0ca..ac714aae3 100755 --- a/tests/spy.test +++ b/tests/spy.test @@ -67,7 +67,7 @@ # So it seems only non-overlapping ::-rule may be portable. This is # what we check now. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/srcsub.test b/tests/srcsub.test index 98dc7ae92..dada60faa 100755 --- a/tests/srcsub.test +++ b/tests/srcsub.test @@ -16,7 +16,7 @@ # Test to make sure config sub in _SOURCES fails. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/srcsub2.test b/tests/srcsub2.test index abb886e43..014a30a78 100755 --- a/tests/srcsub2.test +++ b/tests/srcsub2.test @@ -16,7 +16,7 @@ # Test to make sure config sub in _SOURCES fails. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/stamph2.test b/tests/stamph2.test index 0dfd8e7a5..dfcc665ff 100755 --- a/tests/stamph2.test +++ b/tests/stamph2.test @@ -15,7 +15,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # Make sure stamp-h* files are created where we expect -. ./defs || exit 1 +. ./defs || Exit 1 set -e @@ -68,4 +68,4 @@ test ! -f sdir1/stamp-h5 test ! -f sdir1/stamp-h6 test -f sdir1/stamp-h7 -exit 0 +Exit 0 diff --git a/tests/stdinc.test b/tests/stdinc.test index 48426bbc5..a8ed6a581 100755 --- a/tests/stdinc.test +++ b/tests/stdinc.test @@ -17,7 +17,7 @@ # Test to make sure the standard include order is stable. # Report by Kent Boortz. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/stdlib.test b/tests/stdlib.test index c84331e59..92a14dafe 100755 --- a/tests/stdlib.test +++ b/tests/stdlib.test @@ -16,7 +16,7 @@ # Test "not a standard library" error. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/stdlib2.test b/tests/stdlib2.test index db7efb4b6..dc27f3650 100755 --- a/tests/stdlib2.test +++ b/tests/stdlib2.test @@ -17,7 +17,7 @@ # Check for AM_LDFLAGS = -module # Report from Kevin P. Fleming. required=libtool -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/strip.test b/tests/strip.test index 4e962c314..ddaab7664 100755 --- a/tests/strip.test +++ b/tests/strip.test @@ -16,7 +16,7 @@ # Test for install-strip. -. ./defs || exit 1 +. ./defs || Exit 1 cat > configure.in << 'END' AC_INIT(foo, 0.1, dev@null) diff --git a/tests/subcond.test b/tests/subcond.test index d24a00111..0e1bedbaf 100755 --- a/tests/subcond.test +++ b/tests/subcond.test @@ -16,7 +16,7 @@ # It is ok to have a conditional SUBDIRS when using gettext. required=gettext -. ./defs || exit 1 +. ./defs || Exit 1 cat >> configure.in << 'END' AM_GNU_GETTEXT @@ -36,6 +36,6 @@ SUBDIRS = endif END -$ACLOCAL || exit 1 +$ACLOCAL || Exit 1 # Gettext wants config.guess etc. $AUTOMAKE --add-missing diff --git a/tests/subcond2.test b/tests/subcond2.test index ce8edab0c..b2f58b748 100755 --- a/tests/subcond2.test +++ b/tests/subcond2.test @@ -18,7 +18,7 @@ # SUBDIRS + AM_CONDITIONAL setup from the manual. # Lots of lines here are duplicated in subcond3.test. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/subcond3.test b/tests/subcond3.test index e63a4619c..3b7f50160 100755 --- a/tests/subcond3.test +++ b/tests/subcond3.test @@ -18,7 +18,7 @@ # SUBDIRS + AC_SUBST setup from the manual. # Lots of lines here are duplicated in subcond2.test. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/subdir.test b/tests/subdir.test index d9480197b..772d52454 100755 --- a/tests/subdir.test +++ b/tests/subdir.test @@ -17,7 +17,7 @@ # Test to make sure install-sh and mkinstalldirs correctly found in # subdirs. -. ./defs || exit 1 +. ./defs || Exit 1 mkdir zot @@ -35,5 +35,5 @@ cat > zot/Makefile.am << 'END' pkgdata_DATA = END -$ACLOCAL || exit 1 +$ACLOCAL || Exit 1 $AUTOMAKE diff --git a/tests/subdir2.test b/tests/subdir2.test index f0cafac38..cfd42e8f0 100755 --- a/tests/subdir2.test +++ b/tests/subdir2.test @@ -16,7 +16,7 @@ # Test to make sure sub-sub-dirs work correctly. -. ./defs || exit 1 +. ./defs || Exit 1 mkdir one mkdir one/two @@ -47,5 +47,5 @@ cat > one/two/Makefile.am << 'END' pkgdata_DATA = END -$ACLOCAL || exit 1 +$ACLOCAL || Exit 1 $AUTOMAKE --gnu diff --git a/tests/subdir3.test b/tests/subdir3.test index 5ae4c4286..eb67afc8d 100755 --- a/tests/subdir3.test +++ b/tests/subdir3.test @@ -16,7 +16,7 @@ # Test to make sure subdir source file generates explicit dependency. -. ./defs || exit 1 +. ./defs || Exit 1 cat > Makefile.am << 'END' bin_PROGRAMS = zardoz widdershins @@ -33,7 +33,7 @@ mkdir x : > y.c : > x/z.c -$ACLOCAL || exit 1 -$AUTOMAKE || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE || Exit 1 grep '^z\.o: x/z\.c$' Makefile.in diff --git a/tests/subdir4.test b/tests/subdir4.test index 66649b50f..c0a541306 100755 --- a/tests/subdir4.test +++ b/tests/subdir4.test @@ -17,7 +17,7 @@ # Make sure a top-level depcomp file is found when # AC_CONFIG_AUX_DIR is not specified. -. ./defs || exit 1 +. ./defs || Exit 1 mkdir lib src @@ -55,14 +55,14 @@ cat > src/Makefile.am << 'END' pkgdata_DATA = END -$ACLOCAL || exit 1 -$AUTOMAKE --gnu || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE --gnu || Exit 1 # Make sure that depcomp is *not* included in the definition # of DIST_COMMON in lib/Makefile.in. If you change this test # so that more files are included in lib's DIST_COMMON definition, # then you must handle the case in which depcomp is listed on a # continued line. -grep '^DIST_COMMON.*depcomp' lib/Makefile.in && exit 1 +grep '^DIST_COMMON.*depcomp' lib/Makefile.in && Exit 1 -exit 0 +Exit 0 diff --git a/tests/subdir5.test b/tests/subdir5.test index b17f8c8bb..bcf488354 100755 --- a/tests/subdir5.test +++ b/tests/subdir5.test @@ -22,7 +22,7 @@ # This test assumes that the `make' utility is able to start # over and reload Makefiles which have been remade (a non-POSIX feature). required='GNUmake gcc' -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/subdir6.test b/tests/subdir6.test index 65c6a809f..a0127c115 100755 --- a/tests/subdir6.test +++ b/tests/subdir6.test @@ -16,7 +16,7 @@ # Test to make sure config headers in subdirectories are cleaned. -. ./defs || exit 1 +. ./defs || Exit 1 set -e @@ -37,5 +37,5 @@ test -f sub/stamp-h1 $MAKE clean test -f sub/stamp-h1 $MAKE distclean -test -f sub/stamp-h1 && exit 1 +test -f sub/stamp-h1 && Exit 1 : diff --git a/tests/subdir7.test b/tests/subdir7.test index b4c00e4d6..bcb34033e 100755 --- a/tests/subdir7.test +++ b/tests/subdir7.test @@ -16,7 +16,7 @@ # Naming a subdirectory `obj/' is a bad idea. Automake should say so. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/subdir8.test b/tests/subdir8.test index 309765ffb..9ad4a5c61 100755 --- a/tests/subdir8.test +++ b/tests/subdir8.test @@ -22,7 +22,7 @@ # This test assumes that the `make' utility is able to start # over and reload Makefiles which have been remade (a non-POSIX feature). required='GNUmake gcc' -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/subdir9.test b/tests/subdir9.test index ec7a919ae..3a4878ed6 100755 --- a/tests/subdir9.test +++ b/tests/subdir9.test @@ -16,7 +16,7 @@ # Test SUDBIRS with /. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/subdirbuiltsources.test b/tests/subdirbuiltsources.test index dea36c223..3737ddbfb 100755 --- a/tests/subdirbuiltsources.test +++ b/tests/subdirbuiltsources.test @@ -18,7 +18,7 @@ # A bug occurred where subdirs do not have all-recursive or # all-recursive-am which depended on BUILT_SOURCES. -. ./defs || exit 1 +. ./defs || Exit 1 set -e @@ -71,4 +71,4 @@ $AUTOMAKE --include-deps --copy --force-missing --add-missing --gnu # $MAKE -C lib foo.h $MAKE -exit 0 +Exit 0 diff --git a/tests/subobj.test b/tests/subobj.test index a24da5539..259303a6b 100755 --- a/tests/subobj.test +++ b/tests/subobj.test @@ -16,7 +16,7 @@ # Test of subdir objects with C. -. ./defs || exit 1 +. ./defs || Exit 1 set -e @@ -39,7 +39,7 @@ grep 'install.*compile' stderr test -f compile $FGREP 'generic/a.$(OBJEXT)' Makefile.in -grep '[^/]a\.\$(OBJEXT)' Makefile.in && exit 1 +grep '[^/]a\.\$(OBJEXT)' Makefile.in && Exit 1 # Opportunistically test for a different bug. grep '^generic/b.\$(OBJEXT):.*dirstamp' Makefile.in diff --git a/tests/subobj10.test b/tests/subobj10.test index 36cae35b6..515805de3 100755 --- a/tests/subobj10.test +++ b/tests/subobj10.test @@ -17,7 +17,7 @@ # PR 492: Test asm subdir-objects. required=gcc # avoid compiler errors. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/subobj2.test b/tests/subobj2.test index a98786fb8..c96e75368 100755 --- a/tests/subobj2.test +++ b/tests/subobj2.test @@ -16,7 +16,7 @@ # Test of subdir objects with C++. -. ./defs || exit 1 +. ./defs || Exit 1 set -e @@ -34,5 +34,5 @@ $ACLOCAL $AUTOMAKE $FGREP 'generic/a.$(OBJEXT)' Makefile.in -grep '[^/]a\.\$(OBJEXT)' Makefile.in && exit 1 +grep '[^/]a\.\$(OBJEXT)' Makefile.in && Exit 1 $FGREP -e '-c -o' Makefile.in diff --git a/tests/subobj3.test b/tests/subobj3.test index 05b08a380..ac8a47041 100755 --- a/tests/subobj3.test +++ b/tests/subobj3.test @@ -18,7 +18,7 @@ # Test of subdir objects with C++. required=gcc -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/subobj4.test b/tests/subobj4.test index 25a5b50de..38b4dc6d2 100755 --- a/tests/subobj4.test +++ b/tests/subobj4.test @@ -17,7 +17,7 @@ # Make sure `../foo/foo.cpp' generates a rule. # Report from Dave Brolley. -. ./defs || exit 1 +. ./defs || Exit 1 cat >> configure.in << 'END' AC_PROG_CC @@ -43,7 +43,7 @@ END : > compile : > d2/z.c -$ACLOCAL || exit 1 -$AUTOMAKE || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE || Exit 1 grep 'CC.*z' d1/Makefile.in diff --git a/tests/subobj5.test b/tests/subobj5.test index dc0ef0c67..d2b4cbcac 100755 --- a/tests/subobj5.test +++ b/tests/subobj5.test @@ -17,7 +17,7 @@ # Test of subdir make dist rules. # From Robert Collins -. ./defs || exit 1 +. ./defs || Exit 1 cat > configure.in << 'END' AC_INIT(generic/a.c) diff --git a/tests/subobj6.test b/tests/subobj6.test index 984484c9d..a7cf59d33 100755 --- a/tests/subobj6.test +++ b/tests/subobj6.test @@ -18,7 +18,7 @@ # From Robert Collins required=gcc -. ./defs || exit 1 +. ./defs || Exit 1 cat >> configure.in << 'END' AM_PROG_CC_C_O diff --git a/tests/subobj7.test b/tests/subobj7.test index cd99f9d1d..4b89c7991 100755 --- a/tests/subobj7.test +++ b/tests/subobj7.test @@ -17,7 +17,7 @@ # Test to make sure AM_CFLAGS appears in subdir compilation rule. # Report from Steve M. Robbins. -. ./defs || exit 1 +. ./defs || Exit 1 set -e @@ -37,6 +37,6 @@ END $ACLOCAL $AUTOMAKE --add-missing -grep wish_CFLAGS Makefile.in && exit 1 +grep wish_CFLAGS Makefile.in && Exit 1 : diff --git a/tests/subobj8.test b/tests/subobj8.test index a6cf5b787..2aa0a9354 100755 --- a/tests/subobj8.test +++ b/tests/subobj8.test @@ -16,7 +16,7 @@ # Make sure `compile' is included when subdir-objects is used in a subdir. -. ./defs || exit 1 +. ./defs || Exit 1 cat > configure.in << 'END' AC_INIT(Makefile.am) @@ -39,6 +39,6 @@ bin_PROGRAMS = mumble mumble_SOURCES = bar/a.c EOF -$ACLOCAL || exit 1 -$AUTOMAKE --add-missing || exit 1 -test -f tools/compile || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE --add-missing || Exit 1 +test -f tools/compile || Exit 1 diff --git a/tests/subobj9.test b/tests/subobj9.test index e22b8041a..1275256b2 100755 --- a/tests/subobj9.test +++ b/tests/subobj9.test @@ -17,7 +17,7 @@ # Test for PR 312. required='libtoolize g++' -. ./defs || exit 1 +. ./defs || Exit 1 cat > configure.in << 'END' AC_INIT(x, 0, x) @@ -63,7 +63,7 @@ $AUTOCONF $AUTOMAKE -a # Skip this test on configure errors (e.g., broken C++ compilers). -./configure || exit 77 +./configure || Exit 77 # opportunistically check that --tag=CXX is used when supported if test -n "`./libtool --help | grep tag=TAG`"; then @@ -77,5 +77,5 @@ $MAKE $MAKE distcheck 2>&1 | tee out # GNU Make used to complain that the Makefile contained two rules # for `src/.dirstamp' and `.//src/.dirstamp'. -grep 'overriding commands' out && exit 1 +grep 'overriding commands' out && Exit 1 : diff --git a/tests/subobjname.test b/tests/subobjname.test index ddefd2ba0..c474a413b 100755 --- a/tests/subobjname.test +++ b/tests/subobjname.test @@ -18,7 +18,7 @@ # combinational explosion. (This test is named after the &subobjname # sub in Automake). -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/subpkg.test b/tests/subpkg.test index d2489e80b..aa682a948 100755 --- a/tests/subpkg.test +++ b/tests/subpkg.test @@ -17,7 +17,7 @@ # Check subpackage handling. required='gcc bison' -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/subpkg2.test b/tests/subpkg2.test index a4ff190c9..51bb32b8a 100755 --- a/tests/subpkg2.test +++ b/tests/subpkg2.test @@ -17,7 +17,7 @@ # Try a DIST_SUBDIRS subpackage with no SUBDIRS. # Report from Gary V. Vaughan. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/subpkg3.test b/tests/subpkg3.test index fd1f90b8d..3e9e824bc 100755 --- a/tests/subpkg3.test +++ b/tests/subpkg3.test @@ -16,7 +16,7 @@ # make sure different subpackages may share files and directories. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/subst.test b/tests/subst.test index 81d13f712..1dde9b81c 100755 --- a/tests/subst.test +++ b/tests/subst.test @@ -17,7 +17,7 @@ # Test that AC_SUBST($1) does something sensible. From Ulrich # Drepper. -. ./defs || exit 1 +. ./defs || Exit 1 cat >> configure.in << 'END' dnl This test used to have the following lines, which cannot have @@ -32,7 +32,7 @@ END : > Makefile.am -$ACLOCAL || exit 1 -$AUTOMAKE || exit 1 -grep '^\$1' Makefile.in && exit 1 -exit 0 +$ACLOCAL || Exit 1 +$AUTOMAKE || Exit 1 +grep '^\$1' Makefile.in && Exit 1 +Exit 0 diff --git a/tests/subst2.test b/tests/subst2.test index 77b42c123..b4f4bb977 100755 --- a/tests/subst2.test +++ b/tests/subst2.test @@ -16,7 +16,7 @@ # Make sure a multi-line definition cannot be terminated by an empty # line (when there are @substitutions@ inside). -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/subst3.test b/tests/subst3.test index b0f5b4302..2f01908a0 100755 --- a/tests/subst3.test +++ b/tests/subst3.test @@ -18,7 +18,7 @@ # Test installation with substitutions. This test is based on nobase.test. required='gcc' -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/substre2.test b/tests/substre2.test index f53cda1de..f44c820f6 100755 --- a/tests/substre2.test +++ b/tests/substre2.test @@ -18,7 +18,7 @@ # undefined variables break later substitutions. required=gcc -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/substref.test b/tests/substref.test index d7f866851..f8ded5788 100755 --- a/tests/substref.test +++ b/tests/substref.test @@ -19,7 +19,7 @@ # Report from Richard Boulton required=gcc -. ./defs || exit 1 +. ./defs || Exit 1 cat > configure.in << 'END' AC_INIT(hello.c) @@ -64,5 +64,5 @@ test "x$val" = "xdlmain.c dlmain.o" # This is unrelated to the rest of this test. But while we are # at it, make sure we don't use am__helldl_SOURCES_DIST here, since # it's not needed. DIST_SOURCES should contains $(helldl_SOURCES). -grep am__helldl_SOURCES_DIST Makefile && exit 1 +grep am__helldl_SOURCES_DIST Makefile && Exit 1 grep 'DIST_SOURCES.*\(helldl_SOURCES\)' Makefile diff --git a/tests/substtarg.test b/tests/substtarg.test index c3d03dbfe..1d5c57799 100755 --- a/tests/substtarg.test +++ b/tests/substtarg.test @@ -17,7 +17,7 @@ # Test that substitutions in variables work. # From Lars J. Aas. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/suffix.test b/tests/suffix.test index 66b5e6ab6..2089fb8f8 100755 --- a/tests/suffix.test +++ b/tests/suffix.test @@ -16,7 +16,7 @@ # Make sure a suffix rule for C compilation is produced. -. ./defs || exit 1 +. ./defs || Exit 1 cat >> configure.in << 'END' AC_PROG_CC @@ -26,10 +26,10 @@ cat > Makefile.am << 'END' noinst_PROGRAMS = foo END -$ACLOCAL || exit 1 -$AUTOMAKE -i || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE -i || Exit 1 -grep '^\.c\.o' Makefile.in > /dev/null || exit 1 +grep '^\.c\.o' Makefile.in > /dev/null || Exit 1 -$AUTOMAKE || exit 1 -grep '^\.c\.o' Makefile.in > /dev/null || exit 1 +$AUTOMAKE || Exit 1 +grep '^\.c\.o' Makefile.in > /dev/null || Exit 1 diff --git a/tests/suffix10.test b/tests/suffix10.test index 3078e50fb..8f5c706f7 100755 --- a/tests/suffix10.test +++ b/tests/suffix10.test @@ -18,7 +18,7 @@ # (related to PR/37) required='libtoolize bison' -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/suffix11.test b/tests/suffix11.test index 82d9c989d..e841ece54 100755 --- a/tests/suffix11.test +++ b/tests/suffix11.test @@ -18,7 +18,7 @@ # PR/371 and PR/372: Reported by Duncan Gibson. # We also check for suffixes containing `-'. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/suffix12.test b/tests/suffix12.test index 88d8fa9b5..77e08ca69 100755 --- a/tests/suffix12.test +++ b/tests/suffix12.test @@ -17,7 +17,7 @@ # Tests that Automake understands suffix rules with subdir objects. # Reported by John Ratliff. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/suffix2.test b/tests/suffix2.test index 780d36b81..c83a7b114 100755 --- a/tests/suffix2.test +++ b/tests/suffix2.test @@ -17,7 +17,7 @@ # Test to make sure .c.o rule is only included once. required=libtoolize -. ./defs || exit 1 +. ./defs || Exit 1 cat >> configure.in << 'END' AC_PROG_CC @@ -42,10 +42,10 @@ END set -e -$ACLOCAL || exit 1 +$ACLOCAL || Exit 1 $AUTOMAKE -a grep -c '^\.c\.o:' Makefile.in | grep '^1$' grep -c '^\.c\.obj:' Makefile.in | grep '^1$' -exit 0 +Exit 0 diff --git a/tests/suffix3.test b/tests/suffix3.test index 2ba592a37..2a261285a 100755 --- a/tests/suffix3.test +++ b/tests/suffix3.test @@ -16,7 +16,7 @@ # Test to make sure that suffix rules chain. -. ./defs || exit 1 +. ./defs || Exit 1 cat >> configure.in << 'END' AC_PROG_CXX @@ -30,13 +30,13 @@ bin_PROGRAMS = foo foo_SOURCES = foo.zoo END -$ACLOCAL || exit 1 -$AUTOMAKE || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE || Exit 1 # The foo.cc intermediate step is implicit, it's a mistake if # Automake requires this file somewhere. -$FGREP foo.cc Makefile.in && exit 1 +$FGREP foo.cc Makefile.in && Exit 1 # However Automake must figure that foo.zoo is eventually # transformed into foo.o, and use this latter file (to link foo). -$FGREP 'foo.$(OBJEXT)' Makefile.in || exit 1 -exit 0 +$FGREP 'foo.$(OBJEXT)' Makefile.in || Exit 1 +Exit 0 diff --git a/tests/suffix4.test b/tests/suffix4.test index a17bd6345..8f36935a0 100755 --- a/tests/suffix4.test +++ b/tests/suffix4.test @@ -20,7 +20,7 @@ # Also make sure that .SUFFIXES is automatically adjusted with # extensions from implicit rules. -. ./defs || exit 1 +. ./defs || Exit 1 cat > Makefile.am << 'END' .k.o: @@ -30,7 +30,7 @@ bin_PROGRAMS = foo foo_SOURCES = foo.k END -$ACLOCAL || exit 1 -$AUTOMAKE || exit 1 -grep '.SUFFIXES:.*\.k' Makefile.in || exit 1 -exit 0 +$ACLOCAL || Exit 1 +$AUTOMAKE || Exit 1 +grep '.SUFFIXES:.*\.k' Makefile.in || Exit 1 +Exit 0 diff --git a/tests/suffix5.test b/tests/suffix5.test index 59674ae80..a25bcc10c 100755 --- a/tests/suffix5.test +++ b/tests/suffix5.test @@ -20,7 +20,7 @@ required=libtool # from user-defined implicit rules. # Based on a report from Arkadiusz Miskiewicz <misiek@pld.ORG.PL>. -. ./defs || exit 1 +. ./defs || Exit 1 cat >> configure.in << 'END' AC_PROG_LIBTOOL @@ -38,7 +38,7 @@ END : > config.guess : > config.sub -$ACLOCAL || exit 1 -$AUTOMAKE || exit 1 -grep '_OBJECTS.*foo.lo' Makefile.in || exit 1 -exit 0 +$ACLOCAL || Exit 1 +$AUTOMAKE || Exit 1 +grep '_OBJECTS.*foo.lo' Makefile.in || Exit 1 +Exit 0 diff --git a/tests/suffix6.test b/tests/suffix6.test index fde7e00bb..934cc09d3 100755 --- a/tests/suffix6.test +++ b/tests/suffix6.test @@ -17,7 +17,7 @@ # Test to make sure Automake supports implicit rules with dot-less # extensions. Also make sure that `.o' is handled like `.$(OBJEXT)'. -. ./defs || exit 1 +. ./defs || Exit 1 cat > Makefile.am << 'END' SUFFIXES = a b .$(OBJEXT) c .o @@ -33,12 +33,12 @@ END : > fooa -$ACLOCAL || exit 1 -$AUTOMAKE || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE || Exit 1 # Automake must figure that fooa translates to foo.$(OBJEXT) and # foo.$(OBJEXT) using the following rules: # fooa --[ab]--> foob --[b.$(OBJEXT)]--> foo.$(OBJEXT) -grep '_OBJECTS.* foo\.$(OBJEXT)' Makefile.in || exit 1 +grep '_OBJECTS.* foo\.$(OBJEXT)' Makefile.in || Exit 1 # fuc --[c.o]--> fu.$(OBJEXT) ## This is really meant ! -grep '_OBJECTS.* fu\.$(OBJEXT)' Makefile.in || exit 1 +grep '_OBJECTS.* fu\.$(OBJEXT)' Makefile.in || Exit 1 diff --git a/tests/suffix7.test b/tests/suffix7.test index 805489eae..22f3874d7 100755 --- a/tests/suffix7.test +++ b/tests/suffix7.test @@ -17,7 +17,7 @@ # Test to make sure Automake supports implicit rules "confusing" # extensions. Inspired by a mail from Alex Hornby. -. ./defs || exit 1 +. ./defs || Exit 1 cat > Makefile.am << 'END' SUFFIXES = .idl S.cpp C.h @@ -28,12 +28,12 @@ END : > fooa -$ACLOCAL || exit 1 -$AUTOMAKE || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE || Exit 1 # Make sure Automake has NOT recognized .cpp and .idlC as two new # extensions. -grep 'SUFFIXES.* \.cpp' Makefile.in && exit 1 -grep 'SUFFIXES.* \.idlC' Makefile.in && exit 1 +grep 'SUFFIXES.* \.cpp' Makefile.in && Exit 1 +grep 'SUFFIXES.* \.idlC' Makefile.in && Exit 1 -exit 0 +Exit 0 diff --git a/tests/suffix8.test b/tests/suffix8.test index 9632a7d29..ce7d3f9d8 100755 --- a/tests/suffix8.test +++ b/tests/suffix8.test @@ -18,7 +18,7 @@ # PR/37 required='gcc libtoolize' -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/suffix9.test b/tests/suffix9.test index 84440d7c8..84622435a 100755 --- a/tests/suffix9.test +++ b/tests/suffix9.test @@ -17,7 +17,7 @@ # Make sure that Automake choose the shorter route between suffixes # (related to PR/37) -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/symlink.test b/tests/symlink.test index 7f10ea417..51d010f06 100755 --- a/tests/symlink.test +++ b/tests/symlink.test @@ -17,7 +17,7 @@ # Make sure we get an error if symlink creation fails. # Reported by Joerg-Martin Schwarz -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/symlink2.test b/tests/symlink2.test index 6da120995..a64b6dbd1 100755 --- a/tests/symlink2.test +++ b/tests/symlink2.test @@ -16,7 +16,7 @@ # Test to make sure that `automake -a' redirects dangling symlinks. -. ./defs || exit 1 +. ./defs || Exit 1 rm -f install-sh rm -f mkinstalldirs @@ -24,5 +24,5 @@ ln -s Zardoz mkinstalldirs : > Makefile.am -$ACLOCAL || exit 1 +$ACLOCAL || Exit 1 $AUTOMAKE --add-missing diff --git a/tests/symlink3.test b/tests/symlink3.test index 1a9f160df..6b0585daa 100755 --- a/tests/symlink3.test +++ b/tests/symlink3.test @@ -16,7 +16,7 @@ # Test to make sure that `automake --force-missing' works. -. ./defs || exit 1 +. ./defs || Exit 1 rm -f install-sh rm -f mkinstalldirs @@ -26,8 +26,8 @@ echo zot > mkinstalldirs : > Makefile.am -$ACLOCAL || exit 1 -$AUTOMAKE --add-missing --force-missing || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE --add-missing --force-missing || Exit 1 -grep zot mkinstalldirs && exit 1 -exit 0 +grep zot mkinstalldirs && Exit 1 +Exit 0 diff --git a/tests/syntax.test b/tests/syntax.test index 5327cf279..11fe81f94 100755 --- a/tests/syntax.test +++ b/tests/syntax.test @@ -16,7 +16,7 @@ # Test for error for bad syntax. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/tags.test b/tests/tags.test index cce3f39ea..22d1f0f00 100755 --- a/tests/tags.test +++ b/tests/tags.test @@ -17,7 +17,7 @@ # Test for bug reported by Harlan Stenn: the tags target doesn't work # when there are only headers in a directory. -. ./defs || exit 1 +. ./defs || Exit 1 cat > Makefile.am << 'END' noinst_HEADERS = iguana.h @@ -25,7 +25,7 @@ END : > iguana.h -$ACLOCAL || exit 1 -$AUTOMAKE || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE || Exit 1 grep '^ID:' Makefile.in diff --git a/tests/tagsub.test b/tests/tagsub.test index 13d909b9b..a710840b9 100755 --- a/tests/tagsub.test +++ b/tests/tagsub.test @@ -19,7 +19,7 @@ # François Pinard, and later by Akim Demaille. required=etags -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/tar.test b/tests/tar.test index 94a837f00..97dec385b 100755 --- a/tests/tar.test +++ b/tests/tar.test @@ -16,7 +16,7 @@ # Check the tar-ustar option. -. ./defs || exit 1 +. ./defs || Exit 1 set -e @@ -34,7 +34,7 @@ $AUTOCONF $AUTOMAKE ./configure -grep 'am__tar.*false' Makefile && exit 77 +grep 'am__tar.*false' Makefile && Exit 77 $MAKE distcheck test -f tar-1.0.tar.gz diff --git a/tests/tar2.test b/tests/tar2.test index 5b604be54..3f03c98f8 100755 --- a/tests/tar2.test +++ b/tests/tar2.test @@ -16,7 +16,7 @@ # Check the tar-pax option. -. ./defs || exit 1 +. ./defs || Exit 1 set -e @@ -34,7 +34,7 @@ $AUTOCONF $AUTOMAKE ./configure -grep 'am__tar.*false' Makefile && exit 77 +grep 'am__tar.*false' Makefile && Exit 77 $MAKE distcheck test -f tar2-1.0.tar.gz diff --git a/tests/tar3.test b/tests/tar3.test index 0e8c9bd77..0ba0612ec 100755 --- a/tests/tar3.test +++ b/tests/tar3.test @@ -16,7 +16,7 @@ # Check the tar options diagnostics. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/target-cflags.test b/tests/target-cflags.test index 0f5cbd238..14ca79dc3 100755 --- a/tests/target-cflags.test +++ b/tests/target-cflags.test @@ -18,7 +18,7 @@ # Assar Westerlund <assar@sics.se> required=gcc -. ./defs || exit 1 +. ./defs || Exit 1 cat > configure.in << 'END' AC_INIT(foo.c) diff --git a/tests/targetclash.test b/tests/targetclash.test index 9955f20cb..57515a520 100755 --- a/tests/targetclash.test +++ b/tests/targetclash.test @@ -17,7 +17,7 @@ # Check that target clashes are diagnosed. required=gcc -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/transform.test b/tests/transform.test index 68c5bed5a..7a9e549d6 100755 --- a/tests/transform.test +++ b/tests/transform.test @@ -17,7 +17,7 @@ # Make sure that --program-transform works. required=gcc -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/txinfo.test b/tests/txinfo.test index 61ec4466d..9b37eb5bf 100755 --- a/tests/txinfo.test +++ b/tests/txinfo.test @@ -18,7 +18,7 @@ # Test to ensure texinfo.tex included in distribution. Bug report by # Jim Meyering. -. ./defs || exit 1 +. ./defs || Exit 1 cat > Makefile.am << 'END' info_TEXINFOS = textutils.texi @@ -29,8 +29,8 @@ END echo '@setfilename textutils.info' > textutils.texi : > texinfo.tex -$ACLOCAL || exit 1 -$AUTOMAKE || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE || Exit 1 $FGREP -v @SET_MAKE@ Makefile.in > Makefile.sed $MAKE -s -f Makefile.sed SHELL=$SHELL magic | grep 'texinfo\.tex' diff --git a/tests/txinfo10.test b/tests/txinfo10.test index 478b32bf4..fc826933b 100755 --- a/tests/txinfo10.test +++ b/tests/txinfo10.test @@ -17,7 +17,7 @@ # Make sure dvi target recurses into subdir. # Reported by Pavel Roskin -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/txinfo13.test b/tests/txinfo13.test index 3618de4b7..e8601f04f 100755 --- a/tests/txinfo13.test +++ b/tests/txinfo13.test @@ -19,7 +19,7 @@ # from Vincent Lefevre) required='makeinfo tex texi2dvi-o' -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/txinfo16.test b/tests/txinfo16.test index 25b07665f..ec5d4cb3d 100755 --- a/tests/txinfo16.test +++ b/tests/txinfo16.test @@ -17,7 +17,7 @@ # Check that info files are not built in $(srcdir). required='makeinfo tex' -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/txinfo17.test b/tests/txinfo17.test index f60225f1d..f02aeeeb9 100755 --- a/tests/txinfo17.test +++ b/tests/txinfo17.test @@ -17,7 +17,7 @@ # Make sure Automake uses the _first_ @setfilname it sees. # Report from Karl Berry. -. ./defs || exit 1 +. ./defs || Exit 1 set -e @@ -37,5 +37,5 @@ END $ACLOCAL $AUTOMAKE --add-missing -grep 'example' Makefile.in && exit 1 +grep 'example' Makefile.in && Exit 1 grep 'texinfo:' Makefile.in diff --git a/tests/txinfo18.test b/tests/txinfo18.test index 0361237f6..1ee6f3e4b 100755 --- a/tests/txinfo18.test +++ b/tests/txinfo18.test @@ -19,7 +19,7 @@ # PR/375. required='makeinfo tex' -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/txinfo19.test b/tests/txinfo19.test index 1482d880e..a47030639 100755 --- a/tests/txinfo19.test +++ b/tests/txinfo19.test @@ -17,7 +17,7 @@ # Test support for DJGPP's .iNN info files. required='makeinfo tex' -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/txinfo2.test b/tests/txinfo2.test index 32e605cc4..2f1dafe3b 100755 --- a/tests/txinfo2.test +++ b/tests/txinfo2.test @@ -17,7 +17,7 @@ # Test to ensure that a ".info~" file doesn't end up in the # distribution. Bug report from Greg McGary. -. ./defs || exit 1 +. ./defs || Exit 1 set -e @@ -40,5 +40,5 @@ $AUTOMAKE ./configure $MAKE magic >stdout cat stdout -grep '~' stdout && exit 1 -exit 0 +grep '~' stdout && Exit 1 +Exit 0 diff --git a/tests/txinfo20.test b/tests/txinfo20.test index c45ae8124..85a82602c 100755 --- a/tests/txinfo20.test +++ b/tests/txinfo20.test @@ -17,7 +17,7 @@ # Make sure info files survive makeinfo errors. required=makeinfo -. ./defs || exit 1 +. ./defs || Exit 1 set -e @@ -64,14 +64,14 @@ cat > main.texi << 'END' END # makeinfo will bail out, but we should conserve the old info files. -$MAKE && exit 1 +$MAKE && Exit 1 test -f main test -f main-1 # Restore main.texi, and break sub/main.texi cp main.texi sub/main.texi mv main.old main.texi -$MAKE && exit 1 +$MAKE && Exit 1 test -f main test ! -f main-1 test -f sub/main diff --git a/tests/txinfo21.test b/tests/txinfo21.test index 278f8e74c..c4c47eb00 100755 --- a/tests/txinfo21.test +++ b/tests/txinfo21.test @@ -18,7 +18,7 @@ # install-DOC flavors. required='makeinfo-html tex' -. ./defs || exit 1 +. ./defs || Exit 1 set -e @@ -150,7 +150,7 @@ test ! -f share/txinfo21/dvi/main.dvi test ! -f share/txinfo21/dvi/main2.dvi test ! -f share/txinfo21/dvi/main3.dvi -(dvips --help 2>/dev/null >/dev/null) || exit 77 +(dvips --help 2>/dev/null >/dev/null) || Exit 77 $MAKE install-ps test -f share/txinfo21/ps/main.ps @@ -162,7 +162,7 @@ test ! -f share/txinfo21/ps/main2.ps test ! -f share/txinfo21/ps/main3.ps (pdfetex --help 2>/dev/null >/dev/null) || - (pdftex --help 2>/dev/null >/dev/null) || exit 77 + (pdftex --help 2>/dev/null >/dev/null) || Exit 77 $MAKE install-pdf test -f share/txinfo21/pdf/main.pdf diff --git a/tests/txinfo22.test b/tests/txinfo22.test index f82d69134..5533f98a9 100755 --- a/tests/txinfo22.test +++ b/tests/txinfo22.test @@ -21,7 +21,7 @@ # Also make sure TEXINFO_TEX is not distributed. required='makeinfo tex' -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/txinfo23.test b/tests/txinfo23.test index 36d0fbcc6..73875af64 100755 --- a/tests/txinfo23.test +++ b/tests/txinfo23.test @@ -18,7 +18,7 @@ # (Similar to txinfo13.test, plus DISTCLEANFILES.) required='makeinfo tex texi2dvi-o' -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/txinfo24.test b/tests/txinfo24.test index b0aac9016..9c81b4164 100755 --- a/tests/txinfo24.test +++ b/tests/txinfo24.test @@ -18,7 +18,7 @@ # (Similar to txinfo16.test, plus CLEANFILES.) required='makeinfo tex texi2dvi-o' -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/txinfo25.test b/tests/txinfo25.test index 184e3ad47..c2e111da8 100755 --- a/tests/txinfo25.test +++ b/tests/txinfo25.test @@ -18,7 +18,7 @@ # which being cleaned. required='makeinfo tex texi2dvi-o' -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/txinfo26.test b/tests/txinfo26.test index 774170128..52a7f782a 100755 --- a/tests/txinfo26.test +++ b/tests/txinfo26.test @@ -18,7 +18,7 @@ # PR/408 required='makeinfo' -. ./defs || exit 1 +. ./defs || Exit 1 set -e @@ -50,7 +50,7 @@ $MAKE distclean # We do not require this to work with a directory that contains white space. case `pwd` in - *\ * | *\ *) exit 77;; + *\ * | *\ *) Exit 77;; esac mkdir build diff --git a/tests/txinfo27.test b/tests/txinfo27.test index 06b8f0074..48b06d6e8 100755 --- a/tests/txinfo27.test +++ b/tests/txinfo27.test @@ -17,7 +17,7 @@ # Make sure install-info works even if no-installinfo is given. required='makeinfo' -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/txinfo28.test b/tests/txinfo28.test index ce0021c4f..02805ca38 100755 --- a/tests/txinfo28.test +++ b/tests/txinfo28.test @@ -19,7 +19,7 @@ # Report from Ralf Corsepius. required='makeinfo tex texi2dvi-o' -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/txinfo29.test b/tests/txinfo29.test index 8d94dd3d3..29116c23d 100755 --- a/tests/txinfo29.test +++ b/tests/txinfo29.test @@ -17,7 +17,7 @@ # Make sure that INFO_DEPS can be overridden. # Report from Bruce Korb. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/txinfo3.test b/tests/txinfo3.test index 298cabc89..6dd553f73 100755 --- a/tests/txinfo3.test +++ b/tests/txinfo3.test @@ -17,7 +17,7 @@ # Test to make sure .info-less @setfilename works. required='makeinfo tex' -. ./defs || exit 1 +. ./defs || Exit 1 set -e @@ -44,7 +44,7 @@ grep '^INFO_DEPS.*textutils$' Makefile.in # We should not use single suffix inference rules (with separate # dependencies), this confuses Solaris make. -grep '^.texi:$' Makefile.in && exit 1 +grep '^.texi:$' Makefile.in && Exit 1 grep 'textutils: textutils.texi' Makefile.in ./configure diff --git a/tests/txinfo30.test b/tests/txinfo30.test index 31715d846..35a9a345a 100755 --- a/tests/txinfo30.test +++ b/tests/txinfo30.test @@ -17,7 +17,7 @@ # Make sure `missing texinfo' does not create empty files. # Report from Bob Proulx. -. ./defs || exit 1 +. ./defs || Exit 1 set -e @@ -55,5 +55,5 @@ test -f bar.info # We should not create a missing bar.info. rm -f bar.info -$MAKE && exit 1 +$MAKE && Exit 1 test ! -f bar.info diff --git a/tests/txinfo31.test b/tests/txinfo31.test index 3dda29d52..4c061a5e1 100755 --- a/tests/txinfo31.test +++ b/tests/txinfo31.test @@ -17,7 +17,7 @@ # Make sure file extensions are matched correctly. # Report from Eric Dorland. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/txinfo4.test b/tests/txinfo4.test index 7d119de91..f3ec9f042 100755 --- a/tests/txinfo4.test +++ b/tests/txinfo4.test @@ -16,7 +16,7 @@ # Make sure non-empty, non-info suffixes are diagnosed. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/txinfo5.test b/tests/txinfo5.test index 4782c179c..bc6214eb5 100755 --- a/tests/txinfo5.test +++ b/tests/txinfo5.test @@ -16,7 +16,7 @@ # Test to make sure that texinfo.tex is not required by --cygnus. # Report from Ian Taylor. -. ./defs || exit 1 +. ./defs || Exit 1 cat >> configure.in << 'END' AM_MAINTAINER_MODE @@ -28,5 +28,5 @@ END echo '@setfilename ian.info' > ian.texi -$ACLOCAL || exit 1 +$ACLOCAL || Exit 1 $AUTOMAKE --cygnus diff --git a/tests/txinfo6.test b/tests/txinfo6.test index 0535a1cc8..33c066b81 100755 --- a/tests/txinfo6.test +++ b/tests/txinfo6.test @@ -15,7 +15,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # Test to make sure `.txi' extension works. -. ./defs || exit 1 +. ./defs || Exit 1 cat > Makefile.am << 'END' info_TEXINFOS = foo.txi @@ -24,7 +24,7 @@ END echo '@setfilename foo.info' > foo.txi : > texinfo.tex -$ACLOCAL || exit 1 -$AUTOMAKE || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE || Exit 1 $FGREP '.txi.info' Makefile.in diff --git a/tests/txinfo7.test b/tests/txinfo7.test index 344357fc0..09b4f4ca6 100755 --- a/tests/txinfo7.test +++ b/tests/txinfo7.test @@ -17,7 +17,7 @@ # Test to make sure texinfo.tex correctly installed by -a. Bug report # by Per Cederqvist. -. ./defs || exit 1 +. ./defs || Exit 1 cat > Makefile.am << 'END' info_TEXINFOS = textutils.texi @@ -27,7 +27,7 @@ END echo '@setfilename textutils.info' > textutils.texi -$ACLOCAL || exit 1 -$AUTOMAKE -a || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE -a || Exit 1 test -f texinfo.tex diff --git a/tests/txinfo8.test b/tests/txinfo8.test index 586823ac4..027ce72d7 100755 --- a/tests/txinfo8.test +++ b/tests/txinfo8.test @@ -19,7 +19,7 @@ # -a when we're using AC_CONFIG_AUX_DIR. Bug report by by Per # Cederqvist. -. ./defs || exit 1 +. ./defs || Exit 1 cat > configure.in << 'END' AC_INIT @@ -41,12 +41,12 @@ magic: @echo $(DISTFILES) END -$ACLOCAL || exit 1 -$AUTOMAKE -a || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE -a || Exit 1 $FGREP -v @SET_MAKE@ sub/Makefile.in > sub/Makefile.sed test -f sub/texinfo.tex && $MAKE -s -f sub/Makefile.sed SHELL=$SHELL magic | grep 'texinfo\.tex' stat=$? -exit $stat +Exit $stat diff --git a/tests/txinfo9.test b/tests/txinfo9.test index 7de4008dd..6959c6ccf 100755 --- a/tests/txinfo9.test +++ b/tests/txinfo9.test @@ -18,7 +18,7 @@ # This is just an example -- basically for many targets in texinfos.am # we only want them to appear once. -. ./defs || exit 1 +. ./defs || Exit 1 cat > Makefile.am << 'END' info_TEXINFOS = maude.texi liver.txi heart.texinfo @@ -29,7 +29,7 @@ echo '@setfilename liver.info' > liver.txi echo '@setfilename heart.info' > heart.texinfo : > texinfo.tex -$ACLOCAL || exit 1 -$AUTOMAKE || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE || Exit 1 test `grep '^dist-info:' Makefile.in | wc -l` -eq 1 diff --git a/tests/unused.test b/tests/unused.test index 80722aea7..45ca4854c 100755 --- a/tests/unused.test +++ b/tests/unused.test @@ -15,7 +15,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # Test for failing check for unused macros. From Johan Danielsson. -. ./defs || exit 1 +. ./defs || Exit 1 cat >> configure.in << 'END' MACRO_1 @@ -29,5 +29,5 @@ AC_DEFUN([MACRO_1_2], echo 12) AC_DEFUN([MACRO_1_2_3], echo 123) END -$ACLOCAL 2> output || exit 1 +$ACLOCAL 2> output || Exit 1 test -z "`cat output`" diff --git a/tests/upc.test b/tests/upc.test index b15500a37..07c864ece 100755 --- a/tests/upc.test +++ b/tests/upc.test @@ -16,7 +16,7 @@ # A simple Hello World for UPC. -. ./defs || exit 1 +. ./defs || Exit 1 set -e cat >> configure.in << 'END' diff --git a/tests/upc2.test b/tests/upc2.test index 9844708ce..c096b7350 100755 --- a/tests/upc2.test +++ b/tests/upc2.test @@ -17,7 +17,7 @@ # Test that Automake suggests using AM_PROG_UPC if Unified Parallel C # sources are used. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/upc3.test b/tests/upc3.test index 0c078af32..d85709bcf 100755 --- a/tests/upc3.test +++ b/tests/upc3.test @@ -16,7 +16,7 @@ # Test that C and Unified Parallel C link safely. -. ./defs || exit 1 +. ./defs || Exit 1 set -e cat >> configure.in << 'END' diff --git a/tests/vars.test b/tests/vars.test index daf4f1a15..b69244c89 100755 --- a/tests/vars.test +++ b/tests/vars.test @@ -17,7 +17,7 @@ # Test various variable definitions that include an '=' sign # From Raja R Harinath -. ./defs || exit 1 +. ./defs || Exit 1 cat > Makefile.am << 'END' MY_FLAGS_1=-DABC=345 @@ -26,5 +26,5 @@ MY_FLAGS_3 =-DABC=345 MY_FLAGS_4 = -DABC=345 END -$ACLOCAL || exit 1 +$ACLOCAL || Exit 1 $AUTOMAKE diff --git a/tests/vars3.test b/tests/vars3.test index 79f8cdd0d..4eb2e6493 100755 --- a/tests/vars3.test +++ b/tests/vars3.test @@ -17,7 +17,7 @@ # Check that Automake warns about variables containing spaces # and other non-POSIX characters. -. ./defs || exit 1 +. ./defs || Exit 1 set -e @@ -46,32 +46,32 @@ cat stderr # No error expected for these lines. grep 1: stderr -grep 2: stderr && exit 1 -grep 3: stderr && exit 1 +grep 2: stderr && Exit 1 +grep 3: stderr && Exit 1 grep 4: stderr grep 5: stderr -grep 6: stderr && exit 1 +grep 6: stderr && Exit 1 grep 7: stderr grep 8: stderr grep 9: stderr -grep 10: stderr && exit 1 -grep 11: stderr && exit 1 -grep 12: stderr && exit 1 +grep 10: stderr && Exit 1 +grep 11: stderr && Exit 1 +grep 12: stderr && Exit 1 # Now check some individual values. grep 'shell echo' stderr -grep 'nextvariableisbad' stderr && exit 1 +grep 'nextvariableisbad' stderr && Exit 1 grep 'addsuffix' stderr grep 'bad boy' stderr -grep 'ok' stderr && exit 1 +grep 'ok' stderr && Exit 1 grep 'three errors' stderr grep 'on this' stderr grep 'long line' stderr grep 'o u c h' stderr grep 'wildcard' stderr grep 'another error' stderr -grep 'thisis' stderr && exit 1 -grep 'here' stderr && exit 1 +grep 'thisis' stderr && Exit 1 +grep 'here' stderr && Exit 1 # None of these errors be diagnosed with -Wno-portability $AUTOMAKE -Wno-portability diff --git a/tests/vartar.test b/tests/vartar.test index 01dd90612..d0443afb4 100755 --- a/tests/vartar.test +++ b/tests/vartar.test @@ -16,7 +16,7 @@ # Targets and macros are two different name spaces. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/version.test b/tests/version.test index df6f49da9..731baf5bc 100755 --- a/tests/version.test +++ b/tests/version.test @@ -17,7 +17,7 @@ # Test to make sure [...] is ok in version number. Report from Jim # Meyering. -. ./defs || exit 1 +. ./defs || Exit 1 cat > configure.in << 'END' AC_INIT @@ -36,5 +36,5 @@ END : > ChangeLog : > THANKS -$ACLOCAL || exit 1 +$ACLOCAL || Exit 1 $AUTOMAKE --gnits diff --git a/tests/version2.test b/tests/version2.test index b7ad8aa05..4ef460fb6 100755 --- a/tests/version2.test +++ b/tests/version2.test @@ -17,7 +17,7 @@ # Test to make sure 3rd arg to AM_INIT_AUTOMAKE not picked up in # version. From Joel Weber. -. ./defs || exit 1 +. ./defs || Exit 1 cat > configure.in << 'END' AC_INIT @@ -36,5 +36,5 @@ END : > ChangeLog : > THANKS -$ACLOCAL || exit 1 +$ACLOCAL || Exit 1 $AUTOMAKE --gnits diff --git a/tests/version3.test b/tests/version3.test index 08e990041..573871340 100755 --- a/tests/version3.test +++ b/tests/version3.test @@ -16,7 +16,7 @@ # Test to make sure version in AUTOMAKE_OPTIONS works. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/version4.test b/tests/version4.test index 2f7a44086..63f3c2802 100755 --- a/tests/version4.test +++ b/tests/version4.test @@ -16,11 +16,11 @@ # Test to make sure we are compatible with the 1.4-p1 series. -. ./defs || exit 1 +. ./defs || Exit 1 cat > Makefile.am << 'END' AUTOMAKE_OPTIONS = 1.4-p3 END -$ACLOCAL || exit 1 +$ACLOCAL || Exit 1 $AUTOMAKE diff --git a/tests/version6.test b/tests/version6.test index 6edc09f99..b84a57da4 100755 --- a/tests/version6.test +++ b/tests/version6.test @@ -16,7 +16,7 @@ # Make sure the current version can be required. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/version7.test b/tests/version7.test index 0fec21045..dc2846547 100755 --- a/tests/version7.test +++ b/tests/version7.test @@ -20,7 +20,7 @@ # changes -- we don't support this feature on non-GNU Makes). required='makeinfo tex GNUmake' -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/version8.test b/tests/version8.test index 8b2ce965b..de61cf18e 100755 --- a/tests/version8.test +++ b/tests/version8.test @@ -16,9 +16,9 @@ # Calling AM_AUTOMAKE_VERSION by hand is a bug. -. ./defs || exit 1 +. ./defs || Exit 1 set -e echo 'AM_AUTOMAKE_VERSION([1.9])' >>configure.in -$ACLOCAL 2>stderr && exit 0 +$ACLOCAL 2>stderr && Exit 0 $FGREP 'AM_INIT_AUTOMAKE([1.9])' stderr diff --git a/tests/vpath.test b/tests/vpath.test index 1fbde6a6e..fd85de6bf 100755 --- a/tests/vpath.test +++ b/tests/vpath.test @@ -17,14 +17,14 @@ # Test to make sure VPATH can be overridden. # Report from Anthony Green. -. ./defs || exit 1 +. ./defs || Exit 1 cat > Makefile.am << 'END' VPATH = zardoz END -$ACLOCAL || exit 1 -$AUTOMAKE || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE || Exit 1 -grep 'VPATH.*@srcdir@' Makefile.in && exit 1 -exit 0 +grep 'VPATH.*@srcdir@' Makefile.in && Exit 1 +Exit 0 diff --git a/tests/vtexi.test b/tests/vtexi.test index 680f68d29..2e43563d1 100755 --- a/tests/vtexi.test +++ b/tests/vtexi.test @@ -15,7 +15,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. ./defs || exit 1 +. ./defs || Exit 1 cat > Makefile.am << 'END' info_TEXINFOS = textutils.texi @@ -32,7 +32,7 @@ END set -e -$ACLOCAL || exit 1 +$ACLOCAL || Exit 1 $AUTOMAKE # Test for bug reported by Jim Meyering: @@ -60,6 +60,6 @@ $EGREP 'stamp-vti:.*\$\(top_srcdir\)/configure( .*)?$' Makefile.in # Filter out '$(srcdir)/mdate-sh'; output occurrences of `SOMETHING/mdate-sh' sed -n 's,\$(srcdir)/mdate-sh,,g;s,.* \([^ ]*/mdate-sh\) .*,\1,gp' Makefile.in| # There must remain nothing. - grep . && exit 1 + grep . && Exit 1 -exit 0 +Exit 0 diff --git a/tests/vtexi2.test b/tests/vtexi2.test index 09ba2c287..8ab4afea4 100755 --- a/tests/vtexi2.test +++ b/tests/vtexi2.test @@ -19,7 +19,7 @@ # version.texi gets listed as a dependency for the .info file but # not the .dvi file. -. ./defs || exit 1 +. ./defs || Exit 1 cat > Makefile.am << 'END' info_TEXINFOS = zardoz.texi @@ -34,7 +34,7 @@ END : > mdate-sh : > texinfo.tex -$ACLOCAL || exit 1 -$AUTOMAKE || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE || Exit 1 grep '^zardoz\.dvi:' Makefile.in diff --git a/tests/warnopts.test b/tests/warnopts.test index c432e722b..0a3201f6c 100755 --- a/tests/warnopts.test +++ b/tests/warnopts.test @@ -16,7 +16,7 @@ # Make sure that we can enable or disable warnings on a per-file basis. -. ./defs || exit 1 +. ./defs || Exit 1 set -e @@ -50,8 +50,8 @@ AUTOMAKE_fails # sub/Makefile.am:2: `INCLUDES' is the old name for `AM_CPPFLAGS' grep '^Makefile.am:.*foo_SOURCES' stderr grep '^sub/Makefile.am:.*INCLUDES' stderr -grep '^sub/Makefile.am:.*foo_SOURCES' stderr && exit 1 -grep '^Makefile.am:.*INCLUDES' stderr && exit 1 +grep '^sub/Makefile.am:.*foo_SOURCES' stderr && Exit 1 +grep '^Makefile.am:.*INCLUDES' stderr && Exit 1 # Only three lines of warnings. test `wc -l < stderr` = 3 diff --git a/tests/werror.test b/tests/werror.test index c2cf311f4..cf5d28f9b 100755 --- a/tests/werror.test +++ b/tests/werror.test @@ -16,11 +16,11 @@ # Test to make sure --Werror and --add-missing work together. -. ./defs || exit 1 +. ./defs || Exit 1 : > Makefile.am rm -f install-sh depcomp missing mkinstalldirs -$ACLOCAL || exit 1 +$ACLOCAL || Exit 1 $AUTOMAKE --Werror --add-missing diff --git a/tests/werror2.test b/tests/werror2.test index 8b8a79823..2d64bcb71 100755 --- a/tests/werror2.test +++ b/tests/werror2.test @@ -20,7 +20,7 @@ # Report from Harlan Stenn. required=GNUmake -. ./defs || exit 1 +. ./defs || Exit 1 set -e @@ -41,8 +41,8 @@ INCLUDES = -Ifoo foo_SOURCES = unused END -$MAKE && exit 1 +$MAKE && Exit 1 -$MAKE && exit 1 +$MAKE && Exit 1 : diff --git a/tests/whoami.test b/tests/whoami.test index cde058533..2436d0788 100755 --- a/tests/whoami.test +++ b/tests/whoami.test @@ -17,7 +17,7 @@ # Test to make sure aclocal doesn't barf on "WHO_AM_I=...". Report # from Johan Danielsson (and a very nice bug report, too, I might # add). -. ./defs || exit 1 +. ./defs || Exit 1 cat >> configure.in << 'END' WHO_AM_I=17 diff --git a/tests/xsource.test b/tests/xsource.test index 114b0c83d..54e3e1ea6 100755 --- a/tests/xsource.test +++ b/tests/xsource.test @@ -18,7 +18,7 @@ # Test to make sure multiple source files with the same object # file causes error. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/yacc.test b/tests/yacc.test index c94b10517..c96e59ddf 100755 --- a/tests/yacc.test +++ b/tests/yacc.test @@ -17,7 +17,7 @@ # Test to make sure intermediate .c file is built from yacc source. # Bug from Thomas Morgan. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/yacc2.test b/tests/yacc2.test index 5d6e909fc..a97bf2d75 100755 --- a/tests/yacc2.test +++ b/tests/yacc2.test @@ -17,7 +17,7 @@ # Test to make sure intermediate .h file is not generated nor removed # if (AM_)?YFLAGS do not contain -d. Requested by Jim Meyering. -. ./defs || exit 1 +. ./defs || Exit 1 set -e @@ -38,7 +38,7 @@ $ACLOCAL $AUTOMAKE -a # If zardoz.h IS mentioned, fail -grep 'zardoz.h' Makefile.in > /dev/null && exit 1 +grep 'zardoz.h' Makefile.in > /dev/null && Exit 1 @@ -58,7 +58,7 @@ echo 'AM_YFLAGS = ' >> Makefile.am $AUTOMAKE # If zardoz.h IS mentioned, fail -grep 'zardoz.h' Makefile.in > /dev/null && exit 1 +grep 'zardoz.h' Makefile.in > /dev/null && Exit 1 @@ -81,6 +81,6 @@ echo 'YFLAGS = ' >> Makefile.am $AUTOMAKE -Wno-gnu # If zardoz.h IS mentioned, fail -grep 'zardoz.h' Makefile.in > /dev/null && exit 1 +grep 'zardoz.h' Makefile.in > /dev/null && Exit 1 : diff --git a/tests/yacc3.test b/tests/yacc3.test index 3ecbd592b..64523255e 100755 --- a/tests/yacc3.test +++ b/tests/yacc3.test @@ -17,7 +17,7 @@ # Ensure that generated .h file is distributed iff we have -d in # (AM_)?YFLAGS. -. ./defs || exit 1 +. ./defs || Exit 1 set -e @@ -39,7 +39,7 @@ $AUTOMAKE -a $FGREP -v @SET_MAKE@ Makefile.in > Makefile.sed # It should not be disted here -grep 'zardoz.h' Makefile.in && exit 1 +grep 'zardoz.h' Makefile.in && Exit 1 cp Makefile.am Save # Test all available flags to make sure header is distributed with diff --git a/tests/yacc4.test b/tests/yacc4.test index 2155b4803..db8eaefba 100755 --- a/tests/yacc4.test +++ b/tests/yacc4.test @@ -17,7 +17,7 @@ # Some simple tests of ylwrap functionality. required='bison gcc' -. ./defs || exit 1 +. ./defs || Exit 1 cat > configure.in << 'END' AC_INIT @@ -74,8 +74,8 @@ cd sub ../configure $MAKE -grep '^#.*/sub/\.\./' bar.c && exit 1 -grep '^#.*/sub/\.\./' parse.c && exit 1 +grep '^#.*/sub/\.\./' bar.c && Exit 1 +grep '^#.*/sub/\.\./' parse.c && Exit 1 # Make distclean must not erase bar.c nor parse.c (by GNU standards) ... $MAKE distclean @@ -88,4 +88,4 @@ test ! -f bar.c test ! -f parse.c : -exit 0 +Exit 0 diff --git a/tests/yacc5.test b/tests/yacc5.test index 4c385e102..905d5eb98 100755 --- a/tests/yacc5.test +++ b/tests/yacc5.test @@ -17,7 +17,7 @@ # Test of yacc functionality, derived from GNU binutils # by Tim Van Holder. -. ./defs || exit 1 +. ./defs || Exit 1 set -e @@ -57,7 +57,7 @@ $ACLOCAL $AUTOMAKE -a # No rule needed, the default .y.c: inference rule is enough. -grep '^sub/maude\.c:' Makefile.in && exit 1 +grep '^sub/maude\.c:' Makefile.in && Exit 1 ## Try again with per-exe flags. @@ -69,14 +69,14 @@ maude_SOURCES = sub/maude.y maude_YFLAGS = -d END -$ACLOCAL || exit 1 -$AUTOMAKE -a || exit 1 +$ACLOCAL || Exit 1 +$AUTOMAKE -a || Exit 1 # Rule should use maude_YFLAGS. -grep 'AM_YFLAGS.*maude' Makefile.in && exit 1 +grep 'AM_YFLAGS.*maude' Makefile.in && Exit 1 # Silly regression. -grep 'maudec' Makefile.in && exit 1 +grep 'maudec' Makefile.in && Exit 1 # Make sure the .o file is required. grep '^am_maude_OBJECTS.*maude' Makefile.in diff --git a/tests/yacc6.test b/tests/yacc6.test index aec11015b..cd383a125 100755 --- a/tests/yacc6.test +++ b/tests/yacc6.test @@ -21,7 +21,7 @@ # Report from Paolo Bonzini. required='gcc bison GNUmake' -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/yacc7.test b/tests/yacc7.test index 66aee50f3..a3e21b729 100755 --- a/tests/yacc7.test +++ b/tests/yacc7.test @@ -21,7 +21,7 @@ # PR/47. required=bison -. ./defs || exit 1 +. ./defs || Exit 1 cat >> configure.in << 'END' AC_PROG_CC @@ -73,7 +73,7 @@ $MAKE foo.h test -f foo.h # Make sure `#line ... y.tab.h' gets replaced. -$FGREP 'y.tab.h' foo.h && exit 1 +$FGREP 'y.tab.h' foo.h && Exit 1 # Make distclean must not erase foo.c nor foo.h (by GNU standards) ... $MAKE foo.c diff --git a/tests/yacc8.test b/tests/yacc8.test index e34410185..89eb3b73a 100755 --- a/tests/yacc8.test +++ b/tests/yacc8.test @@ -18,7 +18,7 @@ required="gcc bison" -. ./defs || exit 1 +. ./defs || Exit 1 set -e @@ -104,7 +104,7 @@ EXTRA_foo_foo_SOURCES = foo/parse2.y END $AUTOMAKE -a -test -f ./ylwrap || exit 1 +test -f ./ylwrap || Exit 1 cd sub # Regenerate Makefile (automatic in GNU Make, but not in other Makes) diff --git a/tests/yaccpp.test b/tests/yaccpp.test index 1a5f31f0d..e311dd7a6 100755 --- a/tests/yaccpp.test +++ b/tests/yaccpp.test @@ -16,7 +16,7 @@ # Test to make sure yacc + c++ works. -. ./defs || exit 1 +. ./defs || Exit 1 set -e diff --git a/tests/yaccvpath.test b/tests/yaccvpath.test index 3119fecda..18a0dec2c 100755 --- a/tests/yaccvpath.test +++ b/tests/yaccvpath.test @@ -21,7 +21,7 @@ # to be distributed is up to date. required='gcc bison' -. ./defs || exit 1 +. ./defs || Exit 1 cat > configure.in << 'END' AC_INIT |