[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 1/3] Use `set -e' in all test scripts.
|
From: |
Stefano Lattarini |
|
Subject: |
[PATCH 1/3] Use `set -e' in all test scripts. |
|
Date: |
Wed, 31 Mar 2010 13:27:40 +0200 |
|
User-agent: |
KMail/1.12.1 (Linux/2.6.30-2-686; KDE/4.3.2; i686; ; ) |
Set the `errexit' a.k.a. `set -e' shell flag in `tests/defs.in'.
Many test scripts adjusted accordingly.
From 2c232dafaec6e5dd63dc76e32e447f03d2d50f98 Mon Sep 17 00:00:00 2001
From: Stefano Lattarini <address@hidden>
Date: Wed, 31 Mar 2010 00:07:42 +0200
Subject: [PATCH 1/3] Use `set -e' in all test scripts.
* tests/defs.in: Set the `errexit' a.k.a. `set -e' shell flag.
* tests/README: Modified accordingly.
* tests/aclocal3.test: Likewise.
* tests/acoutnoq.test: Likewise.
* tests/acoutpt.test: Likewise.
* tests/acoutpt2.test: Likewise.
* tests/acoutqnl.test: Likewise.
* tests/ammissing.test: Likewise.
* tests/ansi.test: Likewise.
* tests/ansi2.test: Likewise.
* tests/ansi4.test: Likewise.
* tests/auxdir.test: Likewise.
* tests/auxdir2.test: Likewise.
* tests/backsl.test: Likewise.
* tests/backsl2.test: Likewise.
* tests/badprog.test: Likewise.
* tests/block.test: Likewise.
* tests/canon2.test: Likewise.
* tests/canon3.test: Likewise.
* tests/canon4.test: Likewise.
* tests/checkall.test: Likewise.
* tests/clean.test: Likewise.
* tests/colneq2.test: Likewise.
* tests/colon.test: Likewise.
* tests/colon2.test: Likewise.
* tests/colon4.test: Likewise.
* tests/colon5.test: Likewise.
* tests/colon6.test: Likewise.
* tests/colon7.test: Likewise.
* tests/comment.test: Likewise.
* tests/comment2.test: Likewise.
* tests/compile_f90_c_cxx.test: Likewise.
* tests/compile_f_c_cxx.test: Likewise.
* tests/cond10.test: Likewise.
* tests/cond13.test: Likewise.
* tests/cond14.test: Likewise.
* tests/cond15.test: Likewise.
* tests/cond3.test: Likewise.
* tests/cond4.test: Likewise.
* tests/cond5.test: Likewise.
* tests/cond6.test: Likewise.
* tests/cond8.test: Likewise.
* tests/cond9.test: Likewise.
* tests/condinc.test: Likewise.
* tests/condlib.test: Likewise.
* tests/condman.test: Likewise.
* tests/condman2.test: Likewise.
* tests/conf2.test: Likewise.
* tests/confh.test: Likewise.
* tests/confh4.test: Likewise.
* tests/confincl.test: Likewise.
* tests/confsub.test: Likewise.
* tests/confvar.test: Likewise.
* tests/confvar2.test: Likewise.
* tests/copy.test: Likewise.
* tests/cxx.test: Likewise.
* tests/cxxansi.test: Likewise.
* tests/cxxcpp.test: Likewise.
* tests/cxxlibobj.test: Likewise.
* tests/cxxlink.test: Likewise.
* tests/cxxo.test: Likewise.
* tests/cygwin32.test: Likewise.
* tests/dash.test: Likewise.
* tests/defun2.test: Likewise.
* tests/dejagnu.test: Likewise.
* tests/depcomp.test: Likewise.
* tests/depcomp2.test: Likewise.
* tests/depend3.test: Likewise.
* tests/discover.test: Likewise.
* tests/distcom2.test: Likewise.
* tests/double.test: Likewise.
* tests/empty2.test: Likewise.
* tests/empty3.test: Likewise.
* tests/empty4.test: Likewise.
* tests/exdir.test: Likewise.
* tests/ext.test: Likewise.
* tests/extra.test: Likewise.
* tests/extra2.test: Likewise.
* tests/extra3.test: Likewise.
* tests/extra4.test: Likewise.
* tests/f90only.test: Likewise.
* tests/flibs.test: Likewise.
* tests/fnoc.test: Likewise.
* tests/fo.test: Likewise.
* tests/fonly.test: Likewise.
* tests/fortdep.test: Likewise.
* tests/fpinst2.test: Likewise.
* tests/fpinstall.test: Likewise.
* tests/gcj.test: Likewise.
* tests/gcj3.test: Likewise.
* tests/header.test: Likewise.
* tests/implicit.test: Likewise.
* tests/include.test: Likewise.
* tests/info.test: Likewise.
* tests/insh2.test: Likewise.
* tests/instdat.test: Likewise.
* tests/instexec.test: Likewise.
* tests/instman2.test: Likewise.
* tests/interp.test: Likewise.
* tests/interp2.test: Likewise.
* tests/javaprim.test: Likewise.
* tests/javasubst.test: Likewise.
* tests/ldadd.test: Likewise.
* tests/ldflags.test: Likewise.
* tests/libobj11.test: Likewise.
* tests/libobj2.test: Likewise.
* tests/libobj4.test: Likewise.
* tests/libobj5.test: Likewise.
* tests/libobj7.test: Likewise.
* tests/libobj8.test: Likewise.
* tests/library.test: Likewise.
* tests/libtool.test: Likewise.
* tests/libtool2.test: Likewise.
* tests/link_c_cxx.test: Likewise.
* tests/link_dist.test: Likewise.
* tests/link_f90_only.test: Likewise.
* tests/link_f_only.test: Likewise.
* tests/link_fc.test: Likewise.
* tests/link_fccxx.test: Likewise.
* tests/link_fcxx.test: Likewise.
* tests/listval.test: Likewise.
* tests/ltdeps.test: Likewise.
* tests/ltlibobjs.test: Likewise.
* tests/makevars.test: Likewise.
* tests/man.test: Likewise.
* tests/mclean.test: Likewise.
* tests/mdate.test: Likewise.
* tests/mdate2.test: Likewise.
* tests/mdate3.test: Likewise.
* tests/mdate4.test: Likewise.
* tests/mkinstall.test: Likewise.
* tests/nodep.test: Likewise.
* tests/nodepcomp.test: Likewise.
* tests/nodist.test: Likewise.
* tests/nodist3.test: Likewise.
* tests/noinst.test: Likewise.
* tests/noinstdir.test: Likewise.
* tests/nostdinc.test: Likewise.
* tests/number.test: Likewise.
* tests/objc.test: Likewise.
* tests/obsolete.test: Likewise.
* tests/outdir.test: Likewise.
* tests/output.test: Likewise.
* tests/output2.test: Likewise.
* tests/output3.test: Likewise.
* tests/output4.test: Likewise.
* tests/parse.test: Likewise.
* tests/pluseq.test: Likewise.
* tests/pluseq2.test: Likewise.
* tests/pluseq4.test: Likewise.
* tests/pluseq6.test: Likewise.
* tests/pluseq8.test: Likewise.
* tests/postproc.test: Likewise.
* tests/ppf77.test: Likewise.
* tests/pr243.test: Likewise.
* tests/pr266.test: Likewise.
* tests/pr279-2.test: Likewise.
* tests/pr279.test: Likewise.
* tests/pr72.test: Likewise.
* tests/pr87.test: Likewise.
* tests/pr9.test: Likewise.
* tests/prefix.test: Likewise.
* tests/proginst.test: Likewise.
* tests/recurs2.test: Likewise.
* tests/remake.test: Likewise.
* tests/remake2.test: Likewise.
* tests/remake3.test: Likewise.
* tests/req.test: Likewise.
* tests/rulepat.test: Likewise.
* tests/scripts.test: Likewise.
* tests/space.test: Likewise.
* tests/specflg3.test: Likewise.
* tests/specflg6.test: Likewise.
* tests/spell3.test: Likewise.
* tests/spelling.test: Likewise.
* tests/subcond.test: Likewise.
* tests/subdir.test: Likewise.
* tests/subdir2.test: Likewise.
* tests/subdir3.test: Likewise.
* tests/subdir4.test: Likewise.
* tests/subobj4.test: Likewise.
* tests/subobj8.test: Likewise.
* tests/subst.test: Likewise.
* tests/suffix.test: Likewise.
* tests/suffix3.test: Likewise.
* tests/suffix4.test: Likewise.
* tests/suffix5.test: Likewise.
* tests/suffix6.test: Likewise.
* tests/suffix7.test: Likewise.
* tests/symlink2.test: Likewise.
* tests/symlink3.test: Likewise.
* tests/tags.test: Likewise.
* tests/txinfo.test: Likewise.
* tests/txinfo5.test: Likewise.
* tests/txinfo6.test: Likewise.
* tests/txinfo7.test: Likewise.
* tests/txinfo8.test: Likewise.
* tests/txinfo9.test: Likewise.
* tests/vars.test: Likewise.
* tests/version.test: Likewise.
* tests/version2.test: Likewise.
* tests/version4.test: Likewise.
* tests/vpath.test: Likewise.
* tests/vtexi2.test: Likewise.
* tests/werror.test: Likewise.
---
ChangeLog | 209 ++++++++++++++++++++++++++++++++++++++++++
tests/README | 9 +-
tests/aclocal3.test | 3 +-
tests/acoutnoq.test | 2 +-
tests/acoutpt.test | 2 +-
tests/acoutpt2.test | 8 +-
tests/acoutqnl.test | 3 +-
tests/ammissing.test | 3 +-
tests/ansi.test | 6 +-
tests/ansi2.test | 4 +-
tests/ansi4.test | 6 +-
tests/auxdir.test | 4 +-
tests/auxdir2.test | 2 +-
tests/backsl.test | 4 +-
tests/backsl2.test | 6 +-
tests/badprog.test | 2 +-
tests/block.test | 4 +-
tests/canon2.test | 4 +-
tests/canon3.test | 4 +-
tests/canon4.test | 4 +-
tests/checkall.test | 6 +-
tests/clean.test | 4 +-
tests/colneq2.test | 2 +-
tests/colon.test | 2 +-
tests/colon2.test | 6 +-
tests/colon4.test | 4 +-
tests/colon5.test | 4 +-
tests/colon6.test | 2 +-
tests/colon7.test | 4 +-
tests/comment.test | 2 +-
tests/comment2.test | 4 +-
tests/compile_f90_c_cxx.test | 13 +--
tests/compile_f_c_cxx.test | 13 +--
tests/cond10.test | 6 +-
tests/cond13.test | 4 +-
tests/cond14.test | 4 +-
tests/cond15.test | 8 +-
tests/cond3.test | 6 +-
tests/cond4.test | 24 +++---
tests/cond5.test | 2 +-
tests/cond6.test | 2 +-
tests/cond8.test | 2 +-
tests/cond9.test | 10 +-
tests/condinc.test | 10 +--
tests/condlib.test | 4 +-
tests/condman.test | 2 +-
tests/condman2.test | 10 +-
tests/conf2.test | 2 +-
tests/confh.test | 12 +-
tests/confh4.test | 4 +-
tests/confincl.test | 10 +-
tests/confsub.test | 14 +--
tests/confvar.test | 4 +-
tests/confvar2.test | 2 +-
tests/copy.test | 2 +-
tests/cxx.test | 4 +-
tests/cxxansi.test | 8 +-
tests/cxxcpp.test | 4 +-
tests/cxxlibobj.test | 4 +-
tests/cxxlink.test | 4 +-
tests/cxxo.test | 4 +-
tests/cygwin32.test | 4 +-
tests/dash.test | 2 +-
tests/defs.in | 3 +
tests/defun2.test | 2 +-
tests/dejagnu.test | 4 +-
tests/depcomp.test | 6 +-
tests/depcomp2.test | 8 +-
tests/depend3.test | 2 +-
tests/discover.test | 5 +-
tests/distcom2.test | 12 +-
tests/double.test | 2 +-
tests/empty2.test | 4 +-
tests/empty3.test | 4 +-
tests/empty4.test | 4 +-
tests/exdir.test | 4 +-
tests/ext.test | 4 +-
tests/extra.test | 6 +-
tests/extra2.test | 4 +-
tests/extra3.test | 2 +-
tests/extra4.test | 2 +-
tests/f90only.test | 4 +-
tests/flibs.test | 4 +-
tests/fnoc.test | 4 +-
tests/fo.test | 4 +-
tests/fonly.test | 4 +-
tests/fortdep.test | 4 +-
tests/fpinst2.test | 4 +-
tests/fpinstall.test | 4 +-
tests/gcj.test | 4 +-
tests/gcj3.test | 4 +-
tests/header.test | 4 +-
tests/implicit.test | 4 +-
tests/include.test | 6 +-
tests/info.test | 4 +-
tests/insh2.test | 6 +-
tests/instdat.test | 4 +-
tests/instexec.test | 4 +-
tests/instman2.test | 4 +-
tests/interp.test | 4 +-
tests/interp2.test | 2 +-
tests/javaprim.test | 2 +-
tests/javasubst.test | 4 +-
tests/ldadd.test | 5 +-
tests/ldflags.test | 2 +-
tests/libobj11.test | 4 +-
tests/libobj2.test | 4 +-
tests/libobj4.test | 2 +-
tests/libobj5.test | 4 +-
tests/libobj7.test | 4 +-
tests/libobj8.test | 4 +-
tests/library.test | 2 +-
tests/libtool.test | 4 +-
tests/libtool2.test | 4 +-
tests/link_c_cxx.test | 6 +-
tests/link_dist.test | 6 +-
tests/link_f90_only.test | 6 +-
tests/link_f_only.test | 6 +-
tests/link_fc.test | 6 +-
tests/link_fccxx.test | 6 +-
tests/link_fcxx.test | 6 +-
tests/listval.test | 2 +-
tests/ltdeps.test | 4 +-
tests/ltlibobjs.test | 2 +-
tests/makevars.test | 4 +-
tests/man.test | 4 +-
tests/mclean.test | 4 +-
tests/mdate.test | 2 +-
tests/mdate2.test | 4 +-
tests/mdate3.test | 8 +-
tests/mdate4.test | 4 +-
tests/mkinstall.test | 4 +-
tests/nodep.test | 4 +-
tests/nodepcomp.test | 2 +-
tests/nodist.test | 8 +-
tests/nodist3.test | 4 +-
tests/noinst.test | 4 +-
tests/noinstdir.test | 4 +-
tests/nostdinc.test | 4 +-
tests/number.test | 4 +-
tests/objc.test | 4 +-
tests/obsolete.test | 12 ++-
tests/outdir.test | 4 +-
tests/output.test | 2 +-
tests/output2.test | 4 +-
tests/output3.test | 2 +-
tests/output4.test | 4 +-
tests/parse.test | 4 +-
tests/pluseq.test | 4 +-
tests/pluseq2.test | 6 +-
tests/pluseq4.test | 4 +-
tests/pluseq6.test | 6 +-
tests/pluseq8.test | 4 +-
tests/postproc.test | 12 +--
tests/ppf77.test | 2 +-
tests/pr243.test | 8 +-
tests/pr266.test | 8 +-
tests/pr279-2.test | 8 +-
tests/pr279.test | 2 +-
tests/pr72.test | 4 +-
tests/pr87.test | 12 +-
tests/pr9.test | 14 ++--
tests/prefix.test | 2 +-
tests/proginst.test | 2 +-
tests/recurs2.test | 2 +-
tests/remake.test | 4 +-
tests/remake2.test | 4 +-
tests/remake3.test | 4 +-
tests/req.test | 2 +-
tests/rulepat.test | 4 +-
tests/scripts.test | 2 +-
tests/space.test | 2 +-
tests/specflg3.test | 14 +--
tests/specflg6.test | 10 +-
tests/spell3.test | 2 +-
tests/spelling.test | 7 +-
tests/subcond.test | 2 +-
tests/subdir.test | 2 +-
tests/subdir2.test | 2 +-
tests/subdir3.test | 4 +-
tests/subdir4.test | 4 +-
tests/subobj4.test | 4 +-
tests/subobj8.test | 6 +-
tests/subst.test | 4 +-
tests/suffix.test | 10 +-
tests/suffix3.test | 7 +-
tests/suffix4.test | 7 +-
tests/suffix5.test | 7 +-
tests/suffix6.test | 8 +-
tests/suffix7.test | 4 +-
tests/symlink2.test | 2 +-
tests/symlink3.test | 4 +-
tests/tags.test | 4 +-
tests/txinfo.test | 6 +-
tests/txinfo5.test | 2 +-
tests/txinfo6.test | 4 +-
tests/txinfo7.test | 4 +-
tests/txinfo8.test | 11 +--
tests/txinfo9.test | 4 +-
tests/vars.test | 2 +-
tests/version.test | 2 +-
tests/version2.test | 2 +-
tests/version4.test | 2 +-
tests/vpath.test | 4 +-
tests/vtexi2.test | 4 +-
tests/werror.test | 2 +-
206 files changed, 680 insertions(+), 497 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index be5dbae..128a30c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,212 @@
+2010-03-31 Stefano Lattarini <address@hidden>
+
+ Use `set -e' in all test scripts.
+ * tests/defs.in: Set the `errexit' a.k.a. `set -e' shell flag.
+ * tests/README: Modified accordingly.
+ * tests/aclocal3.test: Likewise.
+ * tests/acoutnoq.test: Likewise.
+ * tests/acoutpt.test: Likewise.
+ * tests/acoutpt2.test: Likewise.
+ * tests/acoutqnl.test: Likewise.
+ * tests/ammissing.test: Likewise.
+ * tests/ansi.test: Likewise.
+ * tests/ansi2.test: Likewise.
+ * tests/ansi4.test: Likewise.
+ * tests/auxdir.test: Likewise.
+ * tests/auxdir2.test: Likewise.
+ * tests/backsl.test: Likewise.
+ * tests/backsl2.test: Likewise.
+ * tests/badprog.test: Likewise.
+ * tests/block.test: Likewise.
+ * tests/canon2.test: Likewise.
+ * tests/canon3.test: Likewise.
+ * tests/canon4.test: Likewise.
+ * tests/checkall.test: Likewise.
+ * tests/clean.test: Likewise.
+ * tests/colneq2.test: Likewise.
+ * tests/colon.test: Likewise.
+ * tests/colon2.test: Likewise.
+ * tests/colon4.test: Likewise.
+ * tests/colon5.test: Likewise.
+ * tests/colon6.test: Likewise.
+ * tests/colon7.test: Likewise.
+ * tests/comment.test: Likewise.
+ * tests/comment2.test: Likewise.
+ * tests/compile_f90_c_cxx.test: Likewise.
+ * tests/compile_f_c_cxx.test: Likewise.
+ * tests/cond10.test: Likewise.
+ * tests/cond13.test: Likewise.
+ * tests/cond14.test: Likewise.
+ * tests/cond15.test: Likewise.
+ * tests/cond3.test: Likewise.
+ * tests/cond4.test: Likewise.
+ * tests/cond5.test: Likewise.
+ * tests/cond6.test: Likewise.
+ * tests/cond8.test: Likewise.
+ * tests/cond9.test: Likewise.
+ * tests/condinc.test: Likewise.
+ * tests/condlib.test: Likewise.
+ * tests/condman.test: Likewise.
+ * tests/condman2.test: Likewise.
+ * tests/conf2.test: Likewise.
+ * tests/confh.test: Likewise.
+ * tests/confh4.test: Likewise.
+ * tests/confincl.test: Likewise.
+ * tests/confsub.test: Likewise.
+ * tests/confvar.test: Likewise.
+ * tests/confvar2.test: Likewise.
+ * tests/copy.test: Likewise.
+ * tests/cxx.test: Likewise.
+ * tests/cxxansi.test: Likewise.
+ * tests/cxxcpp.test: Likewise.
+ * tests/cxxlibobj.test: Likewise.
+ * tests/cxxlink.test: Likewise.
+ * tests/cxxo.test: Likewise.
+ * tests/cygwin32.test: Likewise.
+ * tests/dash.test: Likewise.
+ * tests/defun2.test: Likewise.
+ * tests/dejagnu.test: Likewise.
+ * tests/depcomp.test: Likewise.
+ * tests/depcomp2.test: Likewise.
+ * tests/depend3.test: Likewise.
+ * tests/discover.test: Likewise.
+ * tests/distcom2.test: Likewise.
+ * tests/double.test: Likewise.
+ * tests/empty2.test: Likewise.
+ * tests/empty3.test: Likewise.
+ * tests/empty4.test: Likewise.
+ * tests/exdir.test: Likewise.
+ * tests/ext.test: Likewise.
+ * tests/extra.test: Likewise.
+ * tests/extra2.test: Likewise.
+ * tests/extra3.test: Likewise.
+ * tests/extra4.test: Likewise.
+ * tests/f90only.test: Likewise.
+ * tests/flibs.test: Likewise.
+ * tests/fnoc.test: Likewise.
+ * tests/fo.test: Likewise.
+ * tests/fonly.test: Likewise.
+ * tests/fortdep.test: Likewise.
+ * tests/fpinst2.test: Likewise.
+ * tests/fpinstall.test: Likewise.
+ * tests/gcj.test: Likewise.
+ * tests/gcj3.test: Likewise.
+ * tests/header.test: Likewise.
+ * tests/implicit.test: Likewise.
+ * tests/include.test: Likewise.
+ * tests/info.test: Likewise.
+ * tests/insh2.test: Likewise.
+ * tests/instdat.test: Likewise.
+ * tests/instexec.test: Likewise.
+ * tests/instman2.test: Likewise.
+ * tests/interp.test: Likewise.
+ * tests/interp2.test: Likewise.
+ * tests/javaprim.test: Likewise.
+ * tests/javasubst.test: Likewise.
+ * tests/ldadd.test: Likewise.
+ * tests/ldflags.test: Likewise.
+ * tests/libobj11.test: Likewise.
+ * tests/libobj2.test: Likewise.
+ * tests/libobj4.test: Likewise.
+ * tests/libobj5.test: Likewise.
+ * tests/libobj7.test: Likewise.
+ * tests/libobj8.test: Likewise.
+ * tests/library.test: Likewise.
+ * tests/libtool.test: Likewise.
+ * tests/libtool2.test: Likewise.
+ * tests/link_c_cxx.test: Likewise.
+ * tests/link_dist.test: Likewise.
+ * tests/link_f90_only.test: Likewise.
+ * tests/link_f_only.test: Likewise.
+ * tests/link_fc.test: Likewise.
+ * tests/link_fccxx.test: Likewise.
+ * tests/link_fcxx.test: Likewise.
+ * tests/listval.test: Likewise.
+ * tests/ltdeps.test: Likewise.
+ * tests/ltlibobjs.test: Likewise.
+ * tests/makevars.test: Likewise.
+ * tests/man.test: Likewise.
+ * tests/mclean.test: Likewise.
+ * tests/mdate.test: Likewise.
+ * tests/mdate2.test: Likewise.
+ * tests/mdate3.test: Likewise.
+ * tests/mdate4.test: Likewise.
+ * tests/mkinstall.test: Likewise.
+ * tests/nodep.test: Likewise.
+ * tests/nodepcomp.test: Likewise.
+ * tests/nodist.test: Likewise.
+ * tests/nodist3.test: Likewise.
+ * tests/noinst.test: Likewise.
+ * tests/noinstdir.test: Likewise.
+ * tests/nostdinc.test: Likewise.
+ * tests/number.test: Likewise.
+ * tests/objc.test: Likewise.
+ * tests/obsolete.test: Likewise.
+ * tests/outdir.test: Likewise.
+ * tests/output.test: Likewise.
+ * tests/output2.test: Likewise.
+ * tests/output3.test: Likewise.
+ * tests/output4.test: Likewise.
+ * tests/parse.test: Likewise.
+ * tests/pluseq.test: Likewise.
+ * tests/pluseq2.test: Likewise.
+ * tests/pluseq4.test: Likewise.
+ * tests/pluseq6.test: Likewise.
+ * tests/pluseq8.test: Likewise.
+ * tests/postproc.test: Likewise.
+ * tests/ppf77.test: Likewise.
+ * tests/pr243.test: Likewise.
+ * tests/pr266.test: Likewise.
+ * tests/pr279-2.test: Likewise.
+ * tests/pr279.test: Likewise.
+ * tests/pr72.test: Likewise.
+ * tests/pr87.test: Likewise.
+ * tests/pr9.test: Likewise.
+ * tests/prefix.test: Likewise.
+ * tests/proginst.test: Likewise.
+ * tests/recurs2.test: Likewise.
+ * tests/remake.test: Likewise.
+ * tests/remake2.test: Likewise.
+ * tests/remake3.test: Likewise.
+ * tests/req.test: Likewise.
+ * tests/rulepat.test: Likewise.
+ * tests/scripts.test: Likewise.
+ * tests/space.test: Likewise.
+ * tests/specflg3.test: Likewise.
+ * tests/specflg6.test: Likewise.
+ * tests/spell3.test: Likewise.
+ * tests/spelling.test: Likewise.
+ * tests/subcond.test: Likewise.
+ * tests/subdir.test: Likewise.
+ * tests/subdir2.test: Likewise.
+ * tests/subdir3.test: Likewise.
+ * tests/subdir4.test: Likewise.
+ * tests/subobj4.test: Likewise.
+ * tests/subobj8.test: Likewise.
+ * tests/subst.test: Likewise.
+ * tests/suffix.test: Likewise.
+ * tests/suffix3.test: Likewise.
+ * tests/suffix4.test: Likewise.
+ * tests/suffix5.test: Likewise.
+ * tests/suffix6.test: Likewise.
+ * tests/suffix7.test: Likewise.
+ * tests/symlink2.test: Likewise.
+ * tests/symlink3.test: Likewise.
+ * tests/tags.test: Likewise.
+ * tests/txinfo.test: Likewise.
+ * tests/txinfo5.test: Likewise.
+ * tests/txinfo6.test: Likewise.
+ * tests/txinfo7.test: Likewise.
+ * tests/txinfo8.test: Likewise.
+ * tests/txinfo9.test: Likewise.
+ * tests/vars.test: Likewise.
+ * tests/version.test: Likewise.
+ * tests/version2.test: Likewise.
+ * tests/version4.test: Likewise.
+ * tests/vpath.test: Likewise.
+ * tests/vtexi2.test: Likewise.
+ * tests/werror.test: Likewise.
+
2010-03-28 Ralf Wildenhues <address@hidden>
Remove uses of @acronym and @sc.
diff --git a/tests/README b/tests/README
index c34bfd8..4c059e8 100644
--- a/tests/README
+++ b/tests/README
@@ -127,7 +127,10 @@ Do
but do not output anything by default. If you need ./configure
to create Makefile, append AC_OUTPUT to configure.in.
- Use `set -e' to catch failures you might not have thought of.
+ Note that ./defs calls `set -e', so that test scripts can catch errors
+ you might not have thought of. Keep this in mind when writing or
+ modifying test scripts, lest you experience spurious or unexpected
+ failures.
Use $ACLOCAL, $AUTOMAKE, $AUTOCONF, $AUTOUPDATE, $AUTOHEADER,
$PERL, $MAKE, $EGREP, and $FGREP, instead of the corresponding
@@ -140,8 +143,8 @@ Do
interesting for debugging, so that when a user send a verbose
output we don't have to ask him for more details. Display stderr
output on the stderr file descriptor. If some redirected command
- is likely to fail, and `set -e' is in effect, display its output
- even in the failure case, before exiting.
+ is likely to fail, and `set -e' is in effect (as is by default),
+ display its output even in the failure case, before exiting.
Use `Exit' rather than `exit' to abort a test.
diff --git a/tests/aclocal3.test b/tests/aclocal3.test
index a550e50..b4d2f97 100755
--- a/tests/aclocal3.test
+++ b/tests/aclocal3.test
@@ -27,6 +27,5 @@ AC_DEFUN([GNOME_X_CHECKS], [
])
END
-$ACLOCAL -I macros 2>stderr
-cat stderr
+$ACLOCAL -I macros 2>stderr && { cat stderr >&2; Exit 1; }
grep 'macros/gnome.m4:2:.*AM_PATH_GTK.*not found' stderr
diff --git a/tests/acoutnoq.test b/tests/acoutnoq.test
index b7bb616..8a96c78 100755
--- a/tests/acoutnoq.test
+++ b/tests/acoutnoq.test
@@ -30,5 +30,5 @@ END
: > Makefile.am
-$ACLOCAL || Exit 1
+$ACLOCAL
$AUTOMAKE
diff --git a/tests/acoutpt.test b/tests/acoutpt.test
index b0e44ee..f933c40 100755
--- a/tests/acoutpt.test
+++ b/tests/acoutpt.test
@@ -27,5 +27,5 @@ END
: > Makefile.am
-$ACLOCAL || Exit 1
+$ACLOCAL
$AUTOMAKE
diff --git a/tests/acoutpt2.test b/tests/acoutpt2.test
index fb8fbcf..dcb7bd0 100755
--- a/tests/acoutpt2.test
+++ b/tests/acoutpt2.test
@@ -31,12 +31,12 @@ mkdir subdir
: > foo.in
: > subdir/foo.in
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
count=`$FGREP foo.in Makefile.in | wc -l`
-test $count -eq 2 || Exit 1
+test $count -eq 2
# This ought to work as well.
-$ACLOCAL || Exit 1
+$ACLOCAL
$AUTOMAKE --add-missing --force-missing
diff --git a/tests/acoutqnl.test b/tests/acoutqnl.test
index 70c5cbc..a8c79fa 100755
--- a/tests/acoutqnl.test
+++ b/tests/acoutqnl.test
@@ -27,6 +27,5 @@ END
: > Makefile.am
-$ACLOCAL || Exit 1
+$ACLOCAL
$AUTOMAKE
-
diff --git a/tests/ammissing.test b/tests/ammissing.test
index 61d360a..a02de55 100755
--- a/tests/ammissing.test
+++ b/tests/ammissing.test
@@ -20,6 +20,5 @@
echo AM_ZARDOZ >> configure.in
-$ACLOCAL 2>stderr
-cat stderr
+$ACLOCAL 2>stderr && { cat stderr >&2; Exit 1; }
grep 'configure.in:.*AM_ZARDOZ.*not found' stderr
diff --git a/tests/ansi.test b/tests/ansi.test
index cd9a07b..7032bf5 100755
--- a/tests/ansi.test
+++ b/tests/ansi.test
@@ -33,8 +33,8 @@ END
: > ansi2knr.c
: > ansi2knr.1
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
-$FGREP -v @SET_MAKE@ Makefile.in > Makefile.sed
+sed '/@SET_MAKE@/d' Makefile.in > Makefile.sed
$MAKE -s -f Makefile.sed SHELL=$SHELL magic | grep 'ansi2knr\.c'
diff --git a/tests/ansi2.test b/tests/ansi2.test
index c0409a3..5f3118d 100755
--- a/tests/ansi2.test
+++ b/tests/ansi2.test
@@ -31,7 +31,7 @@ END
: > ansi2knr.c
: > ansi2knr.1
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
grep '^all[-a-z]*:.*ANSI2KNR' Makefile.in
diff --git a/tests/ansi4.test b/tests/ansi4.test
index baff19a..fde2da7 100755
--- a/tests/ansi4.test
+++ b/tests/ansi4.test
@@ -33,7 +33,7 @@ END
: > ansi2knr.c
: > hello.c
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
-$FGREP 'ansi2knr.$(' Makefile.in || Exit 1
+$FGREP 'ansi2knr.$(' Makefile.in
diff --git a/tests/auxdir.test b/tests/auxdir.test
index 95a7a20..ada3829 100755
--- a/tests/auxdir.test
+++ b/tests/auxdir.test
@@ -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
+$AUTOMAKE ././Makefile
grep '/\./\./mkinstalldirs' Makefile.in
diff --git a/tests/auxdir2.test b/tests/auxdir2.test
index 590a5df..2d5c3bc 100755
--- a/tests/auxdir2.test
+++ b/tests/auxdir2.test
@@ -29,5 +29,5 @@ END
: > Makefile.am
-$ACLOCAL || Exit 1
+$ACLOCAL
$AUTOMAKE
diff --git a/tests/backsl.test b/tests/backsl.test
index e5d2b39..13748d7 100755
--- a/tests/backsl.test
+++ b/tests/backsl.test
@@ -27,8 +27,8 @@ bin_PROGRAMS = \
frob
END
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
grep '^_SOURCE' Makefile.in && Exit 1
Exit 0
diff --git a/tests/backsl2.test b/tests/backsl2.test
index ba62db7..0d8d52f 100755
--- a/tests/backsl2.test
+++ b/tests/backsl2.test
@@ -24,7 +24,5 @@ SUBDIRS = \
.
END
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
-
-Exit 0
+$ACLOCAL
+$AUTOMAKE
diff --git a/tests/badprog.test b/tests/badprog.test
index b8d45e9..5dffb0f 100755
--- a/tests/badprog.test
+++ b/tests/badprog.test
@@ -28,5 +28,5 @@ bin_PROGRAMS = a,b
a_b_SOURCES = ab.c
END
-$ACLOCAL || Exit 1
+$ACLOCAL
$AUTOMAKE
diff --git a/tests/block.test b/tests/block.test
index 8b4692a..32abab7 100755
--- a/tests/block.test
+++ b/tests/block.test
@@ -27,8 +27,8 @@ cat > Makefile.am << 'END'
#END
END
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
(sed -e '/^#START/,/^#END/ !d' Makefile.in | grep -v '^#') && Exit 1
Exit 0
diff --git a/tests/canon2.test b/tests/canon2.test
index e8acb81..327d801 100755
--- a/tests/canon2.test
+++ b/tests/canon2.test
@@ -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
+$AUTOMAKE
grep zar-doz_TEXINFOS Makefile.in && Exit 1
Exit 0
diff --git a/tests/canon3.test b/tests/canon3.test
index da347eb..40bdd79 100755
--- a/tests/canon3.test
+++ b/tests/canon3.test
@@ -28,8 +28,8 @@ END
: > perm-number.c
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
grep 'perm_number\.c' Makefile.in && Exit 1
Exit 0
diff --git a/tests/canon4.test b/tests/canon4.test
index 607ba2e..b8fc802 100755
--- a/tests/canon4.test
+++ b/tests/canon4.test
@@ -28,8 +28,8 @@ noinst_LIBRARIES = libx-y.a
libx_y_a_SOURCES = xy.c
END
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
grep '^libx-y.*=' Makefile.in && Exit 1
Exit 0
diff --git a/tests/checkall.test b/tests/checkall.test
index 4e7388b..b2f4137 100755
--- a/tests/checkall.test
+++ b/tests/checkall.test
@@ -24,8 +24,8 @@ check-local:
true
END
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
-grep '^check-am:.*all-am' Makefile.in || Exit 1
+grep '^check-am:.*all-am' Makefile.in
grep 'MAKE.*check-local' Makefile.in
diff --git a/tests/clean.test b/tests/clean.test
index df1c168..b276e37 100755
--- a/tests/clean.test
+++ b/tests/clean.test
@@ -20,7 +20,7 @@
: > Makefile.am
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
grep '^clean-am:.*mostlyclean-am' Makefile.in
diff --git a/tests/colneq2.test b/tests/colneq2.test
index bca83ce..2a7d141 100755
--- a/tests/colneq2.test
+++ b/tests/colneq2.test
@@ -27,5 +27,5 @@ END
: > b.test
: > c.test
-$ACLOCAL || Exit 1
+$ACLOCAL
$AUTOMAKE
diff --git a/tests/colon.test b/tests/colon.test
index 2fd0538..6ebb706 100755
--- a/tests/colon.test
+++ b/tests/colon.test
@@ -29,5 +29,5 @@ END
: > foo.hin
: > stamp-h.in
-$ACLOCAL || Exit 1
+$ACLOCAL
$AUTOMAKE
diff --git a/tests/colon2.test b/tests/colon2.test
index ebb2bfe..283faa9 100755
--- a/tests/colon2.test
+++ b/tests/colon2.test
@@ -26,10 +26,10 @@ END
: > zardoz.am
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
# We actually check several things here.
-test -f zardoz.in || Exit 1
+test -f zardoz.in
grep '^zardoz:' zardoz.in && Exit 1
Exit 0
diff --git a/tests/colon4.test b/tests/colon4.test
index cec3c86..2e976e1 100755
--- a/tests/colon4.test
+++ b/tests/colon4.test
@@ -31,8 +31,8 @@ END
: > two
: > three
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
# The rule should regenerate the file "zardoz".
grep '^zardoz:one:two' Makefile.in && Exit 1
diff --git a/tests/colon5.test b/tests/colon5.test
index 7813d94..ab234b3 100755
--- a/tests/colon5.test
+++ b/tests/colon5.test
@@ -27,7 +27,7 @@ END
: > Makefile.am
: > Makefile.dep
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
grep 'Makefile:Makefile.in' Makefile.in
diff --git a/tests/colon6.test b/tests/colon6.test
index 5bd9964..0471977 100755
--- a/tests/colon6.test
+++ b/tests/colon6.test
@@ -29,5 +29,5 @@ mkdir demo
: > demo/Makefile.am
: > demo/version.gin
-$ACLOCAL || Exit 1
+$ACLOCAL
$AUTOMAKE
diff --git a/tests/colon7.test b/tests/colon7.test
index 4df6a13..d29cab4 100755
--- a/tests/colon7.test
+++ b/tests/colon7.test
@@ -34,8 +34,8 @@ mkdir subdir
: > subdir/Makefile.am
: > subdir/foo
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
# shouldn't have any bar.in
grep 'bar.in' subdir/Makefile.in && Exit 1
diff --git a/tests/comment.test b/tests/comment.test
index 0051cd0..28207a4 100755
--- a/tests/comment.test
+++ b/tests/comment.test
@@ -23,5 +23,5 @@ cat > Makefile.am << 'END'
AUTOMAKE_OPTIONS = #no such option
END
-$ACLOCAL || Exit 1
+$ACLOCAL
$AUTOMAKE
diff --git a/tests/comment2.test b/tests/comment2.test
index 2073328..1b2dcd5 100755
--- a/tests/comment2.test
+++ b/tests/comment2.test
@@ -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
+$AUTOMAKE
grep '^image_proc' Makefile.in && Exit 1
Exit 0
diff --git a/tests/compile_f90_c_cxx.test b/tests/compile_f90_c_cxx.test
index a685a29..0abdfc9 100755
--- a/tests/compile_f90_c_cxx.test
+++ b/tests/compile_f90_c_cxx.test
@@ -37,14 +37,11 @@ END
: > bar.c
: > baz.cc
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
-
+$ACLOCAL
+$AUTOMAKE
# Look for the macros at the beginning of rules. Be careful, as there
# are literal tabs at the beginning of the search strings.
-grep ' \$(COMPILE)' Makefile.in || Exit 1
-grep ' \$(CXXCOMPILE)' Makefile.in || Exit 1
-grep ' \$(FCCOMPILE)' Makefile.in || Exit 1
-
-Exit 0
+grep ' \$(COMPILE)' Makefile.in
+grep ' \$(CXXCOMPILE)' Makefile.in
+grep ' \$(FCCOMPILE)' Makefile.in
diff --git a/tests/compile_f_c_cxx.test b/tests/compile_f_c_cxx.test
index 941c7db..1a9c86c 100755
--- a/tests/compile_f_c_cxx.test
+++ b/tests/compile_f_c_cxx.test
@@ -37,14 +37,11 @@ END
: > bar.c
: > baz.cc
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
-
+$ACLOCAL
+$AUTOMAKE
# Look for the macros at the beginning of rules. Be careful, as there
# are literal tabs at the beginning of the search strings.
-grep ' \$(COMPILE)' Makefile.in || Exit 1
-grep ' \$(CXXCOMPILE)' Makefile.in || Exit 1
-grep ' \$(F77COMPILE)' Makefile.in || Exit 1
-
-Exit 0
+grep ' \$(COMPILE)' Makefile.in
+grep ' \$(CXXCOMPILE)' Makefile.in
+grep ' \$(F77COMPILE)' Makefile.in
diff --git a/tests/cond10.test b/tests/cond10.test
index ec5766b..2048f82 100755
--- a/tests/cond10.test
+++ b/tests/cond10.test
@@ -42,6 +42,6 @@ noinst_PROGRAMS=foo
foo_SOURCES=foo.c $(out)
END
-$ACLOCAL \
- && $AUTOMAKE -a \
- && grep 'USE_A_FALSE.*USE_B_FALSE.*output_c\...OBJEXT.' Makefile.in
+$ACLOCAL
+$AUTOMAKE -a
+grep 'USE_A_FALSE.*USE_B_FALSE.*output_c\...OBJEXT.' Makefile.in
diff --git a/tests/cond13.test b/tests/cond13.test
index 3cf5462..ca8488e 100755
--- a/tests/cond13.test
+++ b/tests/cond13.test
@@ -47,7 +47,7 @@ endif
libtest_a_SOURCES = $(TESTSOURCES)
END
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
grep 'am_libtest_a_OBJECTS = .*$' Makefile.in
diff --git a/tests/cond14.test b/tests/cond14.test
index 2181325..d9ad668 100755
--- a/tests/cond14.test
+++ b/tests/cond14.test
@@ -43,8 +43,8 @@ endif
bin_PROGRAMS = $(BUILD_helldl)
END
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
num=`grep 'helldl$(EXEEXT):' Makefile.in | wc -l`
test $num -eq 2
diff --git a/tests/cond15.test b/tests/cond15.test
index a371baa..0c78e0f 100755
--- a/tests/cond15.test
+++ b/tests/cond15.test
@@ -50,10 +50,10 @@ endif
bin_PROGRAMS = helldl
END
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
num1=`grep 'helldl$(EXEEXT):' Makefile.in | wc -l`
num2=`grep '@COND1_FALSE@@address@hidden(EXEEXT):' Makefile.in | wc -l`
-test $num1 -eq 4 || Exit 1
-test $num2 -eq 1 || Exit 1
+test $num1 -eq 4
+test $num2 -eq 1
diff --git a/tests/cond3.test b/tests/cond3.test
index 6728721..cb20692 100755
--- a/tests/cond3.test
+++ b/tests/cond3.test
@@ -53,8 +53,8 @@ endif
targ_SOURCES = $(SONE) $(STWO) $(STHREE)
END
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
# `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
diff --git a/tests/cond4.test b/tests/cond4.test
index cc569d6..e314c34 100755
--- a/tests/cond4.test
+++ b/tests/cond4.test
@@ -45,25 +45,25 @@ echo-objects:
@echo $(targ_OBJECTS)
END
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
# We should not output useless definitions.
-test "`grep 'address@hidden@' Makefile.in | wc -l`" -eq 0 || Exit 1
+test "`grep 'address@hidden@' Makefile.in | wc -l`" -eq 0
-$AUTOCONF || Exit 1
+$AUTOCONF
# Ignore user CFLAGS.
CFLAGS=
export CFLAGS
-CONDITION1=true CONDITION2=true ./configure || Exit 1
+CONDITION1=true CONDITION2=true ./configure
msgtt=`$MAKE --no-print-directory echo-objects`
-CONDITION1=true CONDITION2=false ./configure || Exit 1
+CONDITION1=true CONDITION2=false ./configure
msgtf=`$MAKE --no-print-directory echo-objects`
-CONDITION1=false CONDITION2=true ./configure || Exit 1
+CONDITION1=false CONDITION2=true ./configure
msgft=`$MAKE --no-print-directory echo-objects`
-CONDITION1=false CONDITION2=false ./configure || Exit 1
+CONDITION1=false CONDITION2=false ./configure
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"
+test "$msgtf" = "main.o one.o"
+test "$msgft" = "main.o two.o"
+test "$msgff" = "main.o"
diff --git a/tests/cond5.test b/tests/cond5.test
index 531cda8..1ff6955 100755
--- a/tests/cond5.test
+++ b/tests/cond5.test
@@ -43,7 +43,7 @@ END
# The bug is that automake hangs. So we give it a few seconds and
# then kill it.
-$ACLOCAL || Exit 1
+$ACLOCAL
$AUTOMAKE &
pid=$!
diff --git a/tests/cond6.test b/tests/cond6.test
index 1f442f9..a9aadbd 100755
--- a/tests/cond6.test
+++ b/tests/cond6.test
@@ -37,5 +37,5 @@ help_DATA = foo
endif
END
-$ACLOCAL || Exit 1
+$ACLOCAL
$AUTOMAKE
diff --git a/tests/cond8.test b/tests/cond8.test
index 195a912..dfd7db6 100755
--- a/tests/cond8.test
+++ b/tests/cond8.test
@@ -30,5 +30,5 @@ noinst_PROGRAMS = x y
endif
END
-$ACLOCAL || Exit 1
+$ACLOCAL
$AUTOMAKE
diff --git a/tests/cond9.test b/tests/cond9.test
index dd59758..28e1694 100755
--- a/tests/cond9.test
+++ b/tests/cond9.test
@@ -36,8 +36,8 @@ echo-something:
echo '$(this)'
END
-$ACLOCAL \
- && $AUTOCONF \
- && $AUTOMAKE -a \
- && ./configure \
- && $MAKE echo-something | grep interesting > /dev/null
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
+./configure
+$MAKE echo-something | grep interesting
diff --git a/tests/condinc.test b/tests/condinc.test
index eddd3bc..aa62ba8 100755
--- a/tests/condinc.test
+++ b/tests/condinc.test
@@ -33,11 +33,7 @@ target: dependency
rule
END
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
-
+$ACLOCAL
+$AUTOMAKE
grep '^target:' Makefile.in && Exit 1
-
-grep 'address@hidden@target:' Makefile.in || Exit 1
-
-Exit 0
+grep 'address@hidden@target:' Makefile.in
diff --git a/tests/condlib.test b/tests/condlib.test
index 49cc9f1..5b67582 100755
--- a/tests/condlib.test
+++ b/tests/condlib.test
@@ -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
+$AUTOMAKE
$FGREP librsaref.a.c Makefile.in && Exit 1
Exit 0
diff --git a/tests/condman.test b/tests/condman.test
index 3dc8bcd..01db4dd 100755
--- a/tests/condman.test
+++ b/tests/condman.test
@@ -32,5 +32,5 @@ END
: > foo.1
: > joe.1
-$ACLOCAL || Exit 1
+$ACLOCAL
$AUTOMAKE
diff --git a/tests/condman2.test b/tests/condman2.test
index 0b448e2..eaf22b2 100755
--- a/tests/condman2.test
+++ b/tests/condman2.test
@@ -22,9 +22,9 @@ man_MANS = foo.1 foo.2
man5_MANS = foo.5
END
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
-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
+grep '^install-man2:' Makefile.in
+grep '^install-man5:' Makefile.in
diff --git a/tests/conf2.test b/tests/conf2.test
index 23a8a5b..1222fcb 100755
--- a/tests/conf2.test
+++ b/tests/conf2.test
@@ -31,5 +31,5 @@ END
: > config.h.in
: > two.h.in
-$ACLOCAL || Exit 1
+$ACLOCAL
$AUTOMAKE
diff --git a/tests/confh.test b/tests/confh.test
index 772a763..62de270 100755
--- a/tests/confh.test
+++ b/tests/confh.test
@@ -33,8 +33,8 @@ mkdir include
: > include/Makefile.am
: > include/config.h.in
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
(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)
# Make sure re-running automake in a different way generates same
# Makefile.in.
mv Makefile.in save
-$ACLOCAL || Exit 1
-$AUTOMAKE Makefile || Exit 1
-cmp Makefile.in save
+$ACLOCAL
+$AUTOMAKE Makefile
+diff Makefile.in save
diff --git a/tests/confh4.test b/tests/confh4.test
index a93e38d..b923500 100755
--- a/tests/confh4.test
+++ b/tests/confh4.test
@@ -38,7 +38,7 @@ mkdir include
: > include/Makefile.am
: > include/config.h.in
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
$EGREP '^DEFAULT_INCLUDES =.* -I(\.|\$\(top_builddir\))/include' Makefile.in
diff --git a/tests/confincl.test b/tests/confincl.test
index dd0b63e..9cc4bd1 100755
--- a/tests/confincl.test
+++ b/tests/confincl.test
@@ -28,10 +28,8 @@ cat > Makefile.am << 'EOF'
bin_PROGRAMS = fred
EOF
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
-if grep '@CONFIG_INCLUDE_SPEC@' Makefile.in; then
- Exit 1
-fi
-Exit 0
+grep '@CONFIG_INCLUDE_SPEC@' Makefile.in && Exit 1
+:
diff --git a/tests/confsub.test b/tests/confsub.test
index 40c90c5..d89ea87 100755
--- a/tests/confsub.test
+++ b/tests/confsub.test
@@ -37,8 +37,8 @@ END
echo 'Before.' > subdir/config.hin
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
# Make sure subdir Makefile.in doesn't itself look in the subdir.
# One line is allowed though:
@@ -47,13 +47,11 @@ $AUTOMAKE || Exit 1
($FGREP 'subdir/config.h' subdir/Makefile.in |
$FGREP -v 'cd $(top_builddir)') && Exit 1
-$AUTOCONF || Exit 1
-./configure || Exit 1
+$AUTOCONF
+./configure
$FGREP 'Before.' subdir/config.h
$sleep
echo 'After.' > subdir/config.hin
-$MAKE || Exit 1
-$FGREP 'After.' subdir/config.h || Exit 1
-
-Exit 0
+$MAKE
+$FGREP 'After.' subdir/config.h
diff --git a/tests/confvar.test b/tests/confvar.test
index f098baf..28f9f4d 100755
--- a/tests/confvar.test
+++ b/tests/confvar.test
@@ -24,7 +24,7 @@ END
: > Makefile.am
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
grep '^QBERT' Makefile.in
diff --git a/tests/confvar2.test b/tests/confvar2.test
index ea9c81e..fc6a9ae 100755
--- a/tests/confvar2.test
+++ b/tests/confvar2.test
@@ -26,5 +26,5 @@ cat > Makefile.am << 'END'
bin_SCRIPTS = foo
END
-$ACLOCAL || Exit 1
+$ACLOCAL
$AUTOMAKE
diff --git a/tests/copy.test b/tests/copy.test
index 770ae51..40ccd14 100755
--- a/tests/copy.test
+++ b/tests/copy.test
@@ -21,5 +21,5 @@
: > Makefile.am
rm -f install-sh
-$ACLOCAL || Exit 1
+$ACLOCAL
$AUTOMAKE -c -a
diff --git a/tests/cxx.test b/tests/cxx.test
index 2105c00..a5919e3 100755
--- a/tests/cxx.test
+++ b/tests/cxx.test
@@ -28,7 +28,7 @@ bin_PROGRAMS = hello
hello_SOURCES = hello.c++
END
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
grep '^\.SUFFIXES:.*c[+][+]' Makefile.in
diff --git a/tests/cxxansi.test b/tests/cxxansi.test
index da8bd6b..622f6cb 100755
--- a/tests/cxxansi.test
+++ b/tests/cxxansi.test
@@ -36,10 +36,8 @@ END
: > doe.C
: > jane.C
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
$FGREP 'jane$U' Makefile.in && Exit 1
-$FGREP 'doe$U' Makefile.in || Exit 1
-
-Exit 0
+$FGREP 'doe$U' Makefile.in
diff --git a/tests/cxxcpp.test b/tests/cxxcpp.test
index 257505f..520d10c 100755
--- a/tests/cxxcpp.test
+++ b/tests/cxxcpp.test
@@ -25,7 +25,7 @@ END
: > Makefile.am
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
grep '^CXXCPP' Makefile.in
diff --git a/tests/cxxlibobj.test b/tests/cxxlibobj.test
index 82f9e85..7966b71 100755
--- a/tests/cxxlibobj.test
+++ b/tests/cxxlibobj.test
@@ -34,7 +34,7 @@ END
: > doe.C
: > jane.C
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
grep CC Makefile.in
diff --git a/tests/cxxlink.test b/tests/cxxlink.test
index b7a86f0..f984854 100755
--- a/tests/cxxlink.test
+++ b/tests/cxxlink.test
@@ -31,8 +31,8 @@ END
: > lava.c
: > lamp.cxx
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
# Look for this macro not at the beginning of any line; that will have
# to be good enough for now.
diff --git a/tests/cxxo.test b/tests/cxxo.test
index 116df06..d41b67f 100755
--- a/tests/cxxo.test
+++ b/tests/cxxo.test
@@ -28,7 +28,7 @@ END
: > doe.C
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
$FGREP 'doe.$(OBJEXT)' Makefile.in
diff --git a/tests/cygwin32.test b/tests/cygwin32.test
index 6b8d70a..bed537a 100755
--- a/tests/cygwin32.test
+++ b/tests/cygwin32.test
@@ -32,8 +32,8 @@ END
: > www.c
: > xtra.c
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
grep '^CYGWIN' Makefile.in && Exit 1
grep 'EXEEXT' Makefile.in
diff --git a/tests/dash.test b/tests/dash.test
index 03876dd..40e0804 100755
--- a/tests/dash.test
+++ b/tests/dash.test
@@ -25,5 +25,5 @@ END
: > Make-lang
-$ACLOCAL || Exit 1
+$ACLOCAL
$AUTOMAKE
diff --git a/tests/defs.in b/tests/defs.in
index 497b57f..1587d51 100644
--- a/tests/defs.in
+++ b/tests/defs.in
@@ -428,6 +428,9 @@ AUTOMAKE_fails ()
AUTOMAKE_run 1 ${1+"$@"}
}
+# Catch failures the user might have not thought of.
+set -e
+
# Turn on shell traces.
set -x
diff --git a/tests/defun2.test b/tests/defun2.test
index a0bf273..d8f68d0 100755
--- a/tests/defun2.test
+++ b/tests/defun2.test
@@ -34,5 +34,5 @@ END
: > memcmp.c
-$ACLOCAL || Exit 1
+$ACLOCAL
$AUTOMAKE
diff --git a/tests/dejagnu.test b/tests/dejagnu.test
index 3308977..ab462ac 100755
--- a/tests/dejagnu.test
+++ b/tests/dejagnu.test
@@ -25,8 +25,8 @@ END
: > frob.test
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
grep '^check-TESTS' Makefile.in
grep '^check-DEJAGNU' Makefile.in
diff --git a/tests/depcomp.test b/tests/depcomp.test
index 7e40617..517fff4 100755
--- a/tests/depcomp.test
+++ b/tests/depcomp.test
@@ -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
+$AUTOMAKE --add-missing
# 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
diff --git a/tests/depcomp2.test b/tests/depcomp2.test
index 4653c90..3a99992 100755
--- a/tests/depcomp2.test
+++ b/tests/depcomp2.test
@@ -45,8 +45,8 @@ END
CFLAGS=
export CFLAGS
-$ACLOCAL || Exit 1
-$AUTOMAKE --add-missing || Exit 1
-$AUTOCONF || Exit 1
-./configure CC='gcc' 2>error.log
+$ACLOCAL
+$AUTOMAKE --add-missing
+$AUTOCONF
+./configure CC='gcc' 2>error.log || { cat error.log >&2; Exit 1; }
test -z "`cat error.log`"
diff --git a/tests/depend3.test b/tests/depend3.test
index 080fc56..6a69319 100755
--- a/tests/depend3.test
+++ b/tests/depend3.test
@@ -45,5 +45,5 @@ DEPS = @DEPS@
TerraVision_DEPENDENCIES = $(DEPS)
END
-$ACLOCAL || Exit 1
+$ACLOCAL
$AUTOMAKE
diff --git a/tests/discover.test b/tests/discover.test
index 36293f7..5f1c29b 100755
--- a/tests/discover.test
+++ b/tests/discover.test
@@ -33,6 +33,5 @@ END
: > fsusage.c
-$ACLOCAL || Exit 1
-$AUTOMAKE 2>&1 | $FGREP fsusage.c || Exit 1
-Exit 0
+$ACLOCAL
+$AUTOMAKE 2>&1 | $FGREP fsusage.c
diff --git a/tests/distcom2.test b/tests/distcom2.test
index 9ed4675..a338842 100755
--- a/tests/distcom2.test
+++ b/tests/distcom2.test
@@ -41,11 +41,11 @@ END
rm -f compile depcomp
-$ACLOCAL || Exit 1
-$AUTOMAKE --add-missing || Exit 1
+$ACLOCAL
+$AUTOMAKE --add-missing
-test -f compile || Exit 1
-test -f depcomp || Exit 1
+test -f compile
+test -f depcomp
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
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
diff --git a/tests/double.test b/tests/double.test
index d8dfcf1..5051edf 100755
--- a/tests/double.test
+++ b/tests/double.test
@@ -25,5 +25,5 @@ cat > Makefile.am << 'END'
bin_PROGRAMS = spice nutmeg help sconvert multidec nutmeg
END
-$ACLOCAL || Exit 1
+$ACLOCAL
$AUTOMAKE
diff --git a/tests/empty2.test b/tests/empty2.test
index 28a2d27..55062e9 100755
--- a/tests/empty2.test
+++ b/tests/empty2.test
@@ -28,8 +28,8 @@ bin_PROGRAMS = pavel
pavel_SOURCES =
END
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
grep 'pavel\.[co]' Makefile.in && Exit 1
Exit 0
diff --git a/tests/empty3.test b/tests/empty3.test
index 0f9a4a8..850016d 100755
--- a/tests/empty3.test
+++ b/tests/empty3.test
@@ -26,7 +26,7 @@ cat > Makefile.am << 'END'
bin_PROGRAMS = pavel
END
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
grep 'pavel\.[co]' Makefile.in
diff --git a/tests/empty4.test b/tests/empty4.test
index 7769fd3..4646afd 100755
--- a/tests/empty4.test
+++ b/tests/empty4.test
@@ -32,7 +32,7 @@ zoo_DEPENDENCIES = $(ZOO_OBJ)
zoo_LDADD = $(zoo_DEPENDENCIES)
END
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
$FGREP zoo. Makefile.in && Exit 1
Exit 0
diff --git a/tests/exdir.test b/tests/exdir.test
index 0dd0566..dc7709f 100755
--- a/tests/exdir.test
+++ b/tests/exdir.test
@@ -24,7 +24,7 @@ html_DATA = zot.html
pkgdata_DATA = qbert
EOF
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
grep '^DATA' Makefile.in | grep html
diff --git a/tests/ext.test b/tests/ext.test
index 929afd5..c9bbae6 100755
--- a/tests/ext.test
+++ b/tests/ext.test
@@ -30,8 +30,8 @@ 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
+$AUTOMAKE
for ext in f for f90 f95 F F90 F95 r m upc
do
diff --git a/tests/extra.test b/tests/extra.test
index 70e1f1f..8b3ff46 100755
--- a/tests/extra.test
+++ b/tests/extra.test
@@ -30,10 +30,10 @@ bin_PROGRAMS = @foo@
EXTRA_PROGRAMS = zardoz
END
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
-grep "^zardoz" Makefile.in || Exit 1
+grep "^zardoz" Makefile.in
# Can't have EXTRA clean rules.
grep 'clean.*EXTRA' Makefile.in && Exit 1
diff --git a/tests/extra2.test b/tests/extra2.test
index a2a64d7..f56a065 100755
--- a/tests/extra2.test
+++ b/tests/extra2.test
@@ -26,8 +26,8 @@ cat > Makefile.am << 'END'
bin_PROGRAMS = foo
END
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
grep EXTRA_foo_SOURCES Makefile.in && Exit 1
Exit 0
diff --git a/tests/extra3.test b/tests/extra3.test
index ad74acc..946161b 100755
--- a/tests/extra3.test
+++ b/tests/extra3.test
@@ -24,5 +24,5 @@ cat > Makefile.am << 'END'
sysconf_DATA = @CODICIL@
END
-$ACLOCAL || Exit 1
+$ACLOCAL
$AUTOMAKE
diff --git a/tests/extra4.test b/tests/extra4.test
index f559720..f899d06 100755
--- a/tests/extra4.test
+++ b/tests/extra4.test
@@ -25,5 +25,5 @@ sysconf_DATA = @CODICIL@
EXTRA_DATA = codicil.txt
END
-$ACLOCAL || Exit 1
+$ACLOCAL
$AUTOMAKE
diff --git a/tests/f90only.test b/tests/f90only.test
index 6fbfd2d..19e7c73 100755
--- a/tests/f90only.test
+++ b/tests/f90only.test
@@ -44,7 +44,7 @@ END
: > zardoz.f90
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
grep 'zardoz.f90' Makefile.in
diff --git a/tests/flibs.test b/tests/flibs.test
index 8dc66db..8f8fbef 100755
--- a/tests/flibs.test
+++ b/tests/flibs.test
@@ -46,7 +46,7 @@ END
: > zardoz.f
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
grep '@FLIBS@' Makefile.in
diff --git a/tests/fnoc.test b/tests/fnoc.test
index 13d9add..333952e 100755
--- a/tests/fnoc.test
+++ b/tests/fnoc.test
@@ -32,8 +32,8 @@ END
: > doe.f
: > jane.f
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
grep '[^F]CC' Makefile.in | grep -v MKDEP && Exit 1
Exit 0
diff --git a/tests/fo.test b/tests/fo.test
index 1d7809c..8467091 100755
--- a/tests/fo.test
+++ b/tests/fo.test
@@ -30,7 +30,7 @@ END
: > doe.f
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
$FGREP 'doe.$(OBJEXT)' Makefile.in
diff --git a/tests/fonly.test b/tests/fonly.test
index 6af719c..d3051a1 100755
--- a/tests/fonly.test
+++ b/tests/fonly.test
@@ -44,7 +44,7 @@ END
: > zardoz.f
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
grep 'zardoz.f' Makefile.in
diff --git a/tests/fortdep.test b/tests/fortdep.test
index 8e62298..d9f9187 100755
--- a/tests/fortdep.test
+++ b/tests/fortdep.test
@@ -35,8 +35,8 @@ END
: > foo.f
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
grep 'foo\.Po' Makefile.in && Exit 1
Exit 0
diff --git a/tests/fpinst2.test b/tests/fpinst2.test
index c6b4900..16c2cf3 100755
--- a/tests/fpinst2.test
+++ b/tests/fpinst2.test
@@ -29,5 +29,5 @@ cat > Makefile.am <<'END'
bin_SCRIPTS = zot
END
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
diff --git a/tests/fpinstall.test b/tests/fpinstall.test
index 6c645eb..20dcb57 100755
--- a/tests/fpinstall.test
+++ b/tests/fpinstall.test
@@ -29,5 +29,5 @@ cat > Makefile.am <<'END'
bin_SCRIPTS = zot
END
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
diff --git a/tests/gcj.test b/tests/gcj.test
index c32a1b2..c962cf9 100755
--- a/tests/gcj.test
+++ b/tests/gcj.test
@@ -28,7 +28,7 @@ bin_PROGRAMS = convert
convert_SOURCES = x/y/convert.java
END
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
grep '^x/y/convert' Makefile.in
diff --git a/tests/gcj3.test b/tests/gcj3.test
index 7d8a981..06aef77 100755
--- a/tests/gcj3.test
+++ b/tests/gcj3.test
@@ -28,8 +28,8 @@ bin_PROGRAMS = convert
convert_SOURCES = x/y/convert.java
END
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
num=`grep depcomp Makefile.in | wc -l`
test $num -gt 1
diff --git a/tests/header.test b/tests/header.test
index 2ad2735..f7a185e 100755
--- a/tests/header.test
+++ b/tests/header.test
@@ -31,8 +31,8 @@ END
: > joe.c
: > qq.h
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
grep 'address@hidden' Makefile.in && Exit 1
Exit 0
diff --git a/tests/implicit.test b/tests/implicit.test
index 210b2dc..44d5887 100755
--- a/tests/implicit.test
+++ b/tests/implicit.test
@@ -27,7 +27,7 @@ cat > Makefile.am << 'END'
noinst_PROGRAMS = libapp_1
END
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
grep '^libapp_1_OBJECTS' Makefile.in | $FGREP '.$(OBJEXT)'
diff --git a/tests/include.test b/tests/include.test
index 350f8fc..4c25bff 100755
--- a/tests/include.test
+++ b/tests/include.test
@@ -27,11 +27,11 @@ END
: > foo
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
len="`grep '^srcdir' Makefile.in | wc -l`"
echo "len = $len"
-test $len -eq 1 || Exit 1
+test $len -eq 1
# Also make sure include file is distributed.
(sed -n -e '/^DIST_COMMON =.*\\$/ {
diff --git a/tests/info.test b/tests/info.test
index 2cde524..2e50f41 100755
--- a/tests/info.test
+++ b/tests/info.test
@@ -28,8 +28,8 @@ END
echo '@setfilename foo.info' > foo.texi
: > texinfo.tex
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
for i in `grep '^INFOS =' Makefile.in | sed -e 's/^INFOS = //'`; do
echo $i
diff --git a/tests/insh2.test b/tests/insh2.test
index c64f1f7..2bcdcaf 100755
--- a/tests/insh2.test
+++ b/tests/insh2.test
@@ -25,8 +25,8 @@ magic:
@echo $(DISTFILES)
END
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
-$FGREP -v @SET_MAKE@ Makefile.in > Makefile.sed
+sed '/@SET_MAKE@/d' Makefile.in > Makefile.sed
$MAKE -s -f Makefile.sed SHELL=$SHELL magic | grep install-sh
diff --git a/tests/instdat.test b/tests/instdat.test
index a6ec01a..4c288cf 100755
--- a/tests/instdat.test
+++ b/tests/instdat.test
@@ -23,8 +23,8 @@ echo 'AC_SUBST(INSTALL_DATA)' >> configure.in
: > Makefile.am
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
(grep '^DATA =' Makefile.in | grep INSTALL_DATA) && Exit 1
Exit 0
diff --git a/tests/instexec.test b/tests/instexec.test
index 1312f8e..fb6c949 100755
--- a/tests/instexec.test
+++ b/tests/instexec.test
@@ -21,7 +21,7 @@
: > Makefile.am
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
grep '^install-exec:' Makefile.in
diff --git a/tests/instman2.test b/tests/instman2.test
index 77844fa..0163472 100755
--- a/tests/instman2.test
+++ b/tests/instman2.test
@@ -25,7 +25,7 @@ EOF
: > frob.8
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
grep '^install-man' Makefile.in
diff --git a/tests/interp.test b/tests/interp.test
index af82e33..8f321d9 100755
--- a/tests/interp.test
+++ b/tests/interp.test
@@ -28,7 +28,7 @@ s1 = z.c
qqq_SOURCES = $(s1)
END
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
$FGREP 'z.$(OBJEXT)' Makefile.in
diff --git a/tests/interp2.test b/tests/interp2.test
index cff8d1d..bc61b45 100755
--- a/tests/interp2.test
+++ b/tests/interp2.test
@@ -31,5 +31,5 @@ x_SOURCES = x.c
x_LDADD = $(X_EXTRA_LIBS)
END
-$ACLOCAL || Exit 1
+$ACLOCAL
$AUTOMAKE
diff --git a/tests/javaprim.test b/tests/javaprim.test
index aa1506b..581dbed 100755
--- a/tests/javaprim.test
+++ b/tests/javaprim.test
@@ -25,5 +25,5 @@ javadir = $(datadir)/java
java_JAVA = a.java b.java c.java
END
-$ACLOCAL || Exit 1
+$ACLOCAL
$AUTOMAKE
diff --git a/tests/javasubst.test b/tests/javasubst.test
index d018645..cc790af 100755
--- a/tests/javasubst.test
+++ b/tests/javasubst.test
@@ -25,7 +25,7 @@ javadir = $(datadir)/java
java_JAVA = a.java b.java c.java
END
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
grep 'address@hidden@' Makefile.in
diff --git a/tests/ldadd.test b/tests/ldadd.test
index 005f9d8..f8007cc 100755
--- a/tests/ldadd.test
+++ b/tests/ldadd.test
@@ -38,6 +38,5 @@ END
: > config.sub
: > q.c
-$ACLOCAL || Exit 1
-$AUTOMAKE 2>&1 | grep LDADD || Exit 1
-Exit 0
+$ACLOCAL
+$AUTOMAKE 2>&1 | grep LDADD
diff --git a/tests/ldflags.test b/tests/ldflags.test
index 39ca274..fb6ce3a 100755
--- a/tests/ldflags.test
+++ b/tests/ldflags.test
@@ -41,5 +41,5 @@ END
: > config.sub
: > q.c
-$ACLOCAL || Exit 1
+$ACLOCAL
$AUTOMAKE
diff --git a/tests/libobj11.test b/tests/libobj11.test
index 204ff8b..65a7535 100755
--- a/tests/libobj11.test
+++ b/tests/libobj11.test
@@ -35,5 +35,5 @@ END
: > mountlist.c
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
diff --git a/tests/libobj2.test b/tests/libobj2.test
index 81b0e72..639f772 100755
--- a/tests/libobj2.test
+++ b/tests/libobj2.test
@@ -39,7 +39,7 @@ END
: > subdir/fsusage.c
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
grep 'fsusage\.c' subdir/Makefile.in
diff --git a/tests/libobj4.test b/tests/libobj4.test
index d6639be..0069bad 100755
--- a/tests/libobj4.test
+++ b/tests/libobj4.test
@@ -28,5 +28,5 @@ AC_PROG_CC
AC_REPLACE_FUNCS(foo)
END
-$ACLOCAL || Exit 1
+$ACLOCAL
$AUTOMAKE
diff --git a/tests/libobj5.test b/tests/libobj5.test
index 6add9e3..4abad39 100755
--- a/tests/libobj5.test
+++ b/tests/libobj5.test
@@ -32,6 +32,6 @@ END
: > foo.c
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
$FGREP foo.c Makefile.in
diff --git a/tests/libobj7.test b/tests/libobj7.test
index 73a8ab0..72b03c8 100755
--- a/tests/libobj7.test
+++ b/tests/libobj7.test
@@ -37,8 +37,8 @@ END
: > dirname.c
: > strsignal.c
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
sed -n -e ': again
/^DIST_COMMON.*[^\]$/ p
diff --git a/tests/libobj8.test b/tests/libobj8.test
index c06746b..5e56bba 100755
--- a/tests/libobj8.test
+++ b/tests/libobj8.test
@@ -44,7 +44,7 @@ END
: > ansi2knr.1
: > ansi2knr.c
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
grep 'strsignal_.c:' Makefile.in
diff --git a/tests/library.test b/tests/library.test
index 1e2b58b..7c28d79 100755
--- a/tests/library.test
+++ b/tests/library.test
@@ -30,5 +30,5 @@ lib_LIBRARIES = libfoo.a
libfoo_a_DEPENDENCIES = libzot.a
END
-$ACLOCAL || Exit 1
+$ACLOCAL
$AUTOMAKE
diff --git a/tests/libtool.test b/tests/libtool.test
index dd2a939..5794800 100755
--- a/tests/libtool.test
+++ b/tests/libtool.test
@@ -32,7 +32,7 @@ END
: > config.guess
: > config.sub
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
grep 'rm -f libtool' Makefile.in
diff --git a/tests/libtool2.test b/tests/libtool2.test
index a50f6a4..905e47b 100755
--- a/tests/libtool2.test
+++ b/tests/libtool2.test
@@ -45,8 +45,8 @@ lib_LTLIBRARIES = libfoo.la
libfoo_la_SOURCES = foo.c
END
-$ACLOCAL || Exit 1
+$ACLOCAL
: > ltmain.sh
-$AUTOMAKE -a || Exit 1
+$AUTOMAKE -a
grep 'rm -f .*\.lo' sub/Makefile.in
diff --git a/tests/link_c_cxx.test b/tests/link_c_cxx.test
index 37b27d7..fd4da94 100755
--- a/tests/link_c_cxx.test
+++ b/tests/link_c_cxx.test
@@ -32,15 +32,15 @@ END
: > lava.c
: > lamp.cxx
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
# 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
# We should not see these patterns:
grep '.\$(FLINK)' Makefile.in && Exit 1
diff --git a/tests/link_dist.test b/tests/link_dist.test
index 7e73cc3..8681b8e 100755
--- a/tests/link_dist.test
+++ b/tests/link_dist.test
@@ -34,15 +34,15 @@ END
: > lava.c
: > lamp.cxx
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
# 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
# We should not see these patterns:
grep '.\$(FLINK)' Makefile.in && Exit 1
diff --git a/tests/link_f90_only.test b/tests/link_f90_only.test
index eeec3a6..d46b5e6 100755
--- a/tests/link_f90_only.test
+++ b/tests/link_f90_only.test
@@ -30,15 +30,15 @@ END
: > lamp.f90
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
# 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
# We should not see these patterns:
grep '.\$(CXXLINK)' Makefile.in && Exit 1
diff --git a/tests/link_f_only.test b/tests/link_f_only.test
index 4390bd6..880e5bd 100755
--- a/tests/link_f_only.test
+++ b/tests/link_f_only.test
@@ -30,15 +30,15 @@ END
: > lamp.f
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
# 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
# We should not see these patterns:
grep '.\$(CXXLINK)' Makefile.in && Exit 1
diff --git a/tests/link_fc.test b/tests/link_fc.test
index 5b23bd5..4368d64 100755
--- a/tests/link_fc.test
+++ b/tests/link_fc.test
@@ -32,8 +32,8 @@ END
: > lava.c
: > lamp.f
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
# We should only see the Fortran 77 linker in the rules of
@@ -41,7 +41,7 @@ $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
# We should not see these patterns:
grep '.\$(LINK)' Makefile.in && Exit 1
diff --git a/tests/link_fccxx.test b/tests/link_fccxx.test
index bd2b21d..2136916 100755
--- a/tests/link_fccxx.test
+++ b/tests/link_fccxx.test
@@ -34,15 +34,15 @@ END
: > lamp.cxx
: > lamp2.f
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
# 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
# We should not see these patterns:
grep '.\$(F77LINK)' Makefile.in && Exit 1
diff --git a/tests/link_fcxx.test b/tests/link_fcxx.test
index e86f7cd..1845e24 100755
--- a/tests/link_fcxx.test
+++ b/tests/link_fcxx.test
@@ -32,15 +32,15 @@ END
: > lava.cxx
: > lamp.f
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
# 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
# We should not see these patterns:
grep '.\$(F77LINK)' Makefile.in && Exit 1
diff --git a/tests/listval.test b/tests/listval.test
index 5ff75db..e78f5b6 100755
--- a/tests/listval.test
+++ b/tests/listval.test
@@ -37,5 +37,5 @@ END
: > config.guess
: > config.sub
-$ACLOCAL || Exit 1
+$ACLOCAL
$AUTOMAKE
diff --git a/tests/ltdeps.test b/tests/ltdeps.test
index 8285bd1..6bf50bb 100755
--- a/tests/ltdeps.test
+++ b/tests/ltdeps.test
@@ -52,8 +52,8 @@ END
: > config.guess
: > config.sub
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
grep 'OBJECTS =$' Makefile.in && Exit 1
Exit 0
diff --git a/tests/ltlibobjs.test b/tests/ltlibobjs.test
index fd66473..13679f2 100755
--- a/tests/ltlibobjs.test
+++ b/tests/ltlibobjs.test
@@ -35,5 +35,5 @@ END
: > config.guess
: > config.sub
-$ACLOCAL || Exit 1
+$ACLOCAL
$AUTOMAKE
diff --git a/tests/makevars.test b/tests/makevars.test
index f4a80aa..e5174f9 100755
--- a/tests/makevars.test
+++ b/tests/makevars.test
@@ -20,12 +20,12 @@
. ./defs || Exit 1
# Find the macros wanted by Automake.
-$ACLOCAL || Exit 1
+$ACLOCAL
# Create some dummy Makefile.in.
: > Makefile.am
-$AUTOMAKE || Exit 1
+$AUTOMAKE
# We are definitely not needing a compiler or preprocessor.
$EGREP '^(CC|CPP|CXX|CXXCPP) =' Makefile.in && Exit 1
diff --git a/tests/man.test b/tests/man.test
index 93b3bb2..d052a61 100755
--- a/tests/man.test
+++ b/tests/man.test
@@ -26,6 +26,6 @@ END
: > foo.1
: > bar.man
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
grep '^MANS ' Makefile.in
diff --git a/tests/mclean.test b/tests/mclean.test
index dcbe818..8a9f1d0 100755
--- a/tests/mclean.test
+++ b/tests/mclean.test
@@ -25,7 +25,7 @@ END
: > FOO
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
grep 'rm -f .*MAINTAINERCLEANFILES' Makefile.in
diff --git a/tests/mdate.test b/tests/mdate.test
index 704b393..420a6a6 100755
--- a/tests/mdate.test
+++ b/tests/mdate.test
@@ -30,5 +30,5 @@ END
# Required when using Texinfo.
: > texinfo.tex
-$ACLOCAL || Exit 1
+$ACLOCAL
$AUTOMAKE 2>&1 > /dev/null | grep 'required file.*mdate-sh'
diff --git a/tests/mdate2.test b/tests/mdate2.test
index 11b6d5d..0feaa82 100755
--- a/tests/mdate2.test
+++ b/tests/mdate2.test
@@ -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
+$AUTOMAKE ././Makefile
grep 'mdate-sh' Makefile.in | grep -v SHELL
diff --git a/tests/mdate3.test b/tests/mdate3.test
index 75105f9..eaf4bfe 100755
--- a/tests/mdate3.test
+++ b/tests/mdate3.test
@@ -41,11 +41,13 @@ mkdir foo
: > foo/mdate-sh
mv install-sh foo
mv missing foo
-mv mkinstalldirs foo
+if test -r mkinstalldirs; then
+ mv mkinstalldirs foo
+fi
mv depcomp foo
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
grep '[^/]mdate-sh' Makefile.in && Exit 1
Exit 0
diff --git a/tests/mdate4.test b/tests/mdate4.test
index ca24f56..44a4269 100755
--- a/tests/mdate4.test
+++ b/tests/mdate4.test
@@ -40,6 +40,6 @@ cat > sub/textutils.texi << 'END'
@setfilename textutils.info
END
-$ACLOCAL || Exit 1
-$AUTOMAKE -a || Exit 1
+$ACLOCAL
+$AUTOMAKE -a
test -f sub/mdate-sh
diff --git a/tests/mkinstall.test b/tests/mkinstall.test
index 4a65307..6764124 100755
--- a/tests/mkinstall.test
+++ b/tests/mkinstall.test
@@ -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
+$AUTOMAKE ././Makefile
grep ' /mkinstalldirs' Makefile.in && Exit 1
Exit 0
diff --git a/tests/nodep.test b/tests/nodep.test
index 31232f2..600c613 100755
--- a/tests/nodep.test
+++ b/tests/nodep.test
@@ -33,8 +33,8 @@ mkdir x
: > y.c
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
grep '%' Makefile.in && Exit 1
Exit 0
diff --git a/tests/nodepcomp.test b/tests/nodepcomp.test
index 53b902e..cb30ecc 100755
--- a/tests/nodepcomp.test
+++ b/tests/nodepcomp.test
@@ -22,5 +22,5 @@ rm -f depcomp
: > Makefile.am
-$ACLOCAL || Exit 1
+$ACLOCAL
$AUTOMAKE
diff --git a/tests/nodist.test b/tests/nodist.test
index 7239338..51a19e8 100755
--- a/tests/nodist.test
+++ b/tests/nodist.test
@@ -32,11 +32,11 @@ END
: > b.c
: > c.c
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
-grep '^am_eyeball_OBJECTS' Makefile.in || Exit 1
-grep '^DIST_SOURCES =' Makefile.in || Exit 1
+grep '^am_eyeball_OBJECTS' Makefile.in
+grep '^DIST_SOURCES =' Makefile.in
grep '^DIST_SOURCES =.*nodist' Makefile.in && Exit 1
Exit 0
diff --git a/tests/nodist3.test b/tests/nodist3.test
index 21cfec3..535cca3 100755
--- a/tests/nodist3.test
+++ b/tests/nodist3.test
@@ -28,8 +28,8 @@ END
: > a.c
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
grep '^dist:' Makefile.in && Exit 1
grep '^DIST_SOURCES =' Makefile.in && Exit 1
diff --git a/tests/noinst.test b/tests/noinst.test
index dd97481..0e1a80e 100755
--- a/tests/noinst.test
+++ b/tests/noinst.test
@@ -24,7 +24,7 @@ all-local:
exit 1
END
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
grep '^install[-a-z]*:.* all' Makefile.in
diff --git a/tests/noinstdir.test b/tests/noinstdir.test
index 3f33c32..38c4af5 100755
--- a/tests/noinstdir.test
+++ b/tests/noinstdir.test
@@ -37,8 +37,8 @@ AC_PROG_CC
AC_PROG_RANLIB
END
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
grep 'noinstdir' Makefile.in && Exit 1
grep 'checkdir' Makefile.in && Exit 1
diff --git a/tests/nostdinc.test b/tests/nostdinc.test
index 96e30c5..593f51c 100755
--- a/tests/nostdinc.test
+++ b/tests/nostdinc.test
@@ -28,8 +28,8 @@ bin_PROGRAMS = foo
foo_SOURCES = foo.c
END
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
$FGREP -e '-I.' Makefile.in && Exit 1
Exit 0
diff --git a/tests/number.test b/tests/number.test
index a43ff2f..e323880 100755
--- a/tests/number.test
+++ b/tests/number.test
@@ -27,8 +27,8 @@ cat > Makefile.am << 'END'
bin_PROGRAMS = zardoz
END
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
count=`grep -c '^zardoz_OBJECTS' Makefile.in`
test $count -eq 1
diff --git a/tests/objc.test b/tests/objc.test
index facc4d4..a72de8a 100755
--- a/tests/objc.test
+++ b/tests/objc.test
@@ -28,7 +28,7 @@ bin_PROGRAMS = hello
hello_SOURCES = hello.m
END
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
grep '^\.SUFFIXES:.*\.m' Makefile.in
diff --git a/tests/obsolete.test b/tests/obsolete.test
index e6601c9..def4c0e 100755
--- a/tests/obsolete.test
+++ b/tests/obsolete.test
@@ -28,21 +28,23 @@ $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
+echo ':' >> obs.1 # to appease `set -e'
$PERL -ne 'chomp; print "grep $_ configure.in && Exit 1\n"; ' obs > obs.2
+echo ':' >> obs.2 # to appease `set -e'
# 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
-$ACLOCAL || Exit 1
+$ACLOCAL
# Expect Autoconf to complain about each of the macros in obs.
-$AUTOCONF -Wobsolete >stderr 2>&1
+$AUTOCONF -Wobsolete >stderr 2>&1 || :
. ./obs.1
# Make sure Autoupdate remove each of these macros.
-$AUTOUPDATE || Exit 1
+$AUTOUPDATE
. ./obs.2
# Autoconf should be able to grok the updated configure.in.
-$AUTOCONF || Exit 1
+$AUTOCONF
Exit 0
diff --git a/tests/outdir.test b/tests/outdir.test
index 4bafb4e..a746d44 100755
--- a/tests/outdir.test
+++ b/tests/outdir.test
@@ -25,8 +25,8 @@ END
mkdir zardir
-$ACLOCAL || Exit 1
-$AUTOMAKE -Wno-obsolete --output-dir=zardir || Exit 1
+$ACLOCAL
+$AUTOMAKE -Wno-obsolete --output-dir=zardir
test -f Makefile.in && Exit 1
test -f zardir/Makefile.in
diff --git a/tests/output.test b/tests/output.test
index 4f6a7cd..1f07788 100755
--- a/tests/output.test
+++ b/tests/output.test
@@ -29,5 +29,5 @@ END
mkdir frob
: > frob/zardoz.in
-$ACLOCAL || Exit 1
+$ACLOCAL
$AUTOMAKE
diff --git a/tests/output2.test b/tests/output2.test
index c9bdbc3..f235ce7 100755
--- a/tests/output2.test
+++ b/tests/output2.test
@@ -31,8 +31,8 @@ mkdir intl po misc
: > po/Makefile.in.am
: > misc/gettextize.in
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
grep '^gettextize' Makefile.in && Exit 1
Exit 0
diff --git a/tests/output3.test b/tests/output3.test
index 02d7e6f..e39d10d 100755
--- a/tests/output3.test
+++ b/tests/output3.test
@@ -32,5 +32,5 @@ mkdir tests
: > tests/Makefile.am
: > tests/defs.in
-$ACLOCAL || Exit 1
+$ACLOCAL
$AUTOMAKE
diff --git a/tests/output4.test b/tests/output4.test
index fc5a022..65baa51 100755
--- a/tests/output4.test
+++ b/tests/output4.test
@@ -28,8 +28,8 @@ mkdir tests
: > tests/defs.in
: > tests/Makefile.am
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
grep tests/defs.in tests/Makefile.in && Exit 1
Exit 0
diff --git a/tests/parse.test b/tests/parse.test
index e7dcbe5..b69a91d 100755
--- a/tests/parse.test
+++ b/tests/parse.test
@@ -33,8 +33,8 @@ zar.c\
doz.c
END
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
$FGREP zar.cdoz Makefile.in && Exit 1
Exit 0
diff --git a/tests/pluseq.test b/tests/pluseq.test
index 05a5fce..ee5338e 100755
--- a/tests/pluseq.test
+++ b/tests/pluseq.test
@@ -26,6 +26,6 @@ END
: > zar
: > doz
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
$FGREP 'zar doz' Makefile.in
diff --git a/tests/pluseq2.test b/tests/pluseq2.test
index 28f9848..0558449 100755
--- a/tests/pluseq2.test
+++ b/tests/pluseq2.test
@@ -40,7 +40,7 @@ END
: > doz
: > dog
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
-grep 'CHECK_TRUE.*zar doz' Makefile.in || Exit 1
+$ACLOCAL
+$AUTOMAKE
+grep 'CHECK_TRUE.*zar doz' Makefile.in
grep 'CHECK_FALSE.*dog' Makefile.in
diff --git a/tests/pluseq4.test b/tests/pluseq4.test
index febc33b..219d838 100755
--- a/tests/pluseq4.test
+++ b/tests/pluseq4.test
@@ -27,6 +27,6 @@ END
: > foo.c
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
$FGREP '@CC@ -Dwhatever' Makefile.in
diff --git a/tests/pluseq6.test b/tests/pluseq6.test
index bb546cf..4fae721 100755
--- a/tests/pluseq6.test
+++ b/tests/pluseq6.test
@@ -26,9 +26,9 @@ mandir += foo
zq = zzz
END
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
-$FGREP '@mandir@ foo' Makefile.in || Exit 1
+$ACLOCAL
+$AUTOMAKE
+$FGREP '@mandir@ foo' Makefile.in
num=`grep '^mandir =' Makefile.in | wc -l`
test $num -eq 1
diff --git a/tests/pluseq8.test b/tests/pluseq8.test
index a39059a..7e6d727 100755
--- a/tests/pluseq8.test
+++ b/tests/pluseq8.test
@@ -25,8 +25,8 @@ VAR = \
VAR += three
END
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
sed -n -e '/^VAR =/ {
:loop
diff --git a/tests/postproc.test b/tests/postproc.test
index 197f267..08ee68d 100755
--- a/tests/postproc.test
+++ b/tests/postproc.test
@@ -32,16 +32,14 @@ bin_PROGRAMS = fred
fred_SOURCES = fred.c
END
-$ACLOCAL || Exit 1
-$AUTOCONF || Exit 1
-$AUTOMAKE -- myMakefile || Exit 1
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -- myMakefile
mv myMakefile.in myMakefile.old
echo '# Post-processed by post-processor 3.14.' > myMakefile.in
cat myMakefile.old >> myMakefile.in
-./configure || Exit $?
+./configure
-test -f .deps/fred.Po || test -f _deps/fred.Po || Exit 1
-
-:
+test -f .deps/fred.Po || test -f _deps/fred.Po
diff --git a/tests/ppf77.test b/tests/ppf77.test
index 6c61a2e..78276e2 100755
--- a/tests/ppf77.test
+++ b/tests/ppf77.test
@@ -31,5 +31,5 @@ END
: > foo.F
: > q.r
-$ACLOCAL || Exit 1
+$ACLOCAL
$AUTOMAKE
diff --git a/tests/pr243.test b/tests/pr243.test
index a3fdb8e..ea58994 100755
--- a/tests/pr243.test
+++ b/tests/pr243.test
@@ -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 $?
+$ACLOCAL
+$AUTOMAKE
+$AUTOCONF
+./configure
test -f .deps/fx64.Po
diff --git a/tests/pr266.test b/tests/pr266.test
index 865369f..8121b74 100755
--- a/tests/pr266.test
+++ b/tests/pr266.test
@@ -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 $?
+$ACLOCAL
+$AUTOMAKE
+$AUTOCONF
+./configure
test -f .deps/fx64.Po
diff --git a/tests/pr279-2.test b/tests/pr279-2.test
index 1d1e675..2ba2382 100755
--- a/tests/pr279-2.test
+++ b/tests/pr279-2.test
@@ -39,8 +39,8 @@ endif
bin_PROGRAMS = foo
END
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
-grep '@foo_DEPENDENCIES = zardoz' Makefile.in || Exit 1
-grep '@foo_DEPENDENCIES = maude' Makefile.in || Exit 1
+grep '@foo_DEPENDENCIES = zardoz' Makefile.in
+grep '@foo_DEPENDENCIES = maude' Makefile.in
diff --git a/tests/pr279.test b/tests/pr279.test
index b7ec641..8259077 100755
--- a/tests/pr279.test
+++ b/tests/pr279.test
@@ -41,5 +41,5 @@ foo_LDADD = ${xtralib}
foo_DEPENDENCIES =
END
-$ACLOCAL || Exit 1
+$ACLOCAL
$AUTOMAKE
diff --git a/tests/pr72.test b/tests/pr72.test
index d67c17b..fa60a1c 100755
--- a/tests/pr72.test
+++ b/tests/pr72.test
@@ -34,7 +34,7 @@ END
: > config.guess
: > config.sub
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
grep '^LINK ' Makefile.in
diff --git a/tests/pr87.test b/tests/pr87.test
index 369849b..26f304f 100755
--- a/tests/pr87.test
+++ b/tests/pr87.test
@@ -51,9 +51,9 @@ mkdir build
# We use gcc and not gcc -traditional as the latter fails on some
# Linux boxes (Red Hat 5.1 in particular).
-$ACLOCAL \
- && $AUTOCONF \
- && $AUTOMAKE -a || Exit 1
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE -a
# Regression test for bug where `.c.o:' is followed by blank line.
(while read line; do
@@ -66,6 +66,6 @@ $ACLOCAL \
fi
done) < foo/Makefile.in || Exit 1
-cd build \
- && ../configure \
- && $MAKE distcheck || Exit 1
+cd build
+../configure
+$MAKE distcheck
diff --git a/tests/pr9.test b/tests/pr9.test
index dab9734..93ad2a3 100755
--- a/tests/pr9.test
+++ b/tests/pr9.test
@@ -30,14 +30,14 @@ END
mkdir support
-$ACLOCAL || Exit 1
+$ACLOCAL
-$AUTOCONF || Exit 1
-$AUTOMAKE -a -c || Exit 1
-./configure || Exit 1
-$MAKE || Exit 1
-$MAKE distcheck || Exit 1
+$AUTOCONF
+$AUTOMAKE -a -c
+./configure
+$MAKE
+$MAKE distcheck
-gunzip pr9-0.tar.gz || Exit 1
+gunzip pr9-0.tar.gz
tar tf pr9-0.tar | $FGREP support
diff --git a/tests/prefix.test b/tests/prefix.test
index 8199bd4..23d8786 100755
--- a/tests/prefix.test
+++ b/tests/prefix.test
@@ -27,5 +27,5 @@ bnidir = $(prefix)/bni
bni_PROGRAMS = zardoz
EOF
-$ACLOCAL || Exit 1
+$ACLOCAL
$AUTOMAKE
diff --git a/tests/proginst.test b/tests/proginst.test
index 8881b9d..6118a58 100755
--- a/tests/proginst.test
+++ b/tests/proginst.test
@@ -23,5 +23,5 @@ cat > Makefile.am << 'END'
bin_SCRIPTS = zardoz qbert brownie
END
-$ACLOCAL || Exit 1
+$ACLOCAL
$AUTOMAKE
diff --git a/tests/recurs2.test b/tests/recurs2.test
index 5062bf0..99940ba 100755
--- a/tests/recurs2.test
+++ b/tests/recurs2.test
@@ -35,5 +35,5 @@ END
> chgrp.1
> chgrp.x
-$ACLOCAL || Exit 1
+$ACLOCAL
$AUTOMAKE
diff --git a/tests/remake.test b/tests/remake.test
index 9c86b1b..1b743fc 100755
--- a/tests/remake.test
+++ b/tests/remake.test
@@ -27,7 +27,7 @@ END
mkdir sub
: > sub/Makefile.am
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
grep '^Makefile' sub/Makefile.in
diff --git a/tests/remake2.test b/tests/remake2.test
index 3b63dea..4704931 100755
--- a/tests/remake2.test
+++ b/tests/remake2.test
@@ -27,7 +27,7 @@ END
mkdir sub
: > sub/Makefile.am
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
grep 'AUTOMAKE.*sub/Makefile' sub/Makefile.in
diff --git a/tests/remake3.test b/tests/remake3.test
index 08ec16a..eeb0168 100755
--- a/tests/remake3.test
+++ b/tests/remake3.test
@@ -29,7 +29,7 @@ END
mkdir sub
: > sub/foo.in
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
grep '^sub/foo' Makefile.in
diff --git a/tests/req.test b/tests/req.test
index 39bf349..5f9b795 100755
--- a/tests/req.test
+++ b/tests/req.test
@@ -32,6 +32,6 @@ module=[$1]
AC_SUBST(module)])
END
-$ACLOCAL || Exit 1
+$ACLOCAL
grep 'DEFUN.*INIT_AUTOMAKE' aclocal.m4
diff --git a/tests/rulepat.test b/tests/rulepat.test
index c15e910..a2cc73f 100755
--- a/tests/rulepat.test
+++ b/tests/rulepat.test
@@ -22,7 +22,7 @@ cat > Makefile.am << 'END'
$(srcdir)/Makefile.am:
END
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
grep '^$(srcdir)/Makefile\.am' Makefile.in
diff --git a/tests/scripts.test b/tests/scripts.test
index 6d3f0e8..c511d35 100755
--- a/tests/scripts.test
+++ b/tests/scripts.test
@@ -29,5 +29,5 @@ cat > Makefile.am << 'END'
noinst_SCRIPTS = foo
END
-$ACLOCAL || Exit 1
+$ACLOCAL
$AUTOMAKE
diff --git a/tests/space.test b/tests/space.test
index a4ab5a8..d0eaecd 100755
--- a/tests/space.test
+++ b/tests/space.test
@@ -25,5 +25,5 @@ cat > Makefile.am << 'END'
foo_SOURCES = foo.c
END
-$ACLOCAL || Exit 1
+$ACLOCAL
$AUTOMAKE
diff --git a/tests/specflg3.test b/tests/specflg3.test
index 53793a1..354eca4 100755
--- a/tests/specflg3.test
+++ b/tests/specflg3.test
@@ -35,14 +35,12 @@ END
: > compile
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
-$FGREP -e '-o foo-foo' Makefile.in || Exit 1
+$FGREP -e '-o foo-foo' Makefile.in
-$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
-
-Exit 0
+$FGREP '$(foo_CFLAGS)' Makefile.in
diff --git a/tests/specflg6.test b/tests/specflg6.test
index d858769..1ae7bd5 100755
--- a/tests/specflg6.test
+++ b/tests/specflg6.test
@@ -38,17 +38,17 @@ END
: > compile
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
-uncondval=`$FGREP 'foo-foo.o: foo.c' Makefile.in`
+uncondval=`$FGREP 'foo-foo.o: foo.c' Makefile.in || :`
cat >> Makefile.am << 'END'
foo_SOURCES += $(BAR_SRCS)
END
-$AUTOMAKE || Exit 1
+$AUTOMAKE
-condval=`$FGREP 'foo-foo.o: foo.c' Makefile.in`
+condval=`$FGREP 'foo-foo.o: foo.c' Makefile.in || :`
test "x$uncondval" = "x$condval"
diff --git a/tests/spell3.test b/tests/spell3.test
index 399328f..6de4a13 100755
--- a/tests/spell3.test
+++ b/tests/spell3.test
@@ -25,5 +25,5 @@ TAGS_DEPENDENCIES = joe
ETAGS_ARGS = joe
END
-$ACLOCAL || Exit 1
+$ACLOCAL
$AUTOMAKE
diff --git a/tests/spelling.test b/tests/spelling.test
index ad1e232..44cb133 100755
--- a/tests/spelling.test
+++ b/tests/spelling.test
@@ -22,8 +22,5 @@ cat > Makefile.am << 'EOF'
bni_PROGRAMS = zot
EOF
-if $ACLOCAL || Exit 1
-$AUTOMAKE; then
- Exit 1
-fi
-Exit 0
+$ACLOCAL
+AUTOMAKE_fails
diff --git a/tests/subcond.test b/tests/subcond.test
index b04c475..ba4ecc8 100755
--- a/tests/subcond.test
+++ b/tests/subcond.test
@@ -36,6 +36,6 @@ SUBDIRS =
endif
END
-$ACLOCAL || Exit 1
+$ACLOCAL
# Gettext wants config.guess etc.
$AUTOMAKE --add-missing
diff --git a/tests/subdir.test b/tests/subdir.test
index 85db059..31053e7 100755
--- a/tests/subdir.test
+++ b/tests/subdir.test
@@ -35,5 +35,5 @@ cat > zot/Makefile.am << 'END'
pkgdata_DATA =
END
-$ACLOCAL || Exit 1
+$ACLOCAL
$AUTOMAKE
diff --git a/tests/subdir2.test b/tests/subdir2.test
index aa83436..ac5dfae 100755
--- a/tests/subdir2.test
+++ b/tests/subdir2.test
@@ -47,5 +47,5 @@ cat > one/two/Makefile.am << 'END'
pkgdata_DATA =
END
-$ACLOCAL || Exit 1
+$ACLOCAL
$AUTOMAKE --gnu
diff --git a/tests/subdir3.test b/tests/subdir3.test
index aa02be0..3cb2a17 100755
--- a/tests/subdir3.test
+++ b/tests/subdir3.test
@@ -33,7 +33,7 @@ mkdir x
: > y.c
: > x/z.c
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
grep '^z\.o: x/z\.c$' Makefile.in
diff --git a/tests/subdir4.test b/tests/subdir4.test
index 2f85213..2436fc7 100755
--- a/tests/subdir4.test
+++ b/tests/subdir4.test
@@ -55,8 +55,8 @@ cat > src/Makefile.am << 'END'
pkgdata_DATA =
END
-$ACLOCAL || Exit 1
-$AUTOMAKE --gnu || Exit 1
+$ACLOCAL
+$AUTOMAKE --gnu
# Make sure that depcomp is *not* included in the definition
# of DIST_COMMON in lib/Makefile.in. If you change this test
diff --git a/tests/subobj4.test b/tests/subobj4.test
index f98ae5b..9583fb9 100755
--- a/tests/subobj4.test
+++ b/tests/subobj4.test
@@ -43,7 +43,7 @@ END
: > compile
: > d2/z.c
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
grep 'CC.*z' d1/Makefile.in
diff --git a/tests/subobj8.test b/tests/subobj8.test
index 63a02d1..cd804e5 100755
--- a/tests/subobj8.test
+++ b/tests/subobj8.test
@@ -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
+$AUTOMAKE --add-missing
+test -f tools/compile
diff --git a/tests/subst.test b/tests/subst.test
index 7d45dae..4581194 100755
--- a/tests/subst.test
+++ b/tests/subst.test
@@ -32,7 +32,7 @@ END
: > Makefile.am
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
grep '^\$1' Makefile.in && Exit 1
Exit 0
diff --git a/tests/suffix.test b/tests/suffix.test
index b77e19d..918919a 100755
--- a/tests/suffix.test
+++ b/tests/suffix.test
@@ -26,10 +26,10 @@ cat > Makefile.am << 'END'
noinst_PROGRAMS = foo
END
-$ACLOCAL || Exit 1
-$AUTOMAKE -i || Exit 1
+$ACLOCAL
+$AUTOMAKE -i
-grep '^\.c\.o' Makefile.in > /dev/null || Exit 1
+grep '^\.c\.o' Makefile.in
-$AUTOMAKE || Exit 1
-grep '^\.c\.o' Makefile.in > /dev/null || Exit 1
+$AUTOMAKE
+grep '^\.c\.o' Makefile.in
diff --git a/tests/suffix3.test b/tests/suffix3.test
index 1e8a00d..0381456 100755
--- a/tests/suffix3.test
+++ b/tests/suffix3.test
@@ -30,13 +30,12 @@ bin_PROGRAMS = foo
foo_SOURCES = foo.zoo
END
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
# The foo.cc intermediate step is implicit, it's a mistake if
# Automake requires this file somewhere.
$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
diff --git a/tests/suffix4.test b/tests/suffix4.test
index b1d6068..4e4e970 100755
--- a/tests/suffix4.test
+++ b/tests/suffix4.test
@@ -30,7 +30,6 @@ bin_PROGRAMS = foo
foo_SOURCES = foo.k
END
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
-grep '.SUFFIXES:.*\.k' Makefile.in || Exit 1
-Exit 0
+$ACLOCAL
+$AUTOMAKE
+grep '.SUFFIXES:.*\.k' Makefile.in
diff --git a/tests/suffix5.test b/tests/suffix5.test
index 1fd55d3..3dd0be2 100755
--- a/tests/suffix5.test
+++ b/tests/suffix5.test
@@ -38,7 +38,6 @@ END
: > config.guess
: > config.sub
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
-grep '_OBJECTS.*foo.lo' Makefile.in || Exit 1
-Exit 0
+$ACLOCAL
+$AUTOMAKE
+grep '_OBJECTS.*foo.lo' Makefile.in
diff --git a/tests/suffix6.test b/tests/suffix6.test
index 79759d6..dd2fc29 100755
--- a/tests/suffix6.test
+++ b/tests/suffix6.test
@@ -33,12 +33,12 @@ END
: > fooa
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
# 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
# fuc --[c.o]--> fu.$(OBJEXT) ## This is really meant !
-grep '_OBJECTS.* fu\.$(OBJEXT)' Makefile.in || Exit 1
+grep '_OBJECTS.* fu\.$(OBJEXT)' Makefile.in
diff --git a/tests/suffix7.test b/tests/suffix7.test
index 170660b..dfd1792 100755
--- a/tests/suffix7.test
+++ b/tests/suffix7.test
@@ -28,8 +28,8 @@ END
: > fooa
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
# Make sure Automake has NOT recognized .cpp and .idlC as two new
# extensions.
diff --git a/tests/symlink2.test b/tests/symlink2.test
index cb2cd30..258f0d3 100755
--- a/tests/symlink2.test
+++ b/tests/symlink2.test
@@ -24,5 +24,5 @@ ln -s Zardoz mkinstalldirs
: > Makefile.am
-$ACLOCAL || Exit 1
+$ACLOCAL
$AUTOMAKE --add-missing
diff --git a/tests/symlink3.test b/tests/symlink3.test
index 12cb714..a82fa72 100755
--- a/tests/symlink3.test
+++ b/tests/symlink3.test
@@ -26,8 +26,8 @@ echo zot > mkinstalldirs
: > Makefile.am
-$ACLOCAL || Exit 1
-$AUTOMAKE --add-missing --force-missing || Exit 1
+$ACLOCAL
+$AUTOMAKE --add-missing --force-missing
grep zot mkinstalldirs && Exit 1
Exit 0
diff --git a/tests/tags.test b/tests/tags.test
index 055989f..38df7cf 100755
--- a/tests/tags.test
+++ b/tests/tags.test
@@ -25,7 +25,7 @@ END
: > iguana.h
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
grep '^ID:' Makefile.in
diff --git a/tests/txinfo.test b/tests/txinfo.test
index 3f1c533..9b12c40 100755
--- a/tests/txinfo.test
+++ b/tests/txinfo.test
@@ -29,8 +29,8 @@ END
echo '@setfilename textutils.info' > textutils.texi
: > texinfo.tex
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
-$FGREP -v @SET_MAKE@ Makefile.in > Makefile.sed
+sed '/@SET_MAKE@/d' Makefile.in > Makefile.sed
$MAKE -s -f Makefile.sed SHELL=$SHELL magic | grep 'texinfo\.tex'
diff --git a/tests/txinfo5.test b/tests/txinfo5.test
index 0bbc7d9..68d6c1e 100755
--- a/tests/txinfo5.test
+++ b/tests/txinfo5.test
@@ -28,5 +28,5 @@ END
echo '@setfilename ian.info' > ian.texi
-$ACLOCAL || Exit 1
+$ACLOCAL
$AUTOMAKE --cygnus
diff --git a/tests/txinfo6.test b/tests/txinfo6.test
index ad3704e..d85860e 100755
--- a/tests/txinfo6.test
+++ b/tests/txinfo6.test
@@ -24,7 +24,7 @@ END
echo '@setfilename foo.info' > foo.txi
: > texinfo.tex
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
$FGREP '.txi.info' Makefile.in
diff --git a/tests/txinfo7.test b/tests/txinfo7.test
index 466a216..4f9c30a 100755
--- a/tests/txinfo7.test
+++ b/tests/txinfo7.test
@@ -27,7 +27,7 @@ END
echo '@setfilename textutils.info' > textutils.texi
-$ACLOCAL || Exit 1
-$AUTOMAKE -a || Exit 1
+$ACLOCAL
+$AUTOMAKE -a
test -f texinfo.tex
diff --git a/tests/txinfo8.test b/tests/txinfo8.test
index 7975b28..9f9ad74 100755
--- a/tests/txinfo8.test
+++ b/tests/txinfo8.test
@@ -41,12 +41,9 @@ magic:
@echo $(DISTFILES)
END
-$ACLOCAL || Exit 1
-$AUTOMAKE -a || Exit 1
+$ACLOCAL
+$AUTOMAKE -a
-$FGREP -v @SET_MAKE@ sub/Makefile.in > sub/Makefile.sed
-test -f sub/texinfo.tex &&
+sed '/@SET_MAKE@/d' 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
diff --git a/tests/txinfo9.test b/tests/txinfo9.test
index b9eb7b5..9426960 100755
--- a/tests/txinfo9.test
+++ b/tests/txinfo9.test
@@ -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
+$AUTOMAKE
test `grep '^dist-info:' Makefile.in | wc -l` -eq 1
diff --git a/tests/vars.test b/tests/vars.test
index ae711b0..0065878 100755
--- a/tests/vars.test
+++ b/tests/vars.test
@@ -26,5 +26,5 @@ MY_FLAGS_3 =-DABC=345
MY_FLAGS_4 = -DABC=345
END
-$ACLOCAL || Exit 1
+$ACLOCAL
$AUTOMAKE
diff --git a/tests/version.test b/tests/version.test
index bfa3f43..c3ec8a7 100755
--- a/tests/version.test
+++ b/tests/version.test
@@ -36,5 +36,5 @@ END
: > ChangeLog
: > THANKS
-$ACLOCAL || Exit 1
+$ACLOCAL
$AUTOMAKE --gnits
diff --git a/tests/version2.test b/tests/version2.test
index 993c0ba..680480e 100755
--- a/tests/version2.test
+++ b/tests/version2.test
@@ -36,5 +36,5 @@ END
: > ChangeLog
: > THANKS
-$ACLOCAL || Exit 1
+$ACLOCAL
$AUTOMAKE --gnits
diff --git a/tests/version4.test b/tests/version4.test
index 9ec0cba..402e030 100755
--- a/tests/version4.test
+++ b/tests/version4.test
@@ -22,5 +22,5 @@ cat > Makefile.am << 'END'
AUTOMAKE_OPTIONS = 1.4-p3
END
-$ACLOCAL || Exit 1
+$ACLOCAL
$AUTOMAKE
diff --git a/tests/vpath.test b/tests/vpath.test
index 850aaeb..c89ecd7 100755
--- a/tests/vpath.test
+++ b/tests/vpath.test
@@ -23,8 +23,8 @@ cat > Makefile.am << 'END'
VPATH = zardoz
END
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
grep 'address@hidden@' Makefile.in && Exit 1
Exit 0
diff --git a/tests/vtexi2.test b/tests/vtexi2.test
index 633fe13..9554f8d 100755
--- a/tests/vtexi2.test
+++ b/tests/vtexi2.test
@@ -34,7 +34,7 @@ END
: > mdate-sh
: > texinfo.tex
-$ACLOCAL || Exit 1
-$AUTOMAKE || Exit 1
+$ACLOCAL
+$AUTOMAKE
grep '^zardoz\.dvi:' Makefile.in
diff --git a/tests/werror.test b/tests/werror.test
index 5c7a0b5..11e9480 100755
--- a/tests/werror.test
+++ b/tests/werror.test
@@ -22,5 +22,5 @@
rm -f install-sh depcomp missing mkinstalldirs
-$ACLOCAL || Exit 1
+$ACLOCAL
$AUTOMAKE --Werror --add-missing
--
1.6.5