[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Automake-commit] [SCM] GNU Automake branch, ng/master, updated. v1.12.1
|
From: |
Stefano Lattarini |
|
Subject: |
[Automake-commit] [SCM] GNU Automake branch, ng/master, updated. v1.12.1-530-g7a3a1b6 |
|
Date: |
Sat, 30 Jun 2012 18:39:22 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".
http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=7a3a1b6d8b030312203c22e137f1d387566487b4
The branch, ng/master has been updated
via 7a3a1b6d8b030312203c22e137f1d387566487b4 (commit)
via f99ee7616ced4d07684a30a67b72e46aba00c65f (commit)
via 498492fdb4dd7db6a0d3aa631c350a57da3d2ab5 (commit)
via e2f007f0c78e011c5fab60bfad332f6aad0989f1 (commit)
via 9238349c18f1a6f73c32d1e8b62fb5cfaa83bd06 (commit)
via 68337f9a48e68eaf65460e82f0e6fe5e3450547e (commit)
via bf258729df870cf308f9f92e833d75f192d48a2d (commit)
via 8c784651a7da7dc85bd989e75ce63e35762ce27f (commit)
via e857a8e7e44592e98848177271d1b41710e4fdaa (commit)
via e14ce4482422b56150c483cc896466ce18b6b0f9 (commit)
via 872113f7803150af12e757515a64aca24cc7d409 (commit)
via f7b3752bdb1763d2bae2452849735fbca5b73758 (commit)
via d3a51faf8b62c80423dc71cd7d307fca6a2aa520 (commit)
via 0449b1dc510d65cdbb8c0aa4f46698c02c3fbc36 (commit)
via 5d99776ce05b7a954ccf30d7ed666494c0db4e91 (commit)
via 073216069b0f94ce4a92f5a007c953152c896424 (commit)
via b0df891f28bb86a953e52c31bc782c9a325e8130 (commit)
via cbbd1d1382752fa749e07916dd5b0d34e4c3298f (commit)
via 60a69375f9802af288ccc82ca4c15b85ce869e28 (commit)
via 97cee35c19a98f15d39ecd5e711e95d7485d2cb3 (commit)
via 32b141596d3e7de90a64cc2922bb23d3ce55f4ca (commit)
via f0c5b7621906079a039c1693b9ee99cadecf1f97 (commit)
via de20404a6d15db5d913de632e2099b864a373546 (commit)
via 9c906bc7a82aa0cc914c724a7f7fc3518036913c (commit)
via da38b09b831ded38e5bcd29207637309719c6a44 (commit)
via 7721f22a2c0f5b286d04427d011351602341de02 (commit)
via a455713ab332e9c426cdcf048d6c248b93122020 (commit)
via b21d68690612214d8edd810acf11880c3c0ad586 (commit)
via d25fac43a7c239fe8f56b2ce1b87ef3e3d4d7ef0 (commit)
via da9ad6fafeaf5dfa710a1a2b4176d1a049fddf13 (commit)
via 70b71392807b18e57217e9ed7975965866ae88bc (commit)
via 27478539b094a2b0bee4f8a452bec552edcabdbe (commit)
via 78900b933039b7001443be126b63862430ec2648 (commit)
via e677ba931c0a9bb2dee3197b49b6fe088065e96c (commit)
via b4b6a1a61dd0ee28e3d50869c959dea04e6a6b71 (commit)
via dabdb014914477f54049468b47fa6bf8a2d2f8e5 (commit)
via c2a52bf0e8e87b8f347ca22b9ab2da7613bc4336 (commit)
via aa630a928a586fd8dc8a087337c3462d7f4fd1c6 (commit)
via dbc83fa9f32ee17e52d02d58e1a840fd046ed9a9 (commit)
from 8eda774e3d2311513a35c49d7cad5e05c5fd9e03 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 7a3a1b6d8b030312203c22e137f1d387566487b4
Merge: 0449b1d f99ee76
Author: Stefano Lattarini <address@hidden>
Date: Sat Jun 30 20:18:32 2012 +0200
Merge branch 'master' into ng/master
* master:
texi: clean after Texinfo manuals in $(SUBDIRS) directories correctly
coverage: regression in texinfo "make mostlyclean" with $(SUBDIRS)
tests: fix a spurious failure
configure: fix detection of POSIX shell to work in a VPATH build
tests: prefer "test ! -e FILE" to check that a file doesn't exist
configure: move a misplaced "section" comment
configure: clump check for ${var%...} and ${var#...} expansion together
cosmetics: improve wording of a couple of configure messages
configure: the testsuite shell must support 'test -e' and 'test ! -e'
tests: remove stale workarounds for Solaris /bin/sh
Signed-off-by: Stefano Lattarini <address@hidden>
commit 0449b1dc510d65cdbb8c0aa4f46698c02c3fbc36
Merge: cbbd1d1 5d99776
Author: Stefano Lattarini <address@hidden>
Date: Thu Jun 28 18:52:16 2012 +0200
Merge branch 'master' into ng/master
* master:
tests init: don't bother allowing '$me' to be overridable
tests init: typofixes in comments
tests: one test was not executable, make it so
readme: fix typo in t/README: s/$((...)/$((...))/
tests: don't skip if $(abs_builddir) or $(abs_srcdir) contain whitespace
tests: avoid spurious maintainer-check failures
tests: remove obsolete hacks around maintainer-check false positives
Signed-off-by: Stefano Lattarini <address@hidden>
commit cbbd1d1382752fa749e07916dd5b0d34e4c3298f
Author: Stefano Lattarini <address@hidden>
Date: Thu Jun 28 17:37:23 2012 +0200
[ng] tests: drop another use of 'using_gmake'
* t/subdir-order.sh: Here. The new 'using_gmake' instance had been
brought in one of the recent merges from master.
Signed-off-by: Stefano Lattarini <address@hidden>
commit 32b141596d3e7de90a64cc2922bb23d3ce55f4ca
Author: Stefano Lattarini <address@hidden>
Date: Thu Jun 28 17:31:52 2012 +0200
[ng] tests: more uses of $(...) over `...` for command substitution
Caught by the 'sc_tests_command_subst' maintainer check.
* Several tests: Adjust. Also ...
* t/memoize.tap: ... use $((...)) instead of `expr ...` here,
and ...
* t/parallel-tests-dynamic.sh: ... add a missing quote here.
Signed-off-by: Stefano Lattarini <address@hidden>
commit da38b09b831ded38e5bcd29207637309719c6a44
Author: Stefano Lattarini <address@hidden>
Date: Thu Jun 28 16:36:10 2012 +0200
tests: remove a botched comments
* t/suffix-custom.sh: Here.
Signed-off-by: Stefano Lattarini <address@hidden>
commit 7721f22a2c0f5b286d04427d011351602341de02
Merge: 8eda774 b21d686
Author: Stefano Lattarini <address@hidden>
Date: Thu Jun 28 15:57:28 2012 +0200
Merge branch 'master' into ng/master
* master:
cosmetics: remove trailing whitespace in some files
coverage: enhance tests in 'missing' script a little
coverage: tests AM_MISSING_PROG usage
docs: document AM_MISSING_PROG
tests: fix a spurious failure with Solaris make
tests: simpler workaround for shells losing the exit status in exit trap
tests: avoid several spurious failures on Solaris
tests: avoid a spurious failure on NetBSD
+ Extra non-trivial edits:
* Several tests: Adjusted to use 'exit' rather than 'Exit'.
Signed-off-by: Stefano Lattarini <address@hidden>
-----------------------------------------------------------------------
Summary of changes:
Makefile.am | 1 -
automake.in | 4 +-
configure.ac | 47 +++++++------
defs | 4 +-
defs-static.in | 12 +++-
doc/automake-ng.texi | 10 +++
gen-testsuite-part | 15 ++---
lib/missing | 2 +-
syntax-checks.mk | 21 ++----
t/README | 9 +--
t/ac-output-old.tap | 4 +-
t/acloca10.sh | 20 +++---
t/acloca11.sh | 2 +-
t/acloca12.sh | 6 +-
t/acloca13.sh | 6 +-
t/acloca14.sh | 16 ++--
t/acloca15.sh | 6 +-
t/acloca16.sh | 4 +-
t/acloca17.sh | 4 +-
t/acloca18.sh | 12 ++--
t/acloca19.sh | 8 +-
t/acloca20.sh | 2 +-
t/acloca21.sh | 2 +-
t/acloca22.sh | 6 +-
t/acloca23.sh | 6 +-
t/aclocal-acdir.sh | 4 +-
t/aclocal-autoconf-version-check.sh | 6 +-
t/aclocal-install-absdir.sh | 2 +-
t/aclocal-install-fail.sh | 14 ++--
t/aclocal-install-mkdir.sh | 20 +++---
t/aclocal-no-install-no-mkdir.sh | 7 +-
t/aclocal-path-install-serial.sh | 4 +-
t/aclocal-path-install.sh | 6 +-
t/aclocal-path-nonexistent.sh | 2 +-
t/aclocal-path-precedence.sh | 4 +-
t/aclocal-path.sh | 6 +-
t/aclocal-print-acdir.sh | 2 +-
t/aclocal-verbose-install.sh | 4 +-
t/aclocal.sh | 10 ++--
t/aclocal3.sh | 4 +-
t/aclocal4.sh | 2 +-
t/aclocal5.sh | 2 +-
t/aclocal6.sh | 2 +-
t/aclocal7.sh | 4 +-
t/aclocal8.sh | 6 +-
t/aclocal9.sh | 2 +-
t/acsilent.sh | 4 +-
t/acsubst.sh | 2 +-
t/acsubst2.sh | 2 +-
t/add-missing.tap | 8 +--
t/all-prog-libs.sh | 2 +-
t/all.sh | 2 +-
t/all2.sh | 4 +-
t/alloca.sh | 2 +-
t/alloca2.sh | 2 +-
t/alpha.sh | 6 +-
t/alpha2.sh | 2 +-
t/am-default-source-ext.sh | 2 +-
t/am-dir.sh | 2 +-
t/{ammissing.sh => am-macro-not-found.sh} | 4 +-
t/am-missing-prog.sh | 97 +++++++++++++++++++++++++
t/am-tests-environment.sh | 8 +-
t/amassign.sh | 2 +-
t/amhello-binpkg.sh | 2 +-
t/amhello-cflags.sh | 4 +-
t/amhello-cross-compile.sh | 6 +-
t/aminit-moreargs-no-more.sh | 4 +-
t/amopt.sh | 2 +-
t/amopts-location.sh | 4 +-
t/amopts-variable-expansion.sh | 8 +-
t/amsubst.sh | 2 +-
t/ansi2knr-no-more.sh | 8 +-
t/ar-lib.sh | 2 +-
t/ar-lib2.sh | 4 +-
t/ar-lib3.sh | 2 +-
t/ar-lib4.sh | 2 +-
t/ar-lib5a.sh | 2 +-
t/ar-lib5b.sh | 2 +-
t/ar-lib6a.sh | 4 +-
t/ar-lib6b.sh | 4 +-
t/ar-lib7.sh | 2 +-
t/ar.sh | 2 +-
t/ar2.sh | 2 +-
t/ar3.sh | 2 +-
t/ar4.sh | 4 +-
t/ar5.sh | 4 +-
t/asm.sh | 2 +-
t/asm2.sh | 2 +-
t/asm3.sh | 2 +-
t/autodist-aclocal-m4.sh | 2 +-
t/autodist-configure-no-subdir.sh | 2 +-
t/autodist-no-duplicate.sh | 4 +-
t/autodist-stamp-vti.sh | 2 +-
t/autodist-subdir.sh | 4 +-
t/autodist.sh | 4 +-
t/autohdr.sh | 2 +-
t/autohdr3.sh | 2 +-
t/autohdr4.sh | 6 +-
t/autohdrdry.sh | 4 +-
t/automake-cmdline.tap | 2 +-
t/auxdir-autodetect.sh | 8 +-
t/auxdir-computed.tap | 2 +-
t/auxdir-misplaced.sh | 2 +-
t/auxdir-nonexistent.sh | 2 +-
t/auxdir-unportable.tap | 2 +-
t/auxdir.sh | 2 +-
t/auxdir6.sh | 2 +-
t/auxdir7.sh | 2 +-
t/auxdir8.sh | 2 +-
t/ax/depcomp-shuffle.sh | 10 ++--
t/ax/is | 3 +
t/ax/is_newest | 8 ++-
t/ax/plain-functions.sh | 8 +-
t/ax/tap-functions.sh | 4 +-
t/ax/tap-summary-aux.sh | 14 ++--
t/ax/test-init.sh | 86 +++++++---------------
t/ax/testsuite-summary-checks.sh | 8 +-
t/backcompat-acout.sh | 2 +-
t/backsl.sh | 6 +-
t/backsl2.sh | 2 +-
t/backsl4.sh | 2 +-
t/backslash-tricks.sh | 2 +-
t/badline.sh | 4 +-
t/badopt.sh | 2 +-
t/badprog.sh | 2 +-
t/block.sh | 6 +-
t/bsource.sh | 4 +-
t/built-sources-check.sh | 6 +-
t/built-sources-cond.sh | 2 +-
t/built-sources-install.sh | 4 +-
t/built-sources-subdir.sh | 2 +-
t/built-sources.sh | 2 +-
t/c-demo.sh | 8 +-
t/candist.sh | 4 +-
t/canon-name.sh | 2 +-
t/canon.sh | 2 +-
t/canon2.sh | 4 +-
t/canon3.sh | 4 +-
t/canon4.sh | 4 +-
t/canon5.sh | 2 +-
t/canon6.sh | 4 +-
t/canon7.sh | 2 +-
t/canon8.sh | 4 +-
t/ccnoco.sh | 2 +-
t/ccnoco2.sh | 2 +-
t/ccnoco3.sh | 6 +-
t/check-concurrency-bug9245.sh | 14 ++--
t/check-exported-srcdir.sh | 4 +-
t/check-fd-redirect.sh | 6 +-
t/check-no-test-driver.sh | 6 +-
t/check-subst-prog.sh | 2 +-
t/check-subst.sh | 2 +-
t/check-tests-in-builddir.sh | 12 ++--
t/check10.sh | 18 +++---
t/check11.sh | 10 ++--
t/check12.sh | 34 +++++-----
t/check2.sh | 6 +-
t/check4.sh | 12 ++--
t/check5.sh | 2 +-
t/check6.sh | 2 +-
t/check7.sh | 2 +-
t/check8.sh | 10 ++--
t/checkall.sh | 2 +-
t/clean.sh | 2 +-
t/cleanvars.sh | 2 +-
t/colneq2.sh | 2 +-
t/colon.sh | 2 +-
t/colon2.sh | 6 +-
t/colon3.sh | 6 +-
t/colon4.sh | 6 +-
t/colon5.sh | 6 +-
t/colon6.sh | 10 ++--
t/colon7.sh | 4 +-
t/color.sh | 8 +-
t/color2.sh | 13 ++--
t/comment.sh | 2 +-
t/comment2.sh | 6 +-
t/comment4.sh | 2 +-
t/comment6.sh | 4 +-
t/comment7.sh | 4 +-
t/comment8.sh | 2 +-
t/comment9.sh | 6 +-
t/comments-in-var-def.sh | 2 +-
t/compile.sh | 8 +-
t/compile2.sh | 2 +-
t/compile3.sh | 2 +-
t/compile4.sh | 2 +-
t/compile5.sh | 4 +-
t/compile6.sh | 2 +-
t/compile_f90_c_cxx.sh | 2 +-
t/compile_f_c_cxx.sh | 2 +-
t/cond-basic.sh | 2 +-
t/cond.sh | 6 +-
t/cond10.sh | 2 +-
t/cond11.sh | 2 +-
t/cond13.sh | 2 +-
t/cond14.sh | 2 +-
t/cond15.sh | 2 +-
t/cond16.sh | 2 +-
t/cond17.sh | 2 +-
t/cond18.sh | 2 +-
t/cond19.sh | 2 +-
t/cond20.sh | 2 +-
t/cond21.sh | 2 +-
t/cond22.sh | 2 +-
t/cond23.sh | 2 +-
t/cond24.sh | 2 +-
t/cond25.sh | 2 +-
t/cond26.sh | 2 +-
t/cond27.sh | 4 +-
t/cond28.sh | 2 +-
t/cond3.sh | 2 +-
t/cond30.sh | 2 +-
t/cond31.sh | 2 +-
t/cond32.sh | 2 +-
t/cond33.sh | 12 ++--
t/cond34.sh | 10 ++--
t/cond35.sh | 2 +-
t/cond36.sh | 2 +-
t/cond37.sh | 14 ++--
t/cond38.sh | 2 +-
t/cond39.sh | 18 +++---
t/cond4.sh | 6 +-
t/cond40.sh | 20 +++---
t/cond41.sh | 4 +-
t/cond42.sh | 2 +-
t/cond43.sh | 2 +-
t/cond44.sh | 8 +-
t/cond45.sh | 8 +-
t/cond46.sh | 2 +-
t/cond5.sh | 6 +-
t/cond6.sh | 2 +-
t/cond7.sh | 6 +-
t/cond8.sh | 4 +-
t/cond9.sh | 2 +-
t/condd.sh | 4 +-
t/condhook.sh | 4 +-
t/condhook2.sh | 2 +-
t/condinc.sh | 4 +-
t/condinc2.sh | 2 +-
t/condlib.sh | 6 +-
t/condman2.sh | 2 +-
t/condman3.sh | 2 +-
t/confdeps.sh | 4 +-
t/conff.sh | 14 ++--
t/conff2.sh | 2 +-
t/conffile-leading-dot.sh | 4 +-
t/confh-subdir-clean.sh | 4 +-
t/confh.sh | 2 +-
t/confh4.sh | 2 +-
t/confh5.sh | 3 +-
t/confh6.sh | 2 +-
t/confh7.sh | 2 +-
t/confh8.sh | 2 +-
t/confincl.sh | 4 +-
t/conflnk.sh | 14 ++--
t/conflnk2.sh | 2 +-
t/conflnk3.sh | 12 ++--
t/conflnk4.sh | 10 ++--
t/confsub.sh | 4 +-
t/confvar.sh | 2 +-
t/confvar2.sh | 2 +-
t/copy.sh | 2 +-
t/cscope.tap | 10 ++--
t/cscope2.sh | 2 +-
t/cscope3.sh | 2 +-
t/cxx-demo.sh | 6 +-
t/cxx-fortran.sh | 4 +-
t/cxx-lt-demo.sh | 6 +-
t/cxx2.sh | 2 +-
t/cxxcpp.sh | 2 +-
t/cxxlibobj.sh | 2 +-
t/cxxlink.sh | 2 +-
t/cygnus-no-more.sh | 2 +-
t/cygwin32.sh | 4 +-
t/dash.sh | 2 +-
t/defun.sh | 2 +-
t/defun2.sh | 2 +-
t/dejagnu-absolute-builddir.sh | 2 +-
t/dejagnu-relative-srcdir.sh | 2 +-
t/dejagnu-siteexp-append.sh | 2 +-
t/dejagnu-siteexp-extend.sh | 12 ++--
t/dejagnu-siteexp-useredit.sh | 2 +-
t/dejagnu.sh | 2 +-
t/dejagnu2.sh | 2 +-
t/dejagnu3.sh | 4 +-
t/dejagnu4.sh | 4 +-
t/dejagnu5.sh | 2 +-
t/dejagnu6.sh | 4 +-
t/dejagnu7.sh | 4 +-
t/deleted-am.sh | 8 +-
t/deleted-m4.sh | 10 ++--
t/depacl2.sh | 2 +-
t/depcomp-implicit-auxdir.sh | 2 +-
t/depcomp-recover.sh | 4 +-
t/depcomp-shuffle-sub-vpath.sh | 2 +-
t/depcomp-shuffle-sub.sh | 4 +-
t/depcomp-shuffle-vpath.sh | 4 +-
t/depcomp-shuffle.sh | 4 +-
t/depcomp.sh | 2 +-
t/depcomp2.sh | 4 +-
t/depcomp8a.sh | 4 +-
t/depcomp8b.sh | 4 +-
t/depdist.sh | 2 +-
t/depend.sh | 2 +-
t/depend3.sh | 2 +-
t/depend4.sh | 2 +-
t/deprecated-acinit.sh | 6 +-
t/destdir.sh | 4 +-
t/dirlist-abspath.sh | 4 +-
t/dirlist.sh | 6 +-
t/dirlist2.sh | 4 +-
t/discover.sh | 2 +-
t/dist-auxdir-many-subdirs.sh | 2 +-
t/dist-auxfile-2.sh | 2 +-
t/dist-auxfile.sh | 8 +-
t/dist-formats.tap | 2 +-
t/dist-included-parent-dir.sh | 2 +-
t/dist-missing-am.sh | 6 +-
t/dist-missing-included-m4.sh | 6 +-
t/dist-missing-m4.sh | 6 +-
t/dist-pr109765.sh | 6 +-
t/dist-readonly.sh | 10 ++--
t/dist-repeated.sh | 2 +-
t/dist-srcdir.sh | 4 +-
t/dist-srcdir2.sh | 6 +-
t/distcheck-configure-flags-am.sh | 6 +-
t/distcheck-configure-flags-subpkg.sh | 6 +-
t/distcheck-configure-flags.sh | 4 +-
t/distcheck-hook.sh | 6 +-
t/distcheck-hook2.sh | 6 +-
t/distcheck-missing-m4.sh | 18 +++---
t/distcheck-outdated-m4.sh | 16 ++--
t/distcheck-override-infodir.sh | 4 +-
t/distcheck-pr10470.sh | 4 +-
t/distcheck-pr9579.sh | 6 +-
t/distcheck-writable-srcdir.sh | 2 +-
t/distcleancheck.sh | 4 +-
t/distcom-subdir.sh | 4 +-
t/distcom2.sh | 2 +-
t/distcom3.sh | 6 +-
t/distcom4.sh | 2 +-
t/distcom5.sh | 2 +-
t/distdir.sh | 6 +-
t/disthook.sh | 8 +--
t/distlinks.sh | 2 +-
t/distlinksbrk.sh | 16 ++--
t/distname.sh | 6 +-
t/dmalloc.sh | 2 +-
t/dollar.sh | 2 +-
t/double-colon-rules.sh | 2 +-
t/double.sh | 2 +-
t/dup2.sh | 2 +-
t/else.sh | 2 +-
t/empty-data-primary.sh | 2 +-
t/empty-sources-primary.tap | 2 +-
t/ensure-dir-exists.sh | 2 +-
t/exdir.sh | 2 +-
t/exdir2.sh | 4 +-
t/exdir3.sh | 2 +-
t/exeext.sh | 8 +-
t/exeext2.sh | 2 +-
t/exeext3.sh | 2 +-
t/exeext4.sh | 2 +-
t/exsource.sh | 2 +-
t/ext.sh | 4 +-
t/ext2.sh | 2 +-
t/extra-portability.sh | 8 +-
t/extra-portability2.sh | 2 +-
t/extra-programs-empty.sh | 2 +-
t/extra.sh | 6 +-
t/extra10.sh | 2 +-
t/extra11.sh | 2 +-
t/extra12.sh | 2 +-
t/extra2.sh | 6 +-
t/extra3.sh | 2 +-
t/extra4.sh | 2 +-
t/extra5.sh | 2 +-
t/extra6.sh | 2 +-
t/extra7.sh | 2 +-
t/extra8.sh | 2 +-
t/extra9.sh | 6 +-
t/extradep.sh | 10 ++--
t/extradep2.sh | 6 +-
t/f90only.sh | 2 +-
t/flavor.sh | 2 +-
t/flibs.sh | 2 +-
t/fn99.sh | 8 +-
t/fn99subdir.sh | 12 ++--
t/fonly.sh | 2 +-
t/forcemiss.sh | 4 +-
t/forcemiss2.sh | 4 +-
t/fort1.sh | 2 +-
t/fort2.sh | 20 +++---
t/fort4.sh | 4 +-
t/fort5.sh | 10 ++--
t/fortdep.sh | 6 +-
t/gcj.sh | 2 +-
t/gcj2.sh | 2 +-
t/gcj3.sh | 2 +-
t/gcj4.sh | 4 +-
t/gcj5.sh | 2 +-
t/gcj6.sh | 2 +-
t/get-sysconf.sh | 6 +-
t/gettext-macros.sh | 2 +-
t/gettext.sh | 2 +-
t/gettext2.sh | 4 +-
t/gettext3.sh | 2 +-
t/gmake-vars.sh | 2 +-
t/gnits.sh | 2 +-
t/gnits2.sh | 6 +-
t/gnits3.sh | 6 +-
t/gnumake.sh | 2 +-
t/gnuwarn.sh | 4 +-
t/gnuwarn2.sh | 2 +-
t/hdr-vars-defined-once.sh | 2 +-
t/header.sh | 6 +-
t/help-depend.sh | 2 +-
t/help-depend2.sh | 2 +-
t/help-dmalloc.sh | 2 +-
t/help-init.sh | 4 +-
t/help-lispdir.sh | 4 +-
t/help-multilib.sh | 2 +-
t/help-python.sh | 2 +-
t/help-silent.sh | 2 +-
t/help-upc.sh | 2 +-
t/help.sh | 4 +-
t/help2.sh | 6 +-
t/help3.sh | 10 ++--
t/help4.sh | 18 +++---
t/hfs.sh | 2 +-
t/implicit.sh | 2 +-
t/info.sh | 4 +-
t/init.sh | 6 +-
t/init2.sh | 4 +-
t/insh2.sh | 2 +-
t/install-info-dir.sh | 26 ++++----
t/install2.sh | 6 +-
t/installdir.sh | 2 +-
t/instdat.sh | 6 +-
t/instdat2.sh | 6 +-
t/instdir-cond.sh | 6 +-
t/instdir-cond2.sh | 4 +-
t/instdir-java.sh | 12 ++--
t/instdir-lisp.sh | 12 ++--
t/instdir-ltlib.sh | 16 ++--
t/instdir-no-empty.sh | 6 +-
t/instdir-prog.sh | 16 ++--
t/instdir-python.sh | 12 ++--
t/instdir-texi.sh | 12 ++--
t/instdir.sh | 12 ++--
t/instdir2.sh | 12 ++--
t/instexec.sh | 2 +-
t/instfail-info.sh | 4 +-
t/instfail-java.sh | 4 +-
t/instfail-libtool.sh | 8 +-
t/instfail.sh | 10 ++--
t/insthook.sh | 2 +-
t/instman.sh | 2 +-
t/instmany-mans.sh | 6 +-
t/instmany-python.sh | 6 +-
t/instmany.sh | 14 ++--
t/instsh.sh | 4 +-
t/instsh2.sh | 14 ++--
t/instsh3.sh | 2 +-
t/instspc.tap | 2 +-
t/internals.tap | 2 +-
t/interp.sh | 2 +-
t/interp2.sh | 2 +-
t/interp3.sh | 2 +-
t/java-check.sh | 8 +-
t/java-clean.sh | 4 +-
t/java-compile-install.sh | 2 +-
t/java-compile-run-flat.sh | 2 +-
t/java-compile-run-nested.sh | 2 +-
t/java-empty-classpath.sh | 2 +-
t/java-extra.sh | 8 +-
t/java-mix.sh | 12 ++--
t/java-no-duplicate.sh | 2 +-
t/java-nobase.sh | 2 +-
t/java-noinst.sh | 4 +-
t/java-rebuild.sh | 2 +-
t/java-sources.sh | 2 +-
t/java-uninstall.sh | 12 ++--
t/java.sh | 2 +-
t/java2.sh | 2 +-
t/java3.sh | 6 +-
t/javadir-undefined.sh | 4 +-
t/javaflags.sh | 4 +-
t/javaprim.sh | 2 +-
t/javasubst.sh | 2 +-
t/ldadd.sh | 4 +-
t/ldflags.sh | 2 +-
t/lex-clean-cxx.sh | 18 +++---
t/lex-clean.sh | 12 ++--
t/lex-depend-cxx.sh | 2 +-
t/lex-depend-grep.sh | 2 +-
t/lex-depend.sh | 6 +-
t/lex-lib-external.sh | 4 +-
t/lex-lib.sh | 2 +-
t/lex-libobj.sh | 2 +-
t/lex-line.sh | 10 ++--
t/lex-nodist.sh | 2 +-
t/lex-noyywrap.sh | 4 +-
t/lex-pr204.sh | 2 +-
t/lex-subobj-nodep.sh | 2 +-
t/lex.sh | 4 +-
t/lex2.sh | 2 +-
t/lex3.sh | 6 +-
t/lex5.sh | 2 +-
t/lexcpp.sh | 2 +-
t/lexvpath.sh | 2 +-
t/lflags.sh | 6 +-
t/lflags2.sh | 6 +-
t/libexec.sh | 2 +-
t/libobj-basic.sh | 2 +-
t/libobj10.sh | 2 +-
t/libobj12.sh | 2 +-
t/libobj13.sh | 2 +-
t/libobj14.sh | 2 +-
t/libobj15a.sh | 2 +-
t/libobj15b.sh | 2 +-
t/libobj15c.sh | 4 +-
t/libobj16a.sh | 2 +-
t/libobj16b.sh | 2 +-
t/libobj17.sh | 2 +-
t/libobj18.sh | 2 +-
t/libobj19.sh | 2 +-
t/libobj2.sh | 2 +-
t/libobj20b.sh | 2 +-
t/libobj20c.sh | 2 +-
t/libobj3.sh | 2 +-
t/libobj4.sh | 2 +-
t/libobj5.sh | 2 +-
t/libobj7.sh | 2 +-
t/library.sh | 2 +-
t/library2.sh | 2 +-
t/library3.sh | 2 +-
t/libtoo10.sh | 14 ++--
t/libtoo11.sh | 2 +-
t/libtool-macros.sh | 2 +-
t/libtool3.sh | 4 +-
t/libtool4.sh | 2 +-
t/libtool5.sh | 2 +-
t/libtool6.sh | 2 +-
t/libtool7.sh | 8 +-
t/libtool8.sh | 4 +-
t/libtool9.sh | 8 +-
t/license.sh | 4 +-
t/license2.sh | 2 +-
t/link_c_cxx.sh | 8 +-
t/link_cond.sh | 6 +-
t/link_dist.sh | 8 +-
t/link_f90_only.sh | 8 +-
t/link_f_only.sh | 8 +-
t/link_fc.sh | 8 +-
t/link_fccxx.sh | 8 +-
t/link_fcxx.sh | 8 +-
t/link_override.sh | 8 +-
t/lisp2.sh | 6 +-
t/lisp3.sh | 8 +-
t/lisp4.sh | 2 +-
t/lisp5.sh | 2 +-
t/lisp6.sh | 32 ++++----
t/lisp7.sh | 10 ++--
t/lisp8.sh | 6 +-
t/lispdry.sh | 10 ++--
t/listval.sh | 2 +-
t/local-targets.sh | 2 +-
t/location.sh | 6 +-
t/longlin2.sh | 4 +-
t/longline.sh | 2 +-
t/ltcond.sh | 26 ++++----
t/ltcond2.sh | 2 +-
t/ltconv.sh | 18 +++---
t/ltdeps.sh | 6 +-
t/ltinit.sh | 8 +-
t/ltinstloc.sh | 2 +-
t/ltlibobjs.sh | 2 +-
t/ltorder.sh | 6 +-
t/lzma.sh | 2 +-
t/m4-inclusion.sh | 4 +-
t/maintclean-vpath.sh | 24 +++---
t/maintclean.sh | 24 +++---
t/maintmode-configure-msg.sh | 6 +-
t/make-dryrun.tap | 2 +-
t/makefile-deps.sh | 4 +-
t/makej.sh | 2 +-
t/makej2.sh | 2 +-
t/maken.sh | 2 +-
t/maken3.sh | 22 +++---
t/makevars.sh | 4 +-
t/man.sh | 2 +-
t/man2.sh | 14 ++--
t/man3.sh | 2 +-
t/man5.sh | 20 +++---
t/man6.sh | 2 +-
t/man7.sh | 10 ++--
t/man8.sh | 2 +-
t/mdate.sh | 2 +-
t/mdate2.sh | 2 +-
t/mdate3.sh | 6 +-
t/mdate5.sh | 10 ++--
t/mdate6.sh | 4 +-
t/memoize.tap | 6 +-
t/missing-auxfile-stops-makefiles-creation.sh | 14 ++--
t/missing-version-mismatch.sh | 4 +-
t/missing3.sh | 16 ++--
t/mkinst2.sh | 6 +-
t/mkinst3.sh | 2 +-
t/mmode.sh | 10 ++--
t/mmodely.sh | 2 +-
t/multlib.sh | 2 +-
t/no-c.tap | 2 +-
t/no-extra-makefile-code.sh | 4 +-
t/nobase-libtool.sh | 2 +-
t/nobase-nodist.sh | 22 +++---
t/nobase-python.sh | 6 +-
t/nobase.sh | 2 +-
t/nodef2.sh | 4 +-
t/nodep2.sh | 4 +-
t/nodepcomp.sh | 2 +-
t/nodist.sh | 4 +-
t/nodist2.sh | 2 +-
t/nodist3.sh | 6 +-
t/noinst.sh | 2 +-
t/noinstdir.sh | 6 +-
t/nolink.sh | 6 +-
t/nostdinc.sh | 10 ++--
t/notrans.sh | 10 ++--
t/number.sh | 2 +-
t/objc-basic.sh | 2 +-
t/objc-deps.sh | 6 +-
t/objc-flags.sh | 8 +-
t/objc-megademo.sh | 4 +-
t/objc-minidemo.sh | 4 +-
t/objcxx-basic.sh | 2 +-
t/objcxx-deps.sh | 6 +-
t/objcxx-flags.sh | 8 +-
t/objcxx-minidemo.sh | 2 +-
t/objdir.sh | 2 +-
t/objext-pr10128.sh | 2 +-
t/oldvars.sh | 2 +-
t/option-ng.sh | 2 +-
t/order.sh | 2 +-
t/output-order.sh | 4 +-
t/output.sh | 2 +-
t/output10.sh | 2 +-
t/output11.sh | 4 +-
t/output12.sh | 2 +-
t/output13.sh | 8 +-
t/output2.sh | 6 +-
t/output3.sh | 2 +-
t/output4.sh | 6 +-
t/output5.sh | 2 +-
t/output6.sh | 2 +-
t/output7.sh | 2 +-
t/output8.sh | 2 +-
t/output9.sh | 2 +-
t/override-conditional-1.sh | 4 +-
t/override-conditional-2.sh | 2 +-
t/override-html.sh | 2 +-
t/override-suggest-local.sh | 6 +-
t/parallel-am.sh | 2 +-
t/parallel-am2.sh | 2 +-
t/parallel-am3.sh | 2 +-
t/parallel-tests-concatenated-suffix.sh | 4 +-
t/parallel-tests-console-output.sh | 4 +-
t/parallel-tests-driver-install.sh | 8 +-
t/parallel-tests-dry-run-1.sh | 4 +-
t/parallel-tests-dry-run-2.sh | 39 +++++-----
t/parallel-tests-dynamic.sh | 14 ++--
t/parallel-tests-empty-tests.sh | 4 +-
t/parallel-tests-exeext.sh | 6 +-
t/parallel-tests-exit-statuses.sh | 8 +-
t/parallel-tests-extra-programs.sh | 10 ++--
t/parallel-tests-fd-redirect-exeext.sh | 4 +-
t/parallel-tests-fd-redirect.sh | 4 +-
t/parallel-tests-fork-bomb.sh | 4 +-
t/parallel-tests-harderror.sh | 10 ++--
t/parallel-tests-internals.sh | 2 +-
t/parallel-tests-interrupt.tap | 2 +-
t/parallel-tests-log-compiler-1.sh | 8 +-
t/parallel-tests-log-compiler-2.sh | 4 +-
t/parallel-tests-log-override.sh | 12 ++--
t/parallel-tests-logvars-example.sh | 4 +-
t/parallel-tests-longest-stem.sh | 4 +-
t/parallel-tests-many.sh | 22 +++---
t/parallel-tests-no-color-in-log.sh | 19 +++---
t/parallel-tests-no-repeat.sh | 8 +-
t/parallel-tests-once.sh | 4 +-
t/parallel-tests-per-suffix-deps.sh | 2 +-
t/parallel-tests-recheck-depends-on-all.sh | 10 ++--
t/parallel-tests-reset-term.sh | 2 +-
t/parallel-tests-srcdir-in-test-name.sh | 2 +-
t/parallel-tests-subdir.sh | 2 +-
t/parallel-tests-suffix-prog.sh | 2 +-
t/parallel-tests-suffix.sh | 2 +-
t/parallel-tests-trailing-bslash.sh | 2 +-
t/parallel-tests-unreadable.sh | 4 +-
t/parallel-tests.sh | 44 ++++++------
t/parallel-tests10.sh | 2 +-
t/parallel-tests2.sh | 34 +++++-----
t/parallel-tests3.sh | 2 +-
t/parallel-tests5.sh | 2 +-
t/parallel-tests6.sh | 14 ++---
t/parallel-tests8.sh | 4 +-
t/parallel-tests9.sh | 14 ++--
t/parse.sh | 6 +-
t/pattern-rules.sh | 4 +-
t/pattern-rules2.sh | 2 +-
t/per-target-flags.sh | 16 ++--
t/perf/cond.sh | 2 +-
t/perf/testsuite-recheck.sh | 2 +-
t/perf/testsuite-summary.sh | 4 +-
t/phony.sh | 2 +-
t/pluseq.sh | 2 +-
t/pluseq10.sh | 4 +-
t/pluseq11.sh | 4 +-
t/pluseq2.sh | 2 +-
t/pluseq3.sh | 2 +-
t/pluseq4.sh | 2 +-
t/pluseq5.sh | 2 +-
t/pluseq6.sh | 2 +-
t/pluseq7.sh | 2 +-
t/pluseq8.sh | 2 +-
t/pluseq9.sh | 2 +-
t/posixsubst-data.sh | 2 +-
t/posixsubst-extradist.sh | 2 +-
t/posixsubst-ldadd.sh | 2 +-
t/posixsubst-libraries.sh | 2 +-
t/posixsubst-ltlibraries.sh | 2 +-
t/posixsubst-programs.sh | 2 +-
t/posixsubst-scripts.sh | 2 +-
t/posixsubst-sources.sh | 2 +-
t/ppf77.sh | 2 +-
t/pr2.sh | 2 +-
t/pr211.sh | 2 +-
t/pr220.sh | 4 +-
t/pr224.sh | 4 +-
t/pr229.sh | 2 +-
t/pr279-2.sh | 2 +-
t/pr279.sh | 2 +-
t/pr287.sh | 2 +-
t/pr300-lib.sh | 6 +-
t/pr300-ltlib.sh | 16 ++--
t/pr300-prog.sh | 2 +-
t/pr307.sh | 4 +-
t/pr401.sh | 8 +-
t/pr401b.sh | 8 +-
t/pr401c.sh | 8 +-
t/pr72.sh | 2 +-
t/pr8365-remake-timing.sh | 2 +-
t/pr87.sh | 2 +-
t/pr9.sh | 2 +-
t/prefix.sh | 2 +-
t/primary-prefix-couples-documented-valid.sh | 2 +-
t/primary-prefix-couples-force-valid.sh | 2 +-
t/primary-prefix-invalid-couples.tap | 4 +-
t/primary-prefix-valid-couples.sh | 2 +-
t/primary.sh | 2 +-
t/primary2.sh | 2 +-
t/primary3.sh | 2 +-
t/print-libdir.sh | 6 +-
t/proginst.sh | 2 +-
t/programs-primary-rewritten.sh | 2 +-
t/py-compile-basedir.sh | 6 +-
t/py-compile-basic.sh | 2 +-
t/py-compile-basic2.sh | 2 +-
t/py-compile-destdir.sh | 6 +-
t/py-compile-env.sh | 14 ++--
t/py-compile-option-terminate.sh | 2 +-
t/py-compile-usage.sh | 16 ++--
t/python-dist.sh | 4 +-
t/python-pr10995.sh | 6 +-
t/python-vars.sh | 6 +-
t/python-virtualenv.sh | 8 +-
t/python.sh | 2 +-
t/python10.sh | 26 ++++----
t/python11.sh | 6 +-
t/python12.sh | 4 +-
t/python2.sh | 2 +-
t/python3.sh | 2 +-
t/python4.sh | 6 +-
t/python5.sh | 4 +-
t/python5b.sh | 4 +-
t/python6.sh | 2 +-
t/python7.sh | 2 +-
t/python8.sh | 2 +-
t/python9.sh | 2 +-
t/recurs.sh | 2 +-
t/recurs2.sh | 2 +-
t/relativize.tap | 2 +-
t/remake-aclocal-version-mismatch.sh | 12 ++--
t/remake-all-1.sh | 4 +-
t/remake-am-pr10111.sh | 2 +-
t/remake-deleted-am-2.sh | 6 +-
t/remake-deleted-am-subdir.sh | 6 +-
t/remake-deleted-am.sh | 6 +-
t/remake-deleted-m4-file.sh | 2 +-
t/remake-gnulib-add-acsubst.sh | 2 +-
t/remake-gnulib-add-header.sh | 4 +-
t/remake-gnulib-remove-header.sh | 4 +-
t/remake-m4-pr10111.sh | 2 +-
t/remake-moved-m4-file.sh | 14 ++--
t/remake-renamed-am.sh | 6 +-
t/remake-renamed-m4-file.sh | 14 ++--
t/remake-renamed-m4-macro-and-file.sh | 8 +-
t/remake-renamed-m4-macro.sh | 2 +-
t/remake-subdir-from-subdir.sh | 2 +-
t/remake-subdir-gnu.sh | 6 +-
t/remake-subdir-long-time.sh | 2 +-
t/remake-subdir.sh | 6 +-
t/remake.sh | 2 +-
t/remake10a.sh | 18 +++---
t/remake10b.sh | 18 +++---
t/remake10c.sh | 18 +++---
t/remake11.sh | 4 +-
t/remake12.sh | 10 ++--
t/remake1a.sh | 4 +-
t/remake2.sh | 2 +-
t/remake3.sh | 2 +-
t/remake3a.sh | 2 +-
t/remake4.sh | 2 +-
t/remake5.sh | 4 +-
t/remake6.sh | 4 +-
t/remake7.sh | 14 ++--
t/remake8a.sh | 6 +-
t/remake8b.sh | 6 +-
t/remake9a.sh | 8 +-
t/remake9b.sh | 8 +-
t/remake9c.sh | 8 +-
t/remake9d.sh | 8 +-
t/repeated-options.sh | 7 +-
t/req.sh | 2 +-
t/reqd.sh | 2 +-
t/reqd2.sh | 2 +-
t/rulepat.sh | 2 +-
t/sanity.sh | 6 +-
t/scripts.sh | 2 +-
t/seenc.sh | 2 +-
t/self-check-cleanup.tap | 16 ++---
t/self-check-configure-help.sh | 8 +-
t/self-check-dir.tap | 27 +++----
t/self-check-env-sanitize.tap | 5 +-
t/self-check-exit.tap | 37 +++-------
t/self-check-explicit-skips.sh | 25 ++++---
t/self-check-is-blocked-signal.tap | 2 +-
t/self-check-is_newest.tap | 2 +-
t/self-check-me.tap | 29 ++------
t/self-check-reexec.tap | 2 +-
t/self-check-report.sh | 38 +++++-----
t/self-check-seq.tap | 2 +-
t/self-check-unindent.tap | 2 +-
t/serial-tests.sh | 10 ++--
t/silent-configsite.sh | 2 +-
t/silent-lex.sh | 24 +++---
t/silent-many-gcc.sh | 20 +++---
t/silent-many-generic.sh | 20 +++---
t/silent-texi.sh | 12 ++--
t/silent-yacc-headers.sh | 42 ++++++------
t/silent-yacc.sh | 24 +++---
t/silent.sh | 10 ++--
t/silent2.sh | 10 ++--
t/silent3.sh | 10 ++--
t/silent4.sh | 10 ++--
t/silent6.sh | 14 ++--
t/silent7.sh | 32 ++++----
t/silent9.sh | 10 ++--
t/silentcxx-gcc.sh | 12 ++--
t/silentcxx.sh | 12 ++--
t/silentf77.sh | 14 ++--
t/silentf90.sh | 14 ++--
t/space.sh | 2 +-
t/specflg-dummy.sh | 2 +-
t/specflg6.sh | 2 +-
t/specflg7.sh | 2 +-
t/specflg8.sh | 4 +-
t/specflg9.sh | 8 +-
t/spell.sh | 4 +-
t/spell2.sh | 4 +-
t/spell3.sh | 2 +-
t/spelling.sh | 2 +-
t/spy-autovars.sh | 2 +-
t/spy-pattern-rules.sh | 2 +-
t/spy-phony.sh | 14 ++--
t/spy-rm.tap | 2 +-
t/spy-trailing-backlash.sh | 4 +-
t/spy-var-append.sh | 4 +-
t/spy-vpath-rewrite.sh | 8 +-
t/spy-wildcard.sh | 2 +-
t/src-acsubst.sh | 2 +-
t/stamph2.sh | 10 ++--
t/stdinc-no-repeated.sh | 10 ++--
t/stdinc.sh | 2 +-
t/stdlib.sh | 2 +-
t/stdlib2.sh | 2 +-
t/strictness-override.sh | 2 +-
t/strictness-precedence.sh | 2 +-
t/strip.sh | 4 +-
t/strip2.sh | 2 +-
t/strip3.sh | 2 +-
t/subdir-ac-subst.sh | 2 +-
t/subdir-add-pr46.sh | 2 +-
t/subdir-add2-pr46.sh | 2 +-
t/subdir-am-cond.sh | 2 +-
t/subdir-cond-err.sh | 2 +-
t/subdir-cond-gettext.sh | 2 +-
t/subdir-distclean.sh | 26 ++++----
t/subdir-order.sh | 7 +-
t/subdir-subsub.sh | 2 +-
t/subdir-with-slash.sh | 4 +-
t/subdir.sh | 2 +-
t/subdir10.sh | 2 +-
t/subobj-c.sh | 6 +-
t/subobj-clean-lt-pr10697.sh | 18 +++---
t/subobj-clean-pr10697.sh | 16 ++--
t/subobj-cxx-grep.sh | 6 +-
t/subobj-cxx.sh | 4 +-
t/subobj-libtool.sh | 6 +-
t/subobj10.sh | 2 +-
t/subobj11a.sh | 2 +-
t/subobj5.sh | 2 +-
t/subobj7.sh | 4 +-
t/subobj8.sh | 2 +-
t/subobj9.sh | 8 +-
t/subobjname.sh | 2 +-
t/subpkg-yacc.sh | 4 +-
t/subpkg.sh | 6 +-
t/subpkg2.sh | 2 +-
t/subpkg3.sh | 2 +-
t/subpkg4.sh | 2 +-
t/subst.sh | 4 +-
t/subst3.sh | 2 +-
t/subst4.sh | 2 +-
t/subst5.sh | 6 +-
t/substre2.sh | 2 +-
t/substref.sh | 4 +-
t/substtarg.sh | 2 +-
t/suffix-chain.sh | 2 +-
t/suffix-custom-default-ext.sh | 2 +-
t/suffix-custom-link.sh | 2 +-
t/suffix-custom-subobj.sh | 2 +-
t/suffix-custom.sh | 8 +--
t/suffix-hdr.sh | 2 +-
t/suffix-obj.sh | 2 +-
t/suffix-rules-old-fashioned.sh | 2 +-
t/suffix.sh | 2 +-
t/suffix10.sh | 2 +-
t/suffix13.sh | 2 +-
t/suffix2.sh | 2 +-
t/suffix3.sh | 13 ++--
t/suffix5.sh | 2 +-
t/suffix8.sh | 2 +-
t/suffix9.sh | 2 +-
t/symlink.sh | 2 +-
t/symlink2.sh | 4 +-
t/tags.sh | 2 +-
t/tags2.sh | 4 +-
t/tagsub.sh | 8 ++-
t/tap-ambiguous-directive.sh | 4 +-
t/tap-autonumber.sh | 4 +-
t/tap-bad-prog.tap | 4 +-
t/tap-bailout-and-logging.sh | 4 +-
t/tap-bailout-leading-space.sh | 4 +-
t/tap-bailout-suppress-badexit.sh | 6 +-
t/tap-bailout-suppress-later-diagnostic.sh | 6 +-
t/tap-bailout-suppress-later-errors.sh | 6 +-
t/tap-bailout.sh | 4 +-
t/tap-basic.sh | 20 +++---
t/tap-color.sh | 12 ++--
t/tap-common-setup.sh | 2 +-
t/tap-deps.sh | 4 +-
t/tap-diagnostic-custom.sh | 8 +-
t/tap-diagnostic.sh | 16 ++--
t/tap-doc.sh | 4 +-
t/tap-doc2.sh | 8 +-
t/tap-driver-stderr.sh | 4 +-
t/tap-empty-diagnostic.sh | 8 +-
t/tap-empty.sh | 4 +-
t/tap-escape-directive-2.sh | 4 +-
t/tap-escape-directive.sh | 4 +-
t/tap-exit.sh | 6 +-
t/tap-fancy.sh | 8 +-
t/tap-fancy2.sh | 8 +-
t/tap-global-log.sh | 6 +-
t/tap-global-result.sh | 6 +-
t/tap-lazy-check.sh | 20 +++---
t/tap-log.sh | 48 ++++++------
t/tap-merge-stdout-stderr.sh | 8 +-
t/tap-missing-plan-and-bad-exit.sh | 4 +-
t/tap-more.sh | 22 ++----
t/tap-more2.sh | 4 +-
t/tap-msg0-bailout.sh | 4 +-
t/tap-msg0-directive.sh | 4 +-
t/tap-msg0-misc.sh | 4 +-
t/tap-msg0-planskip.sh | 4 +-
t/tap-msg0-result.sh | 4 +-
t/tap-negative-numbers.sh | 4 +-
t/tap-no-disable-hard-error.sh | 4 +-
t/tap-no-merge-stdout-stderr.sh | 6 +-
t/tap-no-spurious-numbers.sh | 2 +-
t/tap-no-spurious.sh | 4 +-
t/tap-not-ok-skip.sh | 4 +-
t/tap-number-wordboundary.sh | 8 +-
t/tap-numbers-leading-zero.sh | 4 +-
t/tap-numeric-description.sh | 4 +-
t/tap-out-of-order.sh | 4 +-
t/tap-passthrough-exit.sh | 6 +-
t/tap-passthrough.sh | 6 +-
t/tap-plan-corner.sh | 16 ++--
t/tap-plan-errors.sh | 4 +-
t/tap-plan-leading-zero.sh | 4 +-
t/tap-plan-malformed.sh | 4 +-
t/tap-plan-middle.sh | 4 +-
t/tap-plan-whitespace.sh | 4 +-
t/tap-plan.sh | 4 +-
t/tap-planskip-and-logging.sh | 4 +-
t/tap-planskip-badexit.sh | 4 +-
t/tap-planskip-bailout.sh | 4 +-
t/tap-planskip-case-insensitive.sh | 4 +-
t/tap-planskip-late.sh | 4 +-
t/tap-planskip-later-errors.sh | 4 +-
t/tap-planskip-unplanned-corner.sh | 4 +-
t/tap-planskip-unplanned.sh | 10 ++--
t/tap-planskip-whitespace.sh | 4 +-
t/tap-planskip.sh | 6 +-
t/tap-realtime.sh | 4 +-
t/tap-recheck.sh | 58 ++++++++--------
t/tap-result-comment.sh | 4 +-
t/tap-signal.tap | 2 +-
t/tap-test-number-0.sh | 4 +-
t/tap-todo-skip-together.sh | 4 +-
t/tap-todo-skip-whitespace.sh | 2 +-
t/tap-todo-skip.sh | 6 +-
t/tap-unplanned.sh | 12 ++--
t/tap-whitespace-normalization.sh | 2 +-
t/tap-with-and-without-number.sh | 4 +-
t/tap-xfail-tests.sh | 6 +-
t/tar-override.sh | 4 +-
t/tar.sh | 2 +-
t/tar2.sh | 2 +-
t/tar3.sh | 2 +-
t/target-cflags.sh | 2 +-
t/targetclash.sh | 2 +-
t/test-driver-acsubst.sh | 6 +-
t/test-driver-cond.sh | 8 +-
t/test-driver-create-log-dir.sh | 2 +-
t/test-driver-custom-multitest-recheck.sh | 58 ++++++++--------
t/test-driver-custom-multitest-recheck2.sh | 65 ++++++++---------
t/test-driver-custom-multitest.sh | 12 ++--
t/test-driver-custom-xfail-tests.sh | 6 +-
t/test-driver-custom.sh | 8 +-
t/test-driver-fail.sh | 10 ++--
t/test-driver-is-distributed.sh | 2 +-
t/test-driver-strip-vpath.sh | 2 +-
t/test-extensions-cond.sh | 2 +-
t/test-extensions-dynamic.sh | 2 +-
t/test-extensions-funny-chars.sh | 14 ++--
t/test-extensions-invalid.sh | 6 +-
t/test-harness-vpath-rewrite.sh | 4 +-
t/test-log.sh | 48 ++++++------
t/test-logs-repeated.sh | 2 +-
t/test-metadata-global-log.sh | 4 +-
t/test-metadata-global-result.sh | 6 +-
t/test-metadata-recheck.sh | 6 +-
t/test-metadata-results.sh | 20 +++---
t/test-missing.sh | 18 +++---
t/test-trs-basic.sh | 38 +++++-----
t/test-trs-recover-parallel.sh | 2 +-
t/test-trs-recover.sh | 45 ++++++------
t/tests-environment-and-log-compiler.sh | 2 +-
t/tests-environment-backcompat.sh | 2 +-
t/tests-environment-fd-redirect.sh | 6 +-
t/tests-environment.sh | 4 +-
t/testsuite-summary-color.sh | 4 +-
t/testsuite-summary-count-many.sh | 4 +-
t/testsuite-summary-count.sh | 4 +-
t/testsuite-summary-reference-log.sh | 12 ++--
t/transform.sh | 2 +-
t/transform2.sh | 2 +-
t/transform3.sh | 2 +-
t/txinfo-include.sh | 2 +-
t/txinfo-no-clutter.sh | 90 +++++++++++++++++------
t/txinfo-rules-once.sh | 2 +-
t/txinfo-unrecognized-extension-2.sh | 2 +-
t/txinfo-unrecognized-extension.sh | 2 +-
t/txinfo.sh | 2 +-
t/txinfo10.sh | 2 +-
t/txinfo13.sh | 6 +-
t/txinfo16.sh | 10 ++--
t/txinfo17.sh | 4 +-
t/txinfo2.sh | 2 +-
t/txinfo20.sh | 8 +-
t/txinfo21.sh | 63 ++++++++++-------
t/txinfo21b.sh | 4 +-
t/txinfo22.sh | 6 +-
t/txinfo23.sh | 4 +-
t/txinfo24.sh | 6 +-
t/txinfo25.sh | 8 +-
t/txinfo26.sh | 13 ++--
t/txinfo27.sh | 2 +-
t/txinfo28.sh | 4 +-
t/txinfo29.sh | 2 +-
t/txinfo31.sh | 2 +-
t/txinfo32.sh | 2 +-
t/txinfo33.sh | 34 +++++-----
t/txinfo4.sh | 2 +-
t/txinfo7.sh | 2 +-
t/txinfo8.sh | 2 +-
t/uninstall-fail.sh | 27 ++++----
t/uninstall-pr9578.sh | 16 ++--
t/unused.sh | 4 +-
t/upc.sh | 4 +-
t/upc2.sh | 2 +-
t/upc3.sh | 4 +-
t/vala-headers.sh | 4 +-
t/vala-libs.sh | 2 +-
t/vala-mix.sh | 6 +-
t/vala-mix2.sh | 8 +-
t/vala-parallel.sh | 10 ++--
t/vala-vapi.sh | 12 ++--
t/vala-vpath.sh | 12 ++--
t/vala.sh | 6 +-
t/vala2.sh | 6 +-
t/vala3.sh | 8 +-
t/vala4.sh | 14 ++--
t/vala5.sh | 6 +-
t/var-undef-append.sh | 4 +-
t/vars-assign.sh | 2 +-
t/vars.sh | 2 +-
t/vartar.sh | 2 +-
t/vartypos-deps.sh | 8 +-
t/vartypos-whitelist.sh | 8 +-
t/vartypos.sh | 6 +-
t/verbatim.sh | 10 ++--
t/version3.sh | 2 +-
t/version4.sh | 2 +-
t/version6.sh | 2 +-
t/version7.sh | 2 +-
t/version8.sh | 4 +-
t/vpath-built-sources.sh | 4 +-
t/vpath-rewrite.sh | 4 +-
t/vpath.sh | 4 +-
t/vtexi.sh | 2 +-
t/vtexi2.sh | 2 +-
t/vtexi3.sh | 2 +-
t/vtexi4.sh | 2 +-
t/warning-groups-win-over-strictness.sh | 2 +-
t/warnings-override.sh | 2 +-
t/warnings-precedence.sh | 2 +-
t/warnings-strictness-interactions.sh | 2 +-
t/warnings-unknown.sh | 2 +-
t/warnings-win-over-strictness.sh | 2 +-
t/warnopts.sh | 6 +-
t/werror.sh | 2 +-
t/werror2.sh | 6 +-
t/werror3.sh | 2 +-
t/werror4.sh | 4 +-
t/whoami.sh | 2 +-
t/xsource.sh | 2 +-
t/yacc-auxdir.sh | 6 +-
t/yacc-basic.sh | 10 ++--
t/yacc-bison-skeleton-cxx.sh | 2 +-
t/yacc-bison-skeleton.sh | 2 +-
t/yacc-clean-cxx.sh | 37 +++++-----
t/yacc-clean.sh | 30 ++++----
t/yacc-cxx.sh | 12 ++--
t/yacc-d-basic.sh | 16 ++--
t/yacc-d-cxx.sh | 18 +++---
t/yacc-d-vpath.sh | 2 +-
t/yacc-deleted-headers.sh | 30 ++++----
t/yacc-depend.sh | 2 +-
t/yacc-depend2.sh | 2 +-
t/yacc-dist-nobuild-subdir.sh | 8 +-
t/yacc-dist-nobuild.sh | 4 +-
t/yacc-lex-cxx-alone.sh | 6 +-
t/yacc-line.sh | 10 ++--
t/yacc-mix-c-cxx.sh | 12 ++--
t/yacc-nodist.sh | 2 +-
t/yacc-pr204.sh | 2 +-
t/yacc-subobj-nodep.sh | 2 +-
t/yacc-weirdnames.sh | 2 +-
t/yacc.sh | 2 +-
t/yacc2.sh | 8 +-
t/yacc4.sh | 10 ++--
t/yacc5.sh | 8 +-
t/yacc7.sh | 8 +-
t/yacc8.sh | 2 +-
t/yaccdry.sh | 4 +-
t/yaccpp.sh | 12 ++--
t/yaccvpath.sh | 2 +-
t/yflags-cmdline-override.sh | 6 +-
t/yflags-conditional.sh | 4 +-
t/yflags-d-false-positives.sh | 6 +-
t/yflags-force-conditional.sh | 6 +-
t/yflags-force-override.sh | 2 +-
t/yflags-var-expand.sh | 2 +-
t/yflags.sh | 6 +-
t/yflags2.sh | 6 +-
1200 files changed, 3567 insertions(+), 3499 deletions(-)
rename t/{ammissing.sh => am-macro-not-found.sh} (92%)
create mode 100755 t/am-missing-prog.sh
mode change 100644 => 100755 t/subdir-order.sh
diff --git a/Makefile.am b/Makefile.am
index b3ea89f..217f2ba 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -359,7 +359,6 @@ XFAIL_TESTS = \
# test scripts, but not from the environment.
AM_TESTS_ENVIRONMENT = \
for v in \
- me \
required \
am_using_tap \
am_serial_tests \
diff --git a/automake.in b/automake.in
index 074abf6..4879602 100644
--- a/automake.in
+++ b/automake.in
@@ -2766,8 +2766,8 @@ sub handle_texinfo_helper ($)
or next;
# Directory of auxiliary files and build by-products used by texi2dvi
# and texi2pdf.
- push @mostly_cleans, "$relative_dir/$infobase.t2d";
- push @mostly_cleans, "$relative_dir/$infobase.t2p";
+ push @mostly_cleans, "$infobase.t2d";
+ push @mostly_cleans, "$infobase.t2p";
# If the Texinfo source is in a subdirectory, create the
# resulting info in this subdirectory. If it is in the current
diff --git a/configure.ac b/configure.ac
index 8bcb4ad..8b47bb0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -264,6 +264,9 @@ exit 77" >&AS_MESSAGE_LOG_FD 2>&1; test $? -eq 77; }
# We require that the shell can correctly trap EXIT when 'set -e' is in
# effect (OSF1/Tru64 sh failed to do so, see commit v1.10b-52-g9fe8259).
#
+# We want to able to define shell aliases with the same name of shell
+# builtins.
+#
# We also prefer shells that, when 'set -x' is in effect, do not also
# redirect traces upon stderr redirections. For example,
# $ set -x; echo x 2>file
@@ -296,35 +299,37 @@ AC_DEFUN([_AM_CHECK_CANDIDATE_SHELL],
[], [am_score=1; break])
_AM_CHECK_SHELL_FEATURE([$1],
- [supports address@hidden:@glob}],
- [v=a/b/c; test address@hidden:@*/} = b/c],
+ [supports address@hidden:@glob} and \${var%glob}],
+ [v=a/b/c \
+ && test address@hidden:@*/} = b/c \
+ && test address@hidden:@@%:@*/} = c \
+ && test ${v%/*} = a/b \
+ && test ${v%%/*} = a],
[], [am_score=1; break])
_AM_CHECK_SHELL_FEATURE([$1],
- [supports address@hidden:@@%:@glob}],
- [v=a/b/c; test address@hidden:@@%:@*/} = c],
+ [preserves exit traps with "set -e"],
+ [set -e; trap 'exit $?' 0; (exit 77); exit 77],
[], [am_score=1; break])
_AM_CHECK_SHELL_FEATURE([$1],
- [supports \${var%glob}],
- [v=a.b.c; test ${v%.*} = a.b],
- [], [am_score=1; break])
+ [corrupts stderr with "set -x"],
+ [(set -x; P=1 true 2>&3) 3>&1 2>/dev/null | grep P=1],
+ [am_score=9], [])
+ echo 'alias false=echo' > conftest-alias.sh
+ echo 'false && test "$(false 97)" = 97' >> conftest-alias.sh
_AM_CHECK_SHELL_FEATURE([$1],
- [supports \${var%%glob}],
- [v=a.b.c; test ${v%%.*} = a],
- [], [am_score=1; break])
+ [supports alias named like shell builtins],
+ [. ./conftest-alias.sh],
+ [rm -f conftest-alias.sh],
+ [rm -f conftest-alias.sh; am_score=1; break])
_AM_CHECK_SHELL_FEATURE([$1],
- ["set -e" preserves exit traps],
- [set -e; trap 'exit $?' 0; (exit 77); exit 77],
+ [supports "test -e"],
+ [test -e config.log && test -e . && test ! -e nonesuch],
[], [am_score=1; break])
- _AM_CHECK_SHELL_FEATURE([$1],
- ["set -x" corrupts stderr],
- [(set -x; P=1 true 2>&3) 3>&1 2>/dev/null | grep P=1],
- [am_score=9], [])
-
break
done])
@@ -380,10 +385,6 @@ fi
AC_ARG_VAR([AM_TEST_RUNNER_SHELL],
[a sturdy POSIX shell for our testsuite])
-## ---------------------- ##
-## Create output files. ##
-## ---------------------- ##
-
###########################################################################
@@ -555,6 +556,10 @@ AC_SUBST([EXEEXT])
###########################################################################
+## ---------------------- ##
+## Create output files. ##
+## ---------------------- ##
+
AC_CONFIG_FILES([Makefile])
AC_CONFIG_LINKS([GNUmakefile:GNUmakefile])
diff --git a/defs b/defs
index 72dcf63..087dc67 100644
--- a/defs
+++ b/defs
@@ -33,7 +33,7 @@ case ${AM_TESTS_REEXEC-yes} in
*)
# Ensure we can find ourselves.
if test ! -f "$argv0"; then
- echo "$argv0: unable to find myself" >&2
+ echo "$me: unable to find myself: '$argv0'" >&2
exit 99
fi
AM_TESTS_REEXEC=no; export AM_TESTS_REEXEC
@@ -49,7 +49,7 @@ case ${AM_TESTS_REEXEC-yes} in
echo exec $AM_TEST_RUNNER_SHELL $opts "$argv0" "$*"
exec $AM_TEST_RUNNER_SHELL $opts "$argv0" ${1+"$@"}
# This should be dead code, unless some strange error happened.
- echo "$argv0: failed to re-execute with $AM_TEST_RUNNER_SHELL" >&2
+ echo "$me: failed to re-execute with $AM_TEST_RUNNER_SHELL" >&2
exit 99
;;
esac
diff --git a/defs-static.in b/defs-static.in
index da5dcff..781571c 100644
--- a/defs-static.in
+++ b/defs-static.in
@@ -53,11 +53,17 @@ else
case `(set -o) 2>/dev/null || :` in *posix*) set -o posix;; esac
fi
+# The name of the current test (without the '.sh' or '.tap' suffix).
+me=${argv0##*/} # Strip all directory components.
+case $me in # Strip test suffix.
+ *.tap) me=${me%.tap};;
+ *.sh) me=${me%.sh} ;;
+ esac
+
# Check that the environment is properly sanitized.
# Having variables exported to the empty string is OK, since our code
# treats such variables as if they were unset.
for var in \
- me \
required \
am_using_tap \
am_serial_tests \
@@ -68,7 +74,7 @@ for var in \
am_original_ACLOCAL \
; do
if eval "test x\"\$$var\" != x" && env | grep "^$var=" >/dev/null; then
- echo "$argv0: variable '$var' is set in the environment:" \
+ echo "$me: variable '$var' is set in the environment:" \
"this is unsafe" >&2
exit 99
fi
@@ -113,7 +119,7 @@ case ${am_running_installcheck:=no} in
am_system_acdir=$am_top_srcdir/m4/acdir
;;
*)
- echo "$argv0: variable 'am_running_installcheck' has invalid"
+ echo "$me: variable 'am_running_installcheck' has invalid"
"value '$am_running_installcheck'" >&2
exit 99
;;
diff --git a/doc/automake-ng.texi b/doc/automake-ng.texi
index 9626b1a..b1cf903 100644
--- a/doc/automake-ng.texi
+++ b/doc/automake-ng.texi
@@ -4046,6 +4046,16 @@ variable. The default @var{compiler-search-list} is
@samp{upcc upc}.
This macro will abort @command{configure} if no Unified Parallel C
compiler is found.
address@hidden AM_MISSING_PROG(@var{name}, @var{program})
address@hidden AM_MISSING_PROG
address@hidden MISSING
+Find a maintainer tool @var{program} and define the @var{name}
+environment variable with its location. If @var{program} is not
+detected, then @var{name} will instead invoke the @command{missing}
+script, in order to give useful advice to the user about the missing
+maintainer tool. @xref{maintainer-mode}, for more information on when
+the @command{missing} script is appropriate.
+
@item AM_SILENT_RULES
@acindex AM_SILENT_RULES
Control the machinery for less verbose build output
diff --git a/gen-testsuite-part b/gen-testsuite-part
index 460ec63..a67ce55 100755
--- a/gen-testsuite-part
+++ b/gen-testsuite-part
@@ -86,22 +86,19 @@ sub line_match ($$)
sub write_wrapper_script ($$$)
{
my ($file_handle, $wrapped_test, $shell_setup_code, $creator_name) = @_;
- # FIXME: we use some creative quoting in the generated scripts,
- # FIXME: to please maintainer-check.
print $file_handle unindent <<EOF;
#! /bin/sh
# This file has been automatically generated. DO NOT EDIT BY HAND!
- . ./defs-static || exit '99';
+ . ./defs-static || exit 1
$shell_setup_code
w="\$am_top_srcdir/$wrapped_test"
if test -f "\$w"; then
echo "\$0: will source '\$w'"
. "\$w"
- exit "\$?"
- else
- echo "\$0: cannot find wrapped test '\$w'" >&2
- exit '99'
+ exit \$?
fi
+ echo "\$0: cannot find wrapped test '\$w'" >&2
+ exit 99
EOF
}
@@ -356,9 +353,9 @@ foreach my $lt (TRUE, FALSE)
# Automatically generated test. DO NOT EDIT BY HAND!
@vars_init
required="@required"
- . ./defs || Exit 1
+ . ./defs || exit 1
plan_ $planned
- . "\$am_testauxdir/depcomp.sh"; exit "\$?"
+ . "\$am_testauxdir/depcomp.sh"; exit \$?
EOF
},
0555);
diff --git a/lib/missing b/lib/missing
index cd1f739..4e7fc48 100755
--- a/lib/missing
+++ b/lib/missing
@@ -136,7 +136,7 @@ give_advice ()
s/^g//; t'`
printf '%s\n' "'$1' is $msg."
-
+
configure_deps="'configure.ac' or m4 files included by 'configure.ac'"
case $normalized_program in
autoconf*)
diff --git a/syntax-checks.mk b/syntax-checks.mk
index 93d9a8a..4ba176b 100644
--- a/syntax-checks.mk
+++ b/syntax-checks.mk
@@ -522,27 +522,18 @@ sc_tests_command_subst:
exit 1; \
fi
-## Tests should never call exit directly, but use Exit.
-## This is so that the exit status is transported correctly across the 0 trap.
-## Ignore comments and our testsuite's own self tests.
+## Tests should no more call 'Exit', just 'exit'. That's because we
+## now have in place a better workaround to ensure the exit status is
+## transported correctly across the exit trap.
sc_tests_Exit_not_exit:
- @found=false; for file in $(xtests); do \
- case $$file in */self-check-*) continue;; esac; \
- res=`sed -n -e '/^#/d' -e '/<<.*END/,/^END/b' -e '/<<.*EOF/,/^EOF/b' \
- -e '/exit [$$0-9]/p' $$file`; \
- if test -n "$$res"; then \
- echo "$$file:$$res"; \
- found=true; \
- fi; \
- done; \
- if $$found; then \
- echo 'Do not call plain "exit", use "Exit" instead, in above tests.'
1>&2; \
+ @if grep 'Exit' $(xtests) $(xdefs) | grep -Ev '^[^:]+: *#' | grep .;
then \
+ echo "Use 'exit', not 'Exit'; it's obsolete now." 1>&2; \
exit 1; \
fi
## Use AUTOMAKE_fails when appropriate
sc_tests_automake_fails:
- @if grep -v '^#' $(xtests) | grep '\$$AUTOMAKE.*&&.*[eE]xit'; then \
+ @if grep -v '^#' $(xtests) | grep '\$$AUTOMAKE.*&&.*exit'; then \
echo 'Use AUTOMAKE_fails + grep to catch automake failures in the
above tests.' 1>&2; \
exit 1; \
fi
diff --git a/t/README b/t/README
index dd8d0ee..b2dd870 100644
--- a/t/README
+++ b/t/README
@@ -198,7 +198,7 @@ Writing test cases
changes the test by adding a failing command after the last command,
the test will spuriously fail because '$?' is nonzero at the end.
Note that this is relevant even if the errexit shell flag is on, in
- case the test contains commands like "grep ... Makefile.in && Exit 1"
+ case the test contains commands like "grep ... Makefile.in && exit 1"
(and there are indeed a lot of such tests).
* Use $ACLOCAL, $AUTOMAKE, $AUTOCONF, $AUTOUPDATE, $AUTOHEADER,
@@ -215,9 +215,6 @@ Writing test cases
likely to fail, display its output even in the failure case, before
exiting.
-* Use 'Exit' rather than 'exit' to abort for leave early from a test
- case.
-
* Use '$PATH_SEPARATOR', not hard-coded ':', as the separator of
PATH's entries.
@@ -270,7 +267,7 @@ Writing test cases
Bourne-only equivalents:
- use $(...), not `...`, for command substitution;
- - use $((...), not `expr ...`, for arithmetic processing;
+ - use $((...)), not `expr ...`, for arithmetic processing;
- liberally use '!' to invert the exit status of a command, e.g.,
in idioms like "if ! CMD; then ...", instead of relying on clumsy
paraphrases like "if CMD; then :; else ...".
@@ -282,7 +279,7 @@ Writing test cases
generated configure scripts do not ensure they will find a truly POSIX
shell (even though they will prefer and use it *if* it's found).
-* Do not test an Automake error with "$AUTOMAKE && Exit 1", or in three
+* Do not test an Automake error with "$AUTOMAKE && exit 1", or in three
years we'll discover that this test failed for some other bogus reason.
This happened many times. Better use something like
diff --git a/t/ac-output-old.tap b/t/ac-output-old.tap
index f7bcc8f..2039674 100755
--- a/t/ac-output-old.tap
+++ b/t/ac-output-old.tap
@@ -18,7 +18,7 @@
# line breaking in the use of AC_OUTPUT. Synthesised by a bunch
# of older tests (referenced below).
-. ./defs || Exit 1
+. ./defs || exit 1
plan_ 22
@@ -174,4 +174,4 @@ cd ..
# -----------------------------------------------------------------------
# And we're done.
-Exit 0
+exit 0
diff --git a/t/acloca10.sh b/t/acloca10.sh
index 05db9b9..ec9a506 100755
--- a/t/acloca10.sh
+++ b/t/acloca10.sh
@@ -24,7 +24,7 @@
# TODO: puts third-party macros directly into 'acdir'.
am_create_testdir=empty
-. ./defs || Exit 1
+. ./defs || exit 1
cat > configure.ac << 'END'
AC_INIT
@@ -57,8 +57,8 @@ $FGREP ':macro11:' configure
$FGREP ':macro21:' configure
$FGREP ':macro33:' configure
grep MACRO3 aclocal.m4
-test ! -f m4_1/macro.m4
-test ! -f m4_2/macro.m4
+test ! -e m4_1/macro.m4
+test ! -e m4_2/macro.m4
$sleep
@@ -68,8 +68,8 @@ $FGREP ':macro12:' configure
$FGREP ':macro21:' configure
$FGREP ':macro33:' configure
grep MACRO3 aclocal.m4
-test ! -f m4_1/macro.m4
-test ! -f m4_2/macro.m4
+test ! -e m4_1/macro.m4
+test ! -e m4_2/macro.m4
$sleep
@@ -78,9 +78,9 @@ $AUTOCONF
$FGREP ':macro11:' configure
$FGREP ':macro21:' configure
$FGREP ':macro33:' configure
-grep MACRO3 aclocal.m4 && Exit 1
+grep MACRO3 aclocal.m4 && exit 1
test -f m4_1/macro.m4
-test ! -f m4_2/macro.m4
+test ! -e m4_2/macro.m4
cp aclocal.m4 copy.m4
$sleep
@@ -91,10 +91,10 @@ $AUTOCONF
$FGREP ':macro11:' configure
$FGREP ':macro21:' configure
$FGREP ':macro33:' configure
-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
+test ! -e m4_2/macro.m4
diff aclocal.m4 copy.m4
:
diff --git a/t/acloca11.sh b/t/acloca11.sh
index 7a1cff6..3db8508 100755
--- a/t/acloca11.sh
+++ b/t/acloca11.sh
@@ -18,7 +18,7 @@
# directory, the macro from the lexically greatest file is used.
am_create_testdir=empty
-. ./defs || Exit 1
+. ./defs || exit 1
cat > configure.ac << 'END'
AC_INIT
diff --git a/t/acloca12.sh b/t/acloca12.sh
index 958238e..64b66bb 100755
--- a/t/acloca12.sh
+++ b/t/acloca12.sh
@@ -19,7 +19,7 @@
# Same as acloca11.test, but without calling MACRO2.
am_create_testdir=empty
-. ./defs || Exit 1
+. ./defs || exit 1
cat > configure.ac <<END
AC_INIT([$me], [1.0])
@@ -39,8 +39,8 @@ EOF
$ACLOCAL --verbose -I m4
$AUTOCONF
-$FGREP ':macro11:' configure && Exit 1
-$FGREP ':macro21:' configure && Exit 1
+$FGREP ':macro11:' configure && exit 1
+$FGREP ':macro21:' configure && exit 1
$FGREP ':macro12:' configure
:
diff --git a/t/acloca13.sh b/t/acloca13.sh
index 6d6f6c0..bffd4f1 100755
--- a/t/acloca13.sh
+++ b/t/acloca13.sh
@@ -16,7 +16,7 @@
# Make sure changes to m4_included files also cause aclocal.m4 to change.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
m4_include([somefile.m4])
@@ -47,13 +47,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/t/acloca14.sh b/t/acloca14.sh
index 2ba8b78..eb9105d 100755
--- a/t/acloca14.sh
+++ b/t/acloca14.sh
@@ -17,7 +17,7 @@
# Make sure m4_included files are also scanned for definitions.
# Report from Phil Edwards.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AM_PROG_LIBTOOL
@@ -68,12 +68,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
@@ -101,7 +101,7 @@ $MAKE testdist2
# Make sure aclocal diagnose missing included files with correct 'file:line:'.
rm -f b.m4
-$ACLOCAL 2>stderr && { cat stderr >&2; Exit 1; }
+$ACLOCAL 2>stderr && { cat stderr >&2; exit 1; }
cat stderr >&2
grep 'a\.m4:1: .*b\.m4.*does not exist' stderr
diff --git a/t/acloca15.sh b/t/acloca15.sh
index 01d11de..38c6e3e 100755
--- a/t/acloca15.sh
+++ b/t/acloca15.sh
@@ -18,7 +18,7 @@
# PR/319.
am_create_testdir=empty
-. ./defs || Exit 1
+. ./defs || exit 1
# Start macros with AM_ because that causes aclocal to complain if it
# cannot find them.
@@ -39,8 +39,8 @@ 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/t/acloca16.sh b/t/acloca16.sh
index ab894c7..a702f27 100755
--- a/t/acloca16.sh
+++ b/t/acloca16.sh
@@ -18,7 +18,7 @@
# evaluated.
am_create_testdir=empty
-. ./defs || Exit 1
+. ./defs || exit 1
cat > configure.ac << 'END'
AC_SUBST([POM])
@@ -31,6 +31,6 @@ 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/t/acloca17.sh b/t/acloca17.sh
index e6098f0..a15cd57 100755
--- a/t/acloca17.sh
+++ b/t/acloca17.sh
@@ -17,7 +17,7 @@
# Make sure aclocal report unused required macros.
am_create_testdir=empty
-. ./defs || Exit 1
+. ./defs || exit 1
cat > configure.ac << 'END'
AC_INIT
@@ -34,7 +34,7 @@ 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 && { cat stderr >&2; Exit 1; }
+WARNINGS=error $ACLOCAL -I m4 2>stderr && { cat stderr >&2; exit 1; }
cat stderr >&2
grep '^configure\.ac:2:.*UNDEFINED_MACRO' stderr
diff --git a/t/acloca18.sh b/t/acloca18.sh
index 4ae03ff..8bdbd56 100755
--- a/t/acloca18.sh
+++ b/t/acloca18.sh
@@ -17,7 +17,7 @@
# Test for --install with #serial numbers.
am_create_testdir=empty
-. ./defs || Exit 1
+. ./defs || exit 1
cat > configure.ac << 'END'
AC_INIT
@@ -96,7 +96,7 @@ $FGREP ':macro14:' configure
$FGREP ':macro23:' configure
clean_stale
-$ACLOCAL -I 4 -I 1 -I 2 --install 2>stderr && { cat stderr >&2; Exit 1; }
+$ACLOCAL -I 4 -I 1 -I 2 --install 2>stderr && { cat stderr >&2; exit 1; }
cat stderr >&2
grep 'macro.*AM_MACRO2.*not found' stderr
@@ -118,19 +118,19 @@ clean_stale
$ACLOCAL -I 4 -I 1 --diff=diff >stdout 2>stderr || {
cat stderr >&2
cat stdout
- Exit 1
+ exit 1
}
cat stderr >&2
cat stdout
grep '#serial 456' stdout
-test ! -f 4/m1.m4
+test ! -e 4/m1.m4
grep 'installing.*4/m1\.m4' stderr
-$ACLOCAL -I 5 2>stderr && { cat stderr >&2; Exit 1; }
+$ACLOCAL -I 5 2>stderr && { cat stderr >&2; exit 1; }
cat stderr >&2
test $(grep -c 'ill-formed serial' stderr) -eq 3
-$ACLOCAL -I 6 2>stderr && { cat stderr >&2; Exit 1; }
+$ACLOCAL -I 6 2>stderr && { cat stderr >&2; exit 1; }
cat stderr >&2
grep 'serial.*before any macro definition' stderr
diff --git a/t/acloca19.sh b/t/acloca19.sh
index 60e8afe..c6d2352 100755
--- a/t/acloca19.sh
+++ b/t/acloca19.sh
@@ -18,7 +18,7 @@
# more than just variable definitions.
# Report from Peter Breitenlohner (PR/450).
-. ./defs || Exit 1
+. ./defs || exit 1
cat >configure.ac <<'END'
AC_INIT([acloca19], [1.0])
@@ -39,11 +39,11 @@ END
$ACLOCAL
$AUTOCONF
-./configure >stdout || { cat stdout; Exit 1; }
+./configure >stdout || { cat stdout; exit 1; }
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/t/acloca20.sh b/t/acloca20.sh
index 0305066..b5881d6 100755
--- a/t/acloca20.sh
+++ b/t/acloca20.sh
@@ -17,7 +17,7 @@
# Make sure aclocal does not write into symlinked aclocal.m4.
am_create_testdir=empty
-. ./defs || Exit 1
+. ./defs || exit 1
echo 'm4_define([FOO], [wrong foo])' > foo.m4
echo 'm4_define([FOO], [right foo])' > acinclude.m4
diff --git a/t/acloca21.sh b/t/acloca21.sh
index d9b47af..2aca3f9 100755
--- a/t/acloca21.sh
+++ b/t/acloca21.sh
@@ -20,7 +20,7 @@
# an Autoconf macro.
am_create_testdir=empty
-. ./defs || Exit 1
+. ./defs || exit 1
cat >>configure.ac <<EOF
dnl m4_include(__some_really_bogus_nonexistent_file__.m4)
diff --git a/t/acloca22.sh b/t/acloca22.sh
index 85ef29b..c8f8307 100755
--- a/t/acloca22.sh
+++ b/t/acloca22.sh
@@ -18,7 +18,7 @@
# dependencies. See also related the tests 'remake-deleted-m4-file.test'
# and 'remake-renamed-m4-macro-and-file.test'.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >>configure.ac <<EOF
FOO
@@ -41,13 +41,13 @@ $AUTOCONF
./configure
$MAKE
grep GREPFOO Makefile
-grep GREPBAR Makefile && Exit 1
+grep GREPBAR Makefile && exit 1
sed 's/FOO/BAR/' < configure.ac > t
mv -f t configure.ac
rm -f foo.m4
$MAKE
-grep GREPFOO Makefile && Exit 1
+grep GREPFOO Makefile && exit 1
grep GREPBAR Makefile
:
diff --git a/t/acloca23.sh b/t/acloca23.sh
index b5f66e4..2366fc4 100755
--- a/t/acloca23.sh
+++ b/t/acloca23.sh
@@ -17,7 +17,7 @@
# Ensure we diagnose underquoted AC_DEFUN's.
am_create_testdir=empty
-. ./defs || Exit 1
+. ./defs || exit 1
cat > configure.ac << 'END'
AC_INIT
@@ -29,9 +29,9 @@ cat >m4/foo.m4 <<EOF
AC_DEFUN(FOO, [echo foo])
EOF
-$ACLOCAL -I m4 2>stderr && { cat stderr >&2; Exit 1; }
+$ACLOCAL -I m4 2>stderr && { cat stderr >&2; exit 1; }
cat stderr >&2
grep 'underquoted definition.*FOO' stderr
-grep 'warning.*warning' stderr && Exit 1
+grep 'warning.*warning' stderr && exit 1
:
diff --git a/t/aclocal-acdir.sh b/t/aclocal-acdir.sh
index e5b2bd2..ac5de4c 100755
--- a/t/aclocal-acdir.sh
+++ b/t/aclocal-acdir.sh
@@ -18,7 +18,7 @@
# check that stuff in the automake acdir takes precedence over stuff in
# the system acdir.
-. ./defs || Exit 1
+. ./defs || exit 1
mkdir am sys
@@ -70,6 +70,6 @@ $ACLOCAL --automake-acdir am --system-acdir sys
$AUTOCONF --force
$FGREP 'fake--init--automake' configure
$FGREP 'am--macro' configure
-$FGREP 'my--macro' configure && Exit 1 # Just to be sure.
+$FGREP 'my--macro' configure && exit 1 # Just to be sure.
:
diff --git a/t/aclocal-autoconf-version-check.sh
b/t/aclocal-autoconf-version-check.sh
index 8173f81..8e02ae9 100755
--- a/t/aclocal-autoconf-version-check.sh
+++ b/t/aclocal-autoconf-version-check.sh
@@ -17,7 +17,7 @@
# Make sure autoconf version checks in aclocal.m4 are robust.
am_create_testdirs=empty
-. ./defs || Exit 1
+. ./defs || exit 1
cat > configure.ac <<END
m4_define([AC_AUTOCONF_VERSION], [9999a])
@@ -31,7 +31,7 @@ END
: > Makefile.am
$ACLOCAL
-$AUTOCONF 2>stderr || { cat stderr >&2; Exit 1; }
+$AUTOCONF 2>stderr || { cat stderr >&2; exit 1; }
cat stderr >&2
grep 'You have another version of autoconf' stderr
grep 'aclocal.m4:.*this file was generated for' stderr
@@ -43,7 +43,7 @@ sed 's/^dnl!! //' < configure.ac > configure.tmp
cmp configure.ac configure.tmp && fatal_ 'failed to edit configure.ac'
mv -f configure.tmp configure.ac
-$MAKE 2>stderr || { cat stderr >&2; Exit 1; }
+$MAKE 2>stderr || { cat stderr >&2; exit 1; }
cat stderr >&2
grep 'You have another version of autoconf' stderr
grep 'aclocal.m4:.*this file was generated for autoconf 9999a' stderr
diff --git a/t/aclocal-install-absdir.sh b/t/aclocal-install-absdir.sh
index 1c9938e..ada83c2 100755
--- a/t/aclocal-install-absdir.sh
+++ b/t/aclocal-install-absdir.sh
@@ -19,7 +19,7 @@
# ACLOCAL_PATH variable, it is clear that this is the right thing
# to do. See also automake bug#8407.
-. ./defs || Exit 1
+. ./defs || exit 1
mkdir loc sys
diff --git a/t/aclocal-install-fail.sh b/t/aclocal-install-fail.sh
index fae2997..99fa77a 100755
--- a/t/aclocal-install-fail.sh
+++ b/t/aclocal-install-fail.sh
@@ -19,7 +19,7 @@
am_create_testdir=empty
required=ro-dir
-. ./defs || Exit 1
+. ./defs || exit 1
cat > configure.ac <<END
AC_INIT([$me], [1.0])
@@ -38,22 +38,22 @@ mkdir unwritable-dir
chmod a-w unwritable-dir
$ACLOCAL -I a-regular-file --install 2>stderr \
- && { cat stderr >&2; Exit 1; }
+ && { cat stderr >&2; exit 1; }
cat stderr >&2
$EGREP '(mkdir:|directory ).*a-regular-file' stderr
-test ! -f aclocal.m4
+test ! -e aclocal.m4
$ACLOCAL --install -I unwritable-dir/sub 2>stderr \
- && { cat stderr >&2; Exit 1; }
+ && { cat stderr >&2; exit 1; }
cat stderr >&2
$EGREP '(mkdir:|directory ).*unwritable-dir/sub' stderr
-test ! -f aclocal.m4
+test ! -e aclocal.m4
$ACLOCAL -I unwritable-dir --install 2>stderr \
- && { cat stderr >&2; Exit 1; }
+ && { cat stderr >&2; exit 1; }
cat stderr >&2
$EGREP '(cp:|copy ).*unwritable-dir' stderr
-test ! -f aclocal.m4
+test ! -e aclocal.m4
# Sanity check.
mkdir m4
diff --git a/t/aclocal-install-mkdir.sh b/t/aclocal-install-mkdir.sh
index 86cf803..43eec37 100755
--- a/t/aclocal-install-mkdir.sh
+++ b/t/aclocal-install-mkdir.sh
@@ -19,7 +19,7 @@
# FIXME: this is a good candidate for a conversion to TAP.
am_create_testdir=empty
-. ./defs || Exit 1
+. ./defs || exit 1
cat > configure.ac <<END
AC_INIT([$me], [1.0])
@@ -50,21 +50,21 @@ mkdir zardoz2
$ACLOCAL --install -I zardoz1 -I zardoz2
test -d zardoz1
grep MY_MACRO zardoz1/my-defs.m4
-ls zardoz2 | grep . && Exit 1
+ls zardoz2 | grep . && exit 1
# Directories in ACLOCAL_PATH should never be created if they don't
# exist.
-ACLOCAL_PATH="$(pwd)/none:$(pwd)/none2" $ACLOCAL --install && Exit 1
-test ! -d none
-test ! -d none2
+ACLOCAL_PATH="$(pwd)/none:$(pwd)/none2" $ACLOCAL --install && exit 1
+test ! -e none
+test ! -e none2
ACLOCAL_PATH="$(pwd)/none:$(pwd)/none2" $ACLOCAL --install -I x
test -f x/my-defs.m4
-test ! -d none
-test ! -d none2
+test ! -e none
+test ! -e none2
# It's better if aclocal doesn't create the first include dir on failure.
-$ACLOCAL --install -I none -I none2 && Exit 1
-test ! -d none
-test ! -d none2
+$ACLOCAL --install -I none -I none2 && exit 1
+test ! -e none
+test ! -e none2
:
diff --git a/t/aclocal-no-install-no-mkdir.sh b/t/aclocal-no-install-no-mkdir.sh
index 3e685f0..5b47768 100755
--- a/t/aclocal-no-install-no-mkdir.sh
+++ b/t/aclocal-no-install-no-mkdir.sh
@@ -18,7 +18,7 @@
# if the '--install' option is not given.
am_create_testdir=empty
-. ./defs || Exit 1
+. ./defs || exit 1
cat > configure.ac <<END
AC_INIT([$me], [1.0])
@@ -30,8 +30,7 @@ cat > sys-acdir/my-defs.m4 <<END
AC_DEFUN([MY_MACRO], [:])
END
-$ACLOCAL -I foo --system-acdir=sys-acdir && Exit 1
-test ! -d foo
-test ! -r foo
+$ACLOCAL -I foo --system-acdir=sys-acdir && exit 1
+test ! -e foo
:
diff --git a/t/aclocal-path-install-serial.sh b/t/aclocal-path-install-serial.sh
index c238a78..683845c 100755
--- a/t/aclocal-path-install-serial.sh
+++ b/t/aclocal-path-install-serial.sh
@@ -18,7 +18,7 @@
# are involved.
am_create_testdir=empty
-. ./defs || Exit 1
+. ./defs || exit 1
cat > configure.ac << 'END'
AC_INIT
@@ -51,7 +51,7 @@ win ()
$AUTOCONF
$FGREP "::$ok:" m4/foo.m4
$FGREP "::$ok::" configure
- $FGREP "::$ko::" m4/foo.m4 configure && Exit 1
+ $FGREP "::$ko::" m4/foo.m4 configure && exit 1
:
}
diff --git a/t/aclocal-path-install.sh b/t/aclocal-path-install.sh
index 71d718c..4ed1a2c 100755
--- a/t/aclocal-path-install.sh
+++ b/t/aclocal-path-install.sh
@@ -17,7 +17,7 @@
# ACLOCAL_PATH and '--install' interactions.
am_create_testdir=empty
-. ./defs || Exit 1
+. ./defs || exit 1
cat > configure.ac << 'END'
AC_INIT
@@ -39,10 +39,10 @@ END
# The '--install' option should never cause anything to be installed
# in a directory specified in ACLOCAL_PATH.
-$ACLOCAL --install 2>stderr && { cat stderr >&2; Exit 1; }
+$ACLOCAL --install 2>stderr && { cat stderr >&2; exit 1; }
cat stderr >&2
grep ' no -I was supplied' stderr
-test ! -f pdir/foo.m4
+test ! -e pdir/foo.m4
# The '--install' option should cause a required macro found in a
# directory specified in ACLOCAL_PATH to be installed locally.
diff --git a/t/aclocal-path-nonexistent.sh b/t/aclocal-path-nonexistent.sh
index 3eb042a..ad8d5b7 100755
--- a/t/aclocal-path-nonexistent.sh
+++ b/t/aclocal-path-nonexistent.sh
@@ -17,7 +17,7 @@
# Non-existent directories in ACLOCAL_PATH are ok.
am_create_testdir=empty
-. ./defs || Exit 1
+. ./defs || exit 1
cat > configure.ac << 'END'
AC_INIT
diff --git a/t/aclocal-path-precedence.sh b/t/aclocal-path-precedence.sh
index d831cea..220533e 100755
--- a/t/aclocal-path-precedence.sh
+++ b/t/aclocal-path-precedence.sh
@@ -17,7 +17,7 @@
# Check precedence rules for ACLOCAL_PATH.
am_create_testdir=empty
-. ./defs || Exit 1
+. ./defs || exit 1
cat > configure.ac << 'END'
AC_INIT([foo], [1.0])
@@ -86,6 +86,6 @@ $FGREP '::pass-libtool::' configure
$FGREP 'am__api_version' configure
# A final sanity check.
-$FGREP '::fail' configure && Exit 1
+$FGREP '::fail' configure && exit 1
:
diff --git a/t/aclocal-path.sh b/t/aclocal-path.sh
index 72b3938..c22a7c4 100755
--- a/t/aclocal-path.sh
+++ b/t/aclocal-path.sh
@@ -17,7 +17,7 @@
# Check basic ACLOCAL_PATH support.
am_create_testdir=empty
-. ./defs || Exit 1
+. ./defs || exit 1
cat > configure.ac << 'END'
AC_INIT
@@ -46,9 +46,9 @@ $AUTOCONF
# there should be no m4_include in aclocal.m4, even though ACLOCAL_PATH
# contains 'mdir1' and './mdir2' as relative directories. Only -I
# directories should be subject to file inclusion.
-$FGREP m4_include aclocal.m4 && Exit 1
+$FGREP m4_include aclocal.m4 && exit 1
-$EGREP 'AM_(FOO|BAR|BAZ)_MACRO' configure && Exit 1
+$EGREP 'AM_(FOO|BAR|BAZ)_MACRO' configure && exit 1
$FGREP 'am--foo' configure
$FGREP 'am--bar' configure
$FGREP 'am--baz' configure
diff --git a/t/aclocal-print-acdir.sh b/t/aclocal-print-acdir.sh
index 6e8aa09..c5a8eb5 100755
--- a/t/aclocal-print-acdir.sh
+++ b/t/aclocal-print-acdir.sh
@@ -17,7 +17,7 @@
# Test on aclocal's '--print-ac-dir' option.
am_create_testdir=empty
-. ./defs || Exit 1
+. ./defs || exit 1
$ACLOCAL --print-ac-dir
test "$($ACLOCAL --print-ac-dir)" = "$am_system_acdir"
diff --git a/t/aclocal-verbose-install.sh b/t/aclocal-verbose-install.sh
index 095a3f7..27fa0c5 100755
--- a/t/aclocal-verbose-install.sh
+++ b/t/aclocal-verbose-install.sh
@@ -17,7 +17,7 @@
# Check verbose messages by 'aclocal --install'.
am_create_testdir=empty
-. ./defs || Exit 1
+. ./defs || exit 1
cat > configure.ac <<END
AC_INIT([$me], [1.0])
@@ -37,7 +37,7 @@ mkdir foodir
: > foodir/bar.m4
$ACLOCAL --system-acdir=sys-acdir --install --verbose -I foodir 2>stderr \
- || { cat stderr >&2; Exit 1; }
+ || { cat stderr >&2; exit 1; }
cat stderr >&2
grep ' installing .*sys-acdir/bar\.m4.* to .*foodir/bar\.m4' stderr
grep ' installing .*sys-acdir/quux\.m4.* to .*foodir/quux\.m4' stderr
diff --git a/t/aclocal.sh b/t/aclocal.sh
index 3e0cac6..d99da5f 100755
--- a/t/aclocal.sh
+++ b/t/aclocal.sh
@@ -17,29 +17,29 @@
# Test on some aclocal options. Report from Alexandre Oliva.
am_create_testdir=empty
-. ./defs || Exit 1
+. ./defs || exit 1
echo "AC_INIT([$me], [0]) AM_INIT_AUTOMAKE" > configure.ac
$ACLOCAL --output=fred
test -f fred
-$ACLOCAL --output 2>stderr && { cat stderr >&2; Exit 1; }
+$ACLOCAL --output 2>stderr && { cat stderr >&2; exit 1; }
cat stderr >&2
grep 'option.*--output.*requires an argument' stderr
grep '[Tt]ry.*--help.*for more information' stderr
-$ACLOCAL --unknown-option 2>stderr && { cat stderr >&2; Exit 1; }
+$ACLOCAL --unknown-option 2>stderr && { cat stderr >&2; exit 1; }
cat stderr >&2
grep 'unrecognized option.*--unknown-option' stderr
grep '[Tt]ry.*--help.*for more information' stderr
-$ACLOCAL foobar 2>stderr && { cat stderr >&2; Exit 1; }
+$ACLOCAL foobar 2>stderr && { cat stderr >&2; exit 1; }
cat stderr >&2
grep 'non-option argument.*foobar' stderr
grep '[Tt]ry.*--help.*for more information' stderr
-$ACLOCAL --ver 2>stderr && { cat stderr >&2; Exit 1; }
+$ACLOCAL --ver 2>stderr && { cat stderr >&2; exit 1; }
cat stderr >&2
grep 'unrecognized option.*--ver' stderr
grep '[Tt]ry.*--help.*for more information' stderr
diff --git a/t/aclocal3.sh b/t/aclocal3.sh
index b2d2ab9..03aa42d 100755
--- a/t/aclocal3.sh
+++ b/t/aclocal3.sh
@@ -17,7 +17,7 @@
# Test to make sure include of include detects missing macros
am_create_testdir=empty
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac <<END
AC_INIT([$me], [1.0])
@@ -34,7 +34,7 @@ AC_DEFUN([GNOME_X_CHECKS], [
])
END
-$ACLOCAL -I macros 2>stderr && { cat stderr >&2; Exit 1; }
+$ACLOCAL -I macros 2>stderr && { cat stderr >&2; exit 1; }
cat stderr
grep '^macros/gnome\.m4:4:.*AM__PATH__GTK.*not found' stderr
diff --git a/t/aclocal4.sh b/t/aclocal4.sh
index 1eb2adc..0086303 100755
--- a/t/aclocal4.sh
+++ b/t/aclocal4.sh
@@ -18,7 +18,7 @@
# Report from Jim Meyering.
required=cc
-. ./defs || Exit 1
+. ./defs || exit 1
cat >>configure.ac <<EOF
AC_PROG_RANLIB
diff --git a/t/aclocal5.sh b/t/aclocal5.sh
index 23a7e5e..4d3730a 100755
--- a/t/aclocal5.sh
+++ b/t/aclocal5.sh
@@ -17,7 +17,7 @@
# Test to make sure that aclocal.m4's dependencies are honored in
# sub-directories. See also related tests 'remake-subdir*.test'.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AM_TEST([GREPME])
diff --git a/t/aclocal6.sh b/t/aclocal6.sh
index 8923851..dc6b38d 100755
--- a/t/aclocal6.sh
+++ b/t/aclocal6.sh
@@ -17,7 +17,7 @@
# Make sure aclocal.m4 is rebuilt whenever a configure
# dependency changes. Test for acinclude.m4 and VPATH too.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
SOME_DEFS
diff --git a/t/aclocal7.sh b/t/aclocal7.sh
index 936d4ea..4c03a0c 100755
--- a/t/aclocal7.sh
+++ b/t/aclocal7.sh
@@ -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
cat >> configure.ac << 'END'
SOME_DEFS
@@ -86,7 +86,7 @@ is_newest Makefile.in fragment.inc
is_newest fragment.inc aclocal.m4
is_newest fragment.inc sub/Makefile.in
-grep README Makefile.in && Exit 1
+grep README Makefile.in && exit 1
$sleep
: > README
diff --git a/t/aclocal8.sh b/t/aclocal8.sh
index 869969e..a242fca 100755
--- a/t/aclocal8.sh
+++ b/t/aclocal8.sh
@@ -17,7 +17,7 @@
# Make sure aclocal does not require unused macros.
am_create_testdir=empty
-. ./defs || Exit 1
+. ./defs || exit 1
cat > configure.ac << 'END'
AC_INIT
@@ -34,9 +34,9 @@ EOF
echo 'AC_DEFUN([MACRO1],)' >m4/macro1.m4
echo 'AC_DEFUN([MACRO2], [AC_REQUIRE([AM_UNUSED_MACRO])])' >m4/macro2.m4
-$ACLOCAL -I m4 >output 2>&1 || { cat output; Exit 1; }
+$ACLOCAL -I m4 >output 2>&1 || { cat output; exit 1; }
test 0 -eq $(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/t/aclocal9.sh b/t/aclocal9.sh
index c7ce751..bcdd6f4 100755
--- a/t/aclocal9.sh
+++ b/t/aclocal9.sh
@@ -17,7 +17,7 @@
# Make sure aclocal define macros in the same order as -I's.
am_create_testdir=empty
-. ./defs || Exit 1
+. ./defs || exit 1
cat > configure.ac << 'END'
AC_INIT
diff --git a/t/acsilent.sh b/t/acsilent.sh
index 7d13fa0..92c4300 100755
--- a/t/acsilent.sh
+++ b/t/acsilent.sh
@@ -16,7 +16,7 @@
# Test to make sure there are no spurious acinclude warnings.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >configure.ac <<EOF
AC_INIT([$me], [1.0])
@@ -31,6 +31,6 @@ module=[$1]
AC_SUBST(module)])
END
-$ACLOCAL >output 2>&1 || { cat output; Exit 1; }
+$ACLOCAL >output 2>&1 || { cat output; exit 1; }
cat output
test ! -s output
diff --git a/t/acsubst.sh b/t/acsubst.sh
index 9390944..19dfbdf 100755
--- a/t/acsubst.sh
+++ b/t/acsubst.sh
@@ -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
cat >> configure.ac << 'END'
AC_PROG_CC
diff --git a/t/acsubst2.sh b/t/acsubst2.sh
index e8c8663..ea7749c 100755
--- a/t/acsubst2.sh
+++ b/t/acsubst2.sh
@@ -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
cat >> configure.ac << 'END'
AC_PROG_CC
diff --git a/t/add-missing.tap b/t/add-missing.tap
index 902ff3b..c47382b 100755
--- a/t/add-missing.tap
+++ b/t/add-missing.tap
@@ -20,7 +20,7 @@
# default, but copied if the '--copy' option is used.
am_create_testdir=empty
-. ./defs || Exit 1
+. ./defs || exit 1
plan_ "later"
@@ -99,11 +99,9 @@ check_ ()
# shared by its "subtests").
mkdir generic
cd generic
- # Use 'echo > ...', not ': > ...', here and below, as Solaris 10 /bin/sh
- # might not execute the latter (the Autoconf manual gives more details).
- echo > Makefile.am
+ : > Makefile.am
if test $override = yes; then
- echo > configure.ac
+ : > configure.ac
else
cp "$ocwd"/configure.stub configure.ac
fi
diff --git a/t/all-prog-libs.sh b/t/all-prog-libs.sh
index 1857a45..60da56c 100755
--- a/t/all-prog-libs.sh
+++ b/t/all-prog-libs.sh
@@ -19,7 +19,7 @@
# - $(am__all_libs).
# - $(am__all_ltlibs).
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_SUBST([CC], [who-cares])
diff --git a/t/all.sh b/t/all.sh
index 0baf9da..3797acf 100755
--- a/t/all.sh
+++ b/t/all.sh
@@ -16,7 +16,7 @@
# Test to make sure several *-local's in a single rule work.
-. ./defs || Exit 1
+. ./defs || exit 1
targets='all install-exec install-data uninstall'
echo "$targets:" | sed -e 's/[ :]/-local&/g' > Makefile.am
diff --git a/t/all2.sh b/t/all2.sh
index da22e68..879cdfc 100755
--- a/t/all2.sh
+++ b/t/all2.sh
@@ -16,7 +16,7 @@
# Test to make sure all-local and other -local targets work correctly.
-. ./defs || Exit 1
+. ./defs || exit 1
$ACLOCAL
@@ -25,7 +25,7 @@ for target in $targets; do
: Doing $target
echo "${target}-local:" > Makefile.am
$AUTOMAKE
- grep "${target}-local ${target}-local" Makefile.in && Exit 1
+ grep "${target}-local ${target}-local" Makefile.in && exit 1
grep "${target}-am:.*${target}-local" Makefile.in
done
diff --git a/t/alloca.sh b/t/alloca.sh
index c87904b..e054dd4 100755
--- a/t/alloca.sh
+++ b/t/alloca.sh
@@ -16,7 +16,7 @@
# Make sure we complain if @ALLOCA@ is used without being set in configure.ac
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac <<'END'
AM_PROG_AR
diff --git a/t/alloca2.sh b/t/alloca2.sh
index 08fad97..38d2cf8 100755
--- a/t/alloca2.sh
+++ b/t/alloca2.sh
@@ -16,7 +16,7 @@
# Make sure we complain if @LTALLOCA@ is used without being set in configure.ac
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac <<'END'
AC_PROG_CC
diff --git a/t/alpha.sh b/t/alpha.sh
index 90f2cc2..b1315f0 100755
--- a/t/alpha.sh
+++ b/t/alpha.sh
@@ -16,7 +16,7 @@
# Make sure README-alpha is distributed when appropriate. Report from
# Jim Meyering.
-. ./defs || Exit 1
+. ./defs || exit 1
cat > configure.ac << 'END'
AC_INIT([alpha], [1.0a])
@@ -60,10 +60,10 @@ $AUTOMAKE
./configure
# "make distdir" should fail because NEWS does not mention 1.0a
-$MAKE check 2>stderr && { cat stderr >&2; Exit 1; }
+$MAKE check 2>stderr && { cat stderr >&2; exit 1; }
cat stderr >&2
grep 'NEWS not updated' stderr
-test ! -f works
+test ! -e works
echo 'alpha 1.0a released' > NEWS
$MAKE check
diff --git a/t/alpha2.sh b/t/alpha2.sh
index 6d5207f..86f60b9 100755
--- a/t/alpha2.sh
+++ b/t/alpha2.sh
@@ -17,7 +17,7 @@
# Another check for README-alpha support. This time it is requested
# from configure.ac. Report from Akim Demaille.
-. ./defs || Exit 1
+. ./defs || exit 1
cat > configure.ac << 'END'
AC_INIT([alpha], [1.0b])
diff --git a/t/am-default-source-ext.sh b/t/am-default-source-ext.sh
index d3ab899..7aa4662 100755
--- a/t/am-default-source-ext.sh
+++ b/t/am-default-source-ext.sh
@@ -17,7 +17,7 @@
# AM_DEFAULT_SOURCE_EXT
required='cc c++'
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
diff --git a/t/am-dir.sh b/t/am-dir.sh
index f302659..373fa4f 100755
--- a/t/am-dir.sh
+++ b/t/am-dir.sh
@@ -26,7 +26,7 @@
# * cleaning rules and "make distcheck" interaction.
#
-. ./defs || Exit 1
+. ./defs || exit 1
d=.am
diff --git a/t/ammissing.sh b/t/am-macro-not-found.sh
similarity index 92%
rename from t/ammissing.sh
rename to t/am-macro-not-found.sh
index aa28126..038dabf 100755
--- a/t/ammissing.sh
+++ b/t/am-macro-not-found.sh
@@ -16,10 +16,10 @@
# Test to see if aclocal correctly reports missing AM_ macro.
-. ./defs || Exit 1
+. ./defs || exit 1
echo AM_ZARDOZ >> configure.ac
-$ACLOCAL 2>stderr && { cat stderr >&2; Exit 1; }
+$ACLOCAL 2>stderr && { cat stderr >&2; exit 1; }
cat stderr
grep 'configure.ac:.*AM_ZARDOZ.*not found' stderr
diff --git a/t/am-missing-prog.sh b/t/am-missing-prog.sh
new file mode 100755
index 0000000..e16529d
--- /dev/null
+++ b/t/am-missing-prog.sh
@@ -0,0 +1,97 @@
+#! /bin/sh
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+# Test AM_MISSING_PROG.
+
+. ./defs || exit 1
+
+cat >> configure.ac <<'END'
+AM_MISSING_PROG([NO_SUCH_COMMAND], [am-none-none])
+AM_MISSING_PROG([MISMATCHED_COMMAND], [am-exit-63])
+AM_MISSING_PROG([OVERRIDDEN_COMMAND], [am-none-none])
+AM_MISSING_PROG([COMMAND_FOUND], [my-command])
+AC_OUTPUT
+END
+
+mkdir bin
+cat > bin/am-exit-63 <<'END'
+#!/bin/sh
+echo "Oops, I'm too old"
+exit 63
+END
+cat > bin/am-overridden <<'END'
+#!/bin/sh
+echo "Hey, I'm OK!"
+exit 0
+END
+cat > bin/my-command <<'END'
+#!/bin/sh
+echo SNAFU
+exit 0
+END
+chmod a+x bin/*
+PATH=$(pwd)/bin$PATH_SEPARATOR$PATH; export PATH
+
+cat > Makefile.am <<'END'
+# Different for different targets, for the sake of parallel make.
+o = address@hidden
+e = address@hidden
+
+debug_info = grep . address@hidden address@hidden
+status_is = $(debug_info); echo $@: st=$$st; test $$st -eq
+
+w_mis = 'am-none-none' is needed, and is missing on your system
+w_old = 'am-exit-63' is needed, and is probably too old
+
+test1:
+ st=0; $(NO_SUCH_COMMAND) >$o 2>$e || st=$$?; $(status_is) 127
+ grep "^WARNING: $(w_mis)" $e
+ test ! -s $o
+test2:
+ st=0; $(MISMATCHED_COMMAND) >$o 2>$e || st=$$?; $(status_is) 63
+ grep "^WARNING: $(w_old)" $e
+ test "`cat $o`" = "Oops, I'm too old"
+test3:
+ st=0; $(OVERRIDDEN_COMMAND) >$o 2>$e || st=$$?; $(status_is) 0
+ st=0; $(OVERRIDDEN_COMMAND) >$o 2>$e || st=$$?; \
+ test ! -s $e
+ test "`cat $o`" = "Hey, I'm OK!"
+test4:
+ st=0; $(COMMAND_FOUND) >$o 2>$e || st=$$?; $(status_is) 0
+ test ! -s $e
+ test "`cat $o`" = SNAFU
+check-local: test1 test2 test2 test4
+.PHONY: test1 test2 test2 test4
+CLEANFILES = test[1234]-stdout test[1234]-stderr
+END
+
+$ACLOCAL
+$AUTOCONF
+$AUTOMAKE
+
+./configure OVERRIDDEN_COMMAND=am-overridden
+
+$FGREP COMMAND Makefile.in Makefile # For debugging.
+
+grep "^NO_SUCH_COMMAND = \${SHELL} .*/missing .*am-none-none" Makefile
+grep "^MISMATCHED_COMMAND = \${SHELL} .*/missing .*am-exit-63" Makefile
+grep "^COMMAND_FOUND = \${SHELL} .*/missing .*my-command" Makefile
+grep '^OVERRIDDEN_COMMAND = am-overridden *$' Makefile
+
+$MAKE test1 test2 test3 test4
+$MAKE distcheck DISTCHECK_CONFIGURE_FLAGS='OVERRIDDEN_COMMAND=am-overridden'
+
+:
diff --git a/t/am-tests-environment.sh b/t/am-tests-environment.sh
index f2931e6..e8fbbe3 100755
--- a/t/am-tests-environment.sh
+++ b/t/am-tests-environment.sh
@@ -17,7 +17,7 @@
# parallel-tests: check AM_TESTS_ENVIRONMENT support, and its
# interactions with TESTS_ENVIRONMENT.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_MKDIR_P
@@ -74,16 +74,16 @@ $AUTOMAKE -a
./configure
-TESTS_ENVIRONMENT='BAR=1' $MAKE check || { debug_info; Exit 1; }
+TESTS_ENVIRONMENT='BAR=1' $MAKE check || { debug_info; exit 1; }
minicheck
miniclean
-TESTS_ENVIRONMENT='BAR=2' $MAKE check && { debug_info; Exit 1; }
+TESTS_ENVIRONMENT='BAR=2' $MAKE check && { debug_info; exit 1; }
minicheck
miniclean
echo 'BAR=1 && export BAR' > test-env.sh
-$MAKE check || { debug_info; Exit 1; }
+$MAKE check || { debug_info; exit 1; }
minicheck
$MAKE distcheck
diff --git a/t/amassign.sh b/t/amassign.sh
index 1649dd0..555e3f4 100755
--- a/t/amassign.sh
+++ b/t/amassign.sh
@@ -17,7 +17,7 @@
# Test to see if AM_ name can be assigned to in configure.ac.
# Report from Steve Robbins.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AM_CFLAGS=foo
diff --git a/t/amhello-binpkg.sh b/t/amhello-binpkg.sh
index 16fdfc3..c1d2575 100755
--- a/t/amhello-binpkg.sh
+++ b/t/amhello-binpkg.sh
@@ -18,7 +18,7 @@
# using DESTDIR to build simple, no-frills binary packages.
am_create_testdir=empty
-. ./defs || Exit 1
+. ./defs || exit 1
cp "$am_docdir"/amhello-1.0.tar.gz . \
|| fatal_ "cannot get amhello tarball"
diff --git a/t/amhello-cflags.sh b/t/amhello-cflags.sh
index 4132bc1..a120d81 100755
--- a/t/amhello-cflags.sh
+++ b/t/amhello-cflags.sh
@@ -20,7 +20,7 @@
am_create_testdir=empty
required=gcc
-. ./defs || Exit 1
+. ./defs || exit 1
cp "$am_docdir"/amhello-1.0.tar.gz . \
|| fatal_ "cannot get amhello tarball"
@@ -45,6 +45,6 @@ for exeext in '' .exe :; do
test -f optim/src/hello$exeext && break
test "$exeext" = : && fatal_ "cannot determine extension of executables"
done
-cmp optim/src/hello$exeext debug/src/hello$exeext && Exit 1
+cmp optim/src/hello$exeext debug/src/hello$exeext && exit 1
:
diff --git a/t/amhello-cross-compile.sh b/t/amhello-cross-compile.sh
index 26093cf..d447657 100755
--- a/t/amhello-cross-compile.sh
+++ b/t/amhello-cross-compile.sh
@@ -19,7 +19,7 @@
am_create_testdir=empty
required=i586-mingw32msvc-gcc
-. ./defs || Exit 1
+. ./defs || exit 1
cp "$am_docdir"/amhello-1.0.tar.gz . \
|| fatal_ "cannot get amhello tarball"
@@ -33,7 +33,7 @@ gzip -dc amhello-1.0.tar.gz | tar xf -
cd amhello-1.0
./configure --build "$build" --host "$host" > stdout \
- || { cat stdout ; Exit 1; }
+ || { cat stdout ; exit 1; }
cat stdout
grep '^checking for i586-mingw32msvc-strip\.\.\.' stdout
grep '^checking for i586-mingw32msvc-gcc\.\.\.' stdout
@@ -48,6 +48,6 @@ file hello.exe > whatis
cat whatis
$EGREP 'DOS|Win' whatis
grep 'executable' whatis
-grep 'ELF' whatis && Exit 1
+grep 'ELF' whatis && exit 1
:
diff --git a/t/aminit-moreargs-no-more.sh b/t/aminit-moreargs-no-more.sh
index d013d9a..ce30c29 100755
--- a/t/aminit-moreargs-no-more.sh
+++ b/t/aminit-moreargs-no-more.sh
@@ -18,7 +18,7 @@
# old-style usages of AM_INIT_AUTOMAKE (i.e., calls with two or three
# arguments).
-. ./defs || Exit 1
+. ./defs || exit 1
warn_rx='AM_INIT_AUTOMAKE.* old-style two-.* three-arguments form.*unsupported'
@@ -36,7 +36,7 @@ do_check()
rm -rf autom4te*.cache
for cmd in "$ACLOCAL" "$AUTOCONF" "$AUTOMAKE"; do
cp aclocal.sav aclocal.m4
- $cmd -Wnone -Wno-error 2>stderr && { cat stderr; Exit 1; }
+ $cmd -Wnone -Wno-error 2>stderr && { cat stderr; exit 1; }
cat stderr >&2
grep "^configure\.ac:2:.*$warn_rx" stderr
done
diff --git a/t/amopt.sh b/t/amopt.sh
index 7861184..5d6005d 100755
--- a/t/amopt.sh
+++ b/t/amopt.sh
@@ -17,7 +17,7 @@
# Make Automake diagnose a conditional AUTOMAKE_OPTIONS.
# Report from Bas Wijnen.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >>configure.ac <<END
AM_CONDITIONAL([COND], [true])
diff --git a/t/amopts-location.sh b/t/amopts-location.sh
index 0219f18..c0d471a 100755
--- a/t/amopts-location.sh
+++ b/t/amopts-location.sh
@@ -17,7 +17,7 @@
# Check that errors about AUTOMAKE_OPTIONS refers to correct
# locations.
-. ./defs || Exit 1
+. ./defs || exit 1
cat > Makefile.am <<'END'
# comment \
@@ -78,6 +78,6 @@ cat stderr \
| grep -v '^Makefile1\.am:1:' \
| grep -v '^Makefile2\.am:6:' \
| grep -v '^Makefile3\.am:2:' \
- | grep . && Exit 1
+ | grep . && exit 1
:
diff --git a/t/amopts-variable-expansion.sh b/t/amopts-variable-expansion.sh
index 1c085b2..830373a 100755
--- a/t/amopts-variable-expansion.sh
+++ b/t/amopts-variable-expansion.sh
@@ -17,7 +17,7 @@
# Check that AUTOMAKE_OPTIONS support variable expansion.
am_create_testdir=empty
-. ./defs || Exit 1
+. ./defs || exit 1
# We want complete control over automake options.
AUTOMAKE=$am_original_AUTOMAKE
@@ -55,8 +55,8 @@ END
$ACLOCAL
AUTOMAKE_run
grep '^Makefile\.am:.*sub/foo\.c.*requires.*AM_PROG_CC_C_O' stderr
-grep README stderr && Exit 1
-$EGREP '(install|override)' stderr && Exit 1
-$EGREP 'distdir|\.tar' Makefile.in && Exit 1
+grep README stderr && exit 1
+$EGREP '(install|override)' stderr && exit 1
+$EGREP 'distdir|\.tar' Makefile.in && exit 1
:
diff --git a/t/amsubst.sh b/t/amsubst.sh
index b655ce4..49d50c1 100755
--- a/t/amsubst.sh
+++ b/t/amsubst.sh
@@ -16,7 +16,7 @@
# Check for _AM_SUBST_NOTMAKE.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_SUBST([backslash], "\\")
diff --git a/t/ansi2knr-no-more.sh b/t/ansi2knr-no-more.sh
index 99f2e92..5387d20 100755
--- a/t/ansi2knr-no-more.sh
+++ b/t/ansi2knr-no-more.sh
@@ -17,7 +17,7 @@
# Check that any attempt to use the obsolete de-ANSI-fication support
# is diagnosed.
-. ./defs || Exit 1
+. ./defs || exit 1
warn_rx='automatic de-ANSI-fication.*removed'
@@ -28,12 +28,12 @@ cp configure.ac configure.sav
echo AM_C_PROTOTYPES >> configure.ac
-$ACLOCAL -Wnone 2>stderr && { cat stderr >&2; Exit 1; }
+$ACLOCAL -Wnone 2>stderr && { cat stderr >&2; exit 1; }
cat stderr >&2
grep "^configure\\.ac:5:.*$warn_rx" stderr
cat aclocal.sav "$am_automake_acdir"/protos.m4 > aclocal.m4
-$AUTOCONF -Wnone 2>stderr && { cat stderr >&2; Exit 1; }
+$AUTOCONF -Wnone 2>stderr && { cat stderr >&2; exit 1; }
cat stderr >&2
grep "^configure\\.ac:5:.*$warn_rx" stderr
@@ -45,7 +45,7 @@ for opt in ansi2knr lib/ansi2knr; do
AUTOMAKE_fails -Wnone
grep "^Makefile\.am:1:.*$warn_rx" stderr
# ansi2knr option in configure.ac
- echo > Makefile.am # 'echo', not ':', for Solaris /bin/sh.
+ : > Makefile.am
sed "s|^\\(AM_INIT_AUTOMAKE\\).*|\1([$opt])|" configure.sav >configure.ac
cat configure.ac # For debugging.
rm -rf autom4te*.cache
diff --git a/t/ar-lib.sh b/t/ar-lib.sh
index 1d6b588..c6f6a3c 100755
--- a/t/ar-lib.sh
+++ b/t/ar-lib.sh
@@ -18,7 +18,7 @@
am_create_testdir=empty
required=xsi-lib-shell
-. ./defs || Exit 1
+. ./defs || exit 1
get_shell_script ar-lib
diff --git a/t/ar-lib2.sh b/t/ar-lib2.sh
index 7d7e9b5..da2b5ca 100755
--- a/t/ar-lib2.sh
+++ b/t/ar-lib2.sh
@@ -16,7 +16,7 @@
# Test if AM_PROG_AR installs ar-lib.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
@@ -29,7 +29,7 @@ wish_SOURCES = a.c
END
$ACLOCAL
-$AUTOMAKE --add-missing 2>stderr || { cat stderr >&2; Exit 1; }
+$AUTOMAKE --add-missing 2>stderr || { cat stderr >&2; exit 1; }
cat stderr >&2
# Make sure ar-lib is installed, and that Automake says so.
grep '^configure\.ac:.*install.*ar-lib' stderr
diff --git a/t/ar-lib3.sh b/t/ar-lib3.sh
index 02696f6..513808a 100755
--- a/t/ar-lib3.sh
+++ b/t/ar-lib3.sh
@@ -16,7 +16,7 @@
# Test if lib_LIBRARIES requests AM_PROG_AR.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
diff --git a/t/ar-lib4.sh b/t/ar-lib4.sh
index d1be2eb..2bd93aa 100755
--- a/t/ar-lib4.sh
+++ b/t/ar-lib4.sh
@@ -17,7 +17,7 @@
# Test if lib_LTLIBRARIES requests AM_PROG_AR.
required=libtoolize
-. ./defs || Exit 1
+. ./defs || exit 1
cp configure.ac X
diff --git a/t/ar-lib5a.sh b/t/ar-lib5a.sh
index 1987936..abfe513 100755
--- a/t/ar-lib5a.sh
+++ b/t/ar-lib5a.sh
@@ -19,7 +19,7 @@
# Keep this test in sync with sister test 'ar-lib5b.test'.
required=lib
-. ./defs || Exit 1
+. ./defs || exit 1
cat > configure.ac << END
AC_INIT([$me], [1.0])
diff --git a/t/ar-lib5b.sh b/t/ar-lib5b.sh
index 30a44a8..451b337 100755
--- a/t/ar-lib5b.sh
+++ b/t/ar-lib5b.sh
@@ -18,7 +18,7 @@
# This test does not require Microsoft lib.
# Keep this test in sync with sister test 'ar-lib5a.test'.
-. ./defs || Exit 1
+. ./defs || exit 1
cat > configure.ac << END
AC_INIT([$me], [1.0])
diff --git a/t/ar-lib6a.sh b/t/ar-lib6a.sh
index be6afcd..4ccaa5d 100755
--- a/t/ar-lib6a.sh
+++ b/t/ar-lib6a.sh
@@ -18,7 +18,7 @@
# Keep this test in sync with sister test 'ar-lib6b.test'.
required=libtoolize
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
@@ -29,7 +29,7 @@ END
libtoolize
$ACLOCAL
-$AUTOCONF 2>stderr || { cat stderr >&2; Exit 1; }
+$AUTOCONF 2>stderr || { cat stderr >&2; exit 1; }
cat stderr >&2
$EGREP '(AC_PROG_LIBTOOL|LT_INIT).*before.*AM_PROG_AR' stderr
diff --git a/t/ar-lib6b.sh b/t/ar-lib6b.sh
index 54c0222..bebf715 100755
--- a/t/ar-lib6b.sh
+++ b/t/ar-lib6b.sh
@@ -18,7 +18,7 @@
# Keep this test in sync with sister test 'ar-lib6a.test'.
required=libtoolize
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
@@ -29,7 +29,7 @@ END
libtoolize
$ACLOCAL
-$AUTOCONF 2>stderr || { cat stderr >&2; Exit 1; }
+$AUTOCONF 2>stderr || { cat stderr >&2; exit 1; }
cat stderr >&2
$EGREP 'AC_PROG_LIBTOOL.*before.*AM_PROG_AR' stderr
diff --git a/t/ar-lib7.sh b/t/ar-lib7.sh
index 34e6c6e..c27cabf 100755
--- a/t/ar-lib7.sh
+++ b/t/ar-lib7.sh
@@ -16,7 +16,7 @@
# Test if automake warns if ar-lib is missing when AM_PROG_AR is used.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AM_PROG_AR
diff --git a/t/ar.sh b/t/ar.sh
index b8d9901..da01d75 100755
--- a/t/ar.sh
+++ b/t/ar.sh
@@ -16,7 +16,7 @@
# Make sure that AR, ARFLAGS, and RANLIB can be substituted from configure.ac.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AM_PROG_AR
diff --git a/t/ar2.sh b/t/ar2.sh
index c71afea..88e90ca 100755
--- a/t/ar2.sh
+++ b/t/ar2.sh
@@ -17,7 +17,7 @@
# Make sure AR and ARFLAGS are defined for EXTRA_LIBRARIES.
# Report from Kevin Ryde.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
diff --git a/t/ar3.sh b/t/ar3.sh
index ba0b4b7..f8bf855 100755
--- a/t/ar3.sh
+++ b/t/ar3.sh
@@ -17,7 +17,7 @@
# Make sure that AR, ARFLAGS, etc. works also when the macro AM_PROG_AR
# is used.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
diff --git a/t/ar4.sh b/t/ar4.sh
index 424a776..dc82605 100755
--- a/t/ar4.sh
+++ b/t/ar4.sh
@@ -16,7 +16,7 @@
# Test if configure bails out if $AR does not work and AM_PROG_AR is used.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AM_PROG_AR
@@ -32,6 +32,6 @@ test $st -eq 1
grep '^checking.* archiver .*interface.*\.\.\. unknown' stdout
grep '^configure: error: could not determine /bin/false interface' stderr
-ls *conftest* && Exit 1
+ls *conftest* && exit 1
:
diff --git a/t/ar5.sh b/t/ar5.sh
index 711fad6..50cf2b0 100755
--- a/t/ar5.sh
+++ b/t/ar5.sh
@@ -16,7 +16,7 @@
# Test the optional argument of AM_PROG_AR.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AM_PROG_AR([
@@ -30,7 +30,7 @@ END
$ACLOCAL
$AUTOCONF
-./configure AR=/bin/false >stdout || { cat stdout; Exit 1; }
+./configure AR=/bin/false >stdout || { cat stdout; exit 1; }
cat stdout
grep '^checking.* archiver .*interface.*\.\.\. unknown$' stdout
grep '^checking for something else\.\.\. found it$' stdout
diff --git a/t/asm.sh b/t/asm.sh
index b9a958d..c2f20b1 100755
--- a/t/asm.sh
+++ b/t/asm.sh
@@ -17,7 +17,7 @@
# Test of basic assembly functionality.
# Keep this in sync with sister tests asm2.test and asm3.test.
-. ./defs || Exit 1
+. ./defs || exit 1
mv configure.ac configure.stub
diff --git a/t/asm2.sh b/t/asm2.sh
index 737d46d..1c50690 100755
--- a/t/asm2.sh
+++ b/t/asm2.sh
@@ -17,7 +17,7 @@
# Test of basic preprocessed assembly functionality.
# Keep this in sync with sister tests asm.test and asm3.test.
-. ./defs || Exit 1
+. ./defs || exit 1
mv configure.ac configure.stub
diff --git a/t/asm3.sh b/t/asm3.sh
index f7f835a..e114764 100755
--- a/t/asm3.sh
+++ b/t/asm3.sh
@@ -17,7 +17,7 @@
# Test of basic preprocessed assembly functionality with extension .sx.
# Keep this in sync with sister tests asm.test and asm2.test.
-. ./defs || Exit 1
+. ./defs || exit 1
mv configure.ac configure.stub
diff --git a/t/autodist-aclocal-m4.sh b/t/autodist-aclocal-m4.sh
index 448634c..f879dea 100755
--- a/t/autodist-aclocal-m4.sh
+++ b/t/autodist-aclocal-m4.sh
@@ -21,7 +21,7 @@
# remove this test.
# Related to automake bug#7819.
-. ./defs || Exit 1
+. ./defs || exit 1
{ echo 'm4_include([defs.m4])'
cat configure.ac
diff --git a/t/autodist-configure-no-subdir.sh
b/t/autodist-configure-no-subdir.sh
index 93e7f5f..458142c 100755
--- a/t/autodist-configure-no-subdir.sh
+++ b/t/autodist-configure-no-subdir.sh
@@ -18,7 +18,7 @@
# distributed when placed in a subdirectory.
# Related to automake bug#7819.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac <<END
AC_CONFIG_FILES([sub/Makefile])
diff --git a/t/autodist-no-duplicate.sh b/t/autodist-no-duplicate.sh
index 0055e4c..58742ce 100755
--- a/t/autodist-no-duplicate.sh
+++ b/t/autodist-no-duplicate.sh
@@ -17,7 +17,7 @@
# Check that there are no duplicates in the list of files automatically
# distributed by automake.
-. ./defs || Exit 1
+. ./defs || exit 1
re='Files .*automatically distributed.*if found'
@@ -47,4 +47,4 @@ for i in 1 2; do
diff files$i.lst files$i.uniq || st=1
done
-Exit $st
+exit $st
diff --git a/t/autodist-stamp-vti.sh b/t/autodist-stamp-vti.sh
index 33ceb1a..5944f30 100755
--- a/t/autodist-stamp-vti.sh
+++ b/t/autodist-stamp-vti.sh
@@ -19,7 +19,7 @@
# Related to automake bug#7819.
required=makeinfo
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << END
AC_OUTPUT
diff --git a/t/autodist-subdir.sh b/t/autodist-subdir.sh
index fbb7523..657dcc2 100755
--- a/t/autodist-subdir.sh
+++ b/t/autodist-subdir.sh
@@ -24,7 +24,7 @@
#
# Keep this test in sync with sister test 'autodist.test'.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac <<'END'
AC_CONFIG_FILES([sub/Makefile])
@@ -97,7 +97,7 @@ $MAKE distdir
autodist_list="$list" $MAKE check
$MAKE maintainer-clean
-test ! -f sub/README # Sanity check.
+test ! -e sub/README # Sanity check.
rm -rf $me-1.0 # Remove $(distdir).
: Now try creating the automatically-distributed files before
diff --git a/t/autodist.sh b/t/autodist.sh
index 1c8fd7d..2ec7418 100755
--- a/t/autodist.sh
+++ b/t/autodist.sh
@@ -20,7 +20,7 @@
# Keep this test in sync with sister test 'autodist-subdir.test'.
am_create_testdir=empty
-. ./defs || Exit 1
+. ./defs || exit 1
cat > configure.ac <<END
AC_INIT([$me], [1.0])
@@ -80,7 +80,7 @@ $MAKE distdir
autodist_list="$list" $MAKE check
$MAKE maintainer-clean
-test ! -f README # Sanity check.
+test ! -e README # Sanity check.
rm -rf $me-1.0 # Remove $(distdir).
: Now try creating the automatically-distributed files before
diff --git a/t/autohdr.sh b/t/autohdr.sh
index bef7027..19daabe 100755
--- a/t/autohdr.sh
+++ b/t/autohdr.sh
@@ -16,7 +16,7 @@
# Check that autoheaders works, despite our AC_CONFIG_HEADERS hack.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >>configure.ac <<EOF
AC_CONFIG_HEADERS([thisfile.h])
diff --git a/t/autohdr3.sh b/t/autohdr3.sh
index fbe0e31..2827c0c 100755
--- a/t/autohdr3.sh
+++ b/t/autohdr3.sh
@@ -16,7 +16,7 @@
# Check rebuild rules for autoheader.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >>configure.ac <<EOF
m4_include([foo.m4])
diff --git a/t/autohdr4.sh b/t/autohdr4.sh
index 9bdfd13..fa1f8f0 100755
--- a/t/autohdr4.sh
+++ b/t/autohdr4.sh
@@ -18,7 +18,7 @@
# (This should also work without GNU Make.)
required=cc
-. ./defs || Exit 1
+. ./defs || exit 1
cat >>configure.ac <<'EOF'
AC_PROG_CC
@@ -67,12 +67,12 @@ $AUTOMAKE
./configure --enable-dependency-tracking
$MAKE
# Sanity check.
-cross_compiling || sub3/run | grep grepme1 || Exit 1
+cross_compiling || sub3/run | grep grepme1 || exit 1
$sleep
echo '#define NAME "grepme2"' > sub2/config.bot
$MAKE
-cross_compiling || sub3/run | grep grepme2 || Exit 1
+cross_compiling || sub3/run | grep grepme2 || exit 1
$MAKE test-prog-updated
$MAKE distcheck
diff --git a/t/autohdrdry.sh b/t/autohdrdry.sh
index 9df36f1..3bd474e 100755
--- a/t/autohdrdry.sh
+++ b/t/autohdrdry.sh
@@ -17,7 +17,7 @@
# Removal recovery rules for AC_CONFIG_HEADERS should not remove files
# with 'make -n'.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >>configure.ac <<'EOF'
AC_CONFIG_HEADERS([config.h])
@@ -37,6 +37,6 @@ $MAKE
rm -f config.h
$MAKE -n
test -f stamp-h1
-test ! -f config.h
+test ! -r config.h
:
diff --git a/t/automake-cmdline.tap b/t/automake-cmdline.tap
index 72c559a..dd8b30a 100755
--- a/t/automake-cmdline.tap
+++ b/t/automake-cmdline.tap
@@ -16,7 +16,7 @@
# Test Automake's command-line options.
-. ./defs || Exit 1
+. ./defs || exit 1
plan_ 17
diff --git a/t/auxdir-autodetect.sh b/t/auxdir-autodetect.sh
index 41a73d5..654a303 100755
--- a/t/auxdir-autodetect.sh
+++ b/t/auxdir-autodetect.sh
@@ -17,7 +17,7 @@
# Make sure that, if AC_CONFIG_AUX_DIR is not specified, Automake tries
# to use '.', '..' and '../..', in precisely that order.
-. ./defs || Exit 1
+. ./defs || exit 1
nil=__no_such_program
@@ -65,7 +65,7 @@ $AUTOMAKE
out=out0 $MAKE test
cat out0
grep "%%d0%%.*$nil" out0
-grep '%%d[123]' out0 && Exit 1
+grep '%%d[123]' out0 && exit 1
rm -f missing install-sh
@@ -87,7 +87,7 @@ $AUTOMAKE
out=out1 $MAKE test
cat out1
grep "%%d1%%.*$nil" out1
-grep '%%d[023]' out1 && Exit 1
+grep '%%d[023]' out1 && exit 1
rm -f ../missing ../install-sh
@@ -116,7 +116,7 @@ $AUTOMAKE
out=out2 $MAKE test
cat out2
grep "%%d2%%.*$nil" out2
-grep '%%d[013]' out2 && Exit 1
+grep '%%d[013]' out2 && exit 1
rm -f ../../missing ../../install-sh
diff --git a/t/auxdir-computed.tap b/t/auxdir-computed.tap
index 487958d..95d1003 100755
--- a/t/auxdir-computed.tap
+++ b/t/auxdir-computed.tap
@@ -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
plan_ 3
diff --git a/t/auxdir-misplaced.sh b/t/auxdir-misplaced.sh
index 33f5db0..87259b2 100755
--- a/t/auxdir-misplaced.sh
+++ b/t/auxdir-misplaced.sh
@@ -16,7 +16,7 @@
# Test to make sure we diagnose misplaced AC_CONFIG_AUX_DIR.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_CONFIG_AUX_DIR([.]) dnl this will appear after AM_INIT_AUTOMAKE
diff --git a/t/auxdir-nonexistent.sh b/t/auxdir-nonexistent.sh
index 5575b28..43eeed2 100755
--- a/t/auxdir-nonexistent.sh
+++ b/t/auxdir-nonexistent.sh
@@ -16,7 +16,7 @@
# Make sure we diagnose non-existent AC_CONFIG_AUX_DIR names.
-. ./defs || Exit 1
+. ./defs || exit 1
cat > configure.ac <<END
AC_INIT([$me], [1.0])
diff --git a/t/auxdir-unportable.tap b/t/auxdir-unportable.tap
index d04b38c..8f06999 100755
--- a/t/auxdir-unportable.tap
+++ b/t/auxdir-unportable.tap
@@ -16,7 +16,7 @@
# Make sure we diagnose unportable AC_CONFIG_AUX_DIR names.
-. ./defs || Exit 1
+. ./defs || exit 1
plan_ 4
diff --git a/t/auxdir.sh b/t/auxdir.sh
index be113d9..ce3d188 100755
--- a/t/auxdir.sh
+++ b/t/auxdir.sh
@@ -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.ac <<END
diff --git a/t/auxdir6.sh b/t/auxdir6.sh
index 57f4d95..c071fe7 100755
--- a/t/auxdir6.sh
+++ b/t/auxdir6.sh
@@ -20,7 +20,7 @@
# config auxdir.
# Keep this in sync with sister tests auxdir7.test and auxdir8.test.
-. ./defs || Exit 1
+. ./defs || exit 1
cat > configure.ac <<END
AC_INIT([$me], [1.0])
diff --git a/t/auxdir7.sh b/t/auxdir7.sh
index 6eba079..0d01d24 100755
--- a/t/auxdir7.sh
+++ b/t/auxdir7.sh
@@ -19,7 +19,7 @@
# making the top-level directory the config auxdir.
# Keep this in sync with sister tests auxdir6.test and auxdir8.test.
-. ./defs || Exit 1
+. ./defs || exit 1
cat > configure.ac <<END
AC_INIT([$me], [1.0])
diff --git a/t/auxdir8.sh b/t/auxdir8.sh
index 9f4f76d..6c6e055 100755
--- a/t/auxdir8.sh
+++ b/t/auxdir8.sh
@@ -21,7 +21,7 @@
# directory.
# Keep this in sync with sister tests auxdir6.test and auxdir7.test.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_CONFIG_FILES([subdir/Makefile])
diff --git a/t/ax/depcomp-shuffle.sh b/t/ax/depcomp-shuffle.sh
index 3e9f61b..d64f963 100644
--- a/t/ax/depcomp-shuffle.sh
+++ b/t/ax/depcomp-shuffle.sh
@@ -19,7 +19,7 @@
# set the variables '$xdir' and '$vpath' appropriately.
required=cc
-. ./defs || Exit 1
+. ./defs || exit 1
test x${xdir+"set"} = x"set" || fatal_ "\$xdir is unset"
test x${vpath+"set"} = x"set" || fatal_ "\$vpath is unset"
@@ -42,7 +42,7 @@ fi
finalize_edit ()
{
- diff "$1" t && Exit 1
+ diff "$1" t && exit 1
mv -f t "$2"
}
@@ -65,7 +65,7 @@ prepend ()
if cross_compiling; then
grep_prog_out () { :; }
else
- grep_prog_out () { ./prg && ./prg | grep "$1" || Exit 1; }
+ grep_prog_out () { ./prg && ./prg | grep "$1" || exit 1; }
fi
echo AC_PROG_CC >> configure.ac
@@ -106,13 +106,13 @@ $ACLOCAL
$AUTOCONF
$AUTOMAKE -a
-test $vpath = no || { mkdir build && cd build; } || Exit 99
+test $vpath = no || { mkdir build && cd build; } || exit 99
$srcdir/configure --enable-dependency-tracking
$MAKE
grep_prog_out foofoofoo # Sanity check.
-EXEEXT=`$MAKE -s --no-print-directory get-exeext` \
+EXEEXT=$($MAKE -s --no-print-directory get-exeext) \
|| fatal_ "cannot get \$EXEEXT"
# Modify an header file.
diff --git a/t/ax/is b/t/ax/is
index 1e1c0ce..4f043ca 100755
--- a/t/ax/is
+++ b/t/ax/is
@@ -21,6 +21,9 @@
# in the face of variables defined through line-continuations,
# automake rewrites and expansions of empty variables.
+# NOTE: keep this file Bourne-compatible, for the sake of systems with
+# non-POSIX /bin/sh (like Solaris).
+
set -e
set -u
diff --git a/t/ax/is_newest b/t/ax/is_newest
index f52a1a8..cd1a38e 100755
--- a/t/ax/is_newest
+++ b/t/ax/is_newest
@@ -16,8 +16,10 @@
# Usage: is_newest FILE FILES
# Fail if any file in FILES is newer than FILE, and print the list of
-# such files on the standard error.
-# Resolve ties in favor of FILE.
+# such files on the standard error. Resolve ties in favor of FILE.
+
+# NOTE: keep this file Bourne-compatible, for the sake of systems with
+# non-POSIX /bin/sh (like Solaris).
set -u
@@ -29,7 +31,7 @@ if test $# -lt 2; then
fi
file=$1; shift
-newer_files=$(find "$@" -prune -newer "$file") || exit $?
+newer_files=`find "$@" -prune -newer "$file"` || exit $?
if test -n "$newer_files"; then
echo "$me: these files are newer than '$file':" >&2
diff --git a/t/ax/plain-functions.sh b/t/ax/plain-functions.sh
index e6483dc..6c5fef8 100644
--- a/t/ax/plain-functions.sh
+++ b/t/ax/plain-functions.sh
@@ -29,10 +29,10 @@
# Copied from Gnulib's 'tests/init.sh'.
warn_ () { echo "$@" 1>&$stderr_fileno_; }
-fail_ () { warn_ "$me: failed test: $@"; Exit 1; }
-skip_ () { warn_ "$me: skipped test: $@"; Exit 77; }
-fatal_ () { warn_ "$me: hard error: $@"; Exit 99; }
-framework_failure_ () { warn_ "$me: set-up failure: $@"; Exit 99; }
+fail_ () { warn_ "$me: failed test: $@"; exit 1; }
+skip_ () { warn_ "$me: skipped test: $@"; exit 77; }
+fatal_ () { warn_ "$me: hard error: $@"; exit 99; }
+framework_failure_ () { warn_ "$me: set-up failure: $@"; exit 99; }
# For compatibility with TAP functions.
skip_all_ () { skip_ "$@"; }
diff --git a/t/ax/tap-functions.sh b/t/ax/tap-functions.sh
index eebcbe9..3eff61c 100644
--- a/t/ax/tap-functions.sh
+++ b/t/ax/tap-functions.sh
@@ -172,7 +172,7 @@ skip_all_ ()
{
echo "1..0 # SKIP" ${1+"$@"}
planned_=0
- Exit 0
+ exit 0
}
# bailout_ [REASON ...]
@@ -183,7 +183,7 @@ skip_all_ ()
bailout_ ()
{
echo 'Bail out!' ${1+"$@"}
- Exit 99
+ exit 99
}
# fatal_ [REASON ...]
diff --git a/t/ax/tap-summary-aux.sh b/t/ax/tap-summary-aux.sh
index 5003448..2a04616 100644
--- a/t/ax/tap-summary-aux.sh
+++ b/t/ax/tap-summary-aux.sh
@@ -16,7 +16,7 @@
# Auxiliary script for tests on TAP support: checking testsuite summary.
-. ./defs || Exit 1
+. ./defs || exit 1
br='============================================================================'
@@ -64,9 +64,9 @@ do_check ()
$make_cmd check > stdout || st=$?
cat stdout
if test $expect_failure = yes; then
- test $st -gt 0 || Exit 1
+ test $st -gt 0 || exit 1
else
- test $st -eq 0 || Exit 1
+ test $st -eq 0 || exit 1
fi
$PERL "$am_testauxdir"/extract-testsuite-summary.pl stdout >summary.got \
|| fatal_ "cannot extract testsuite summary"
@@ -78,7 +78,7 @@ do_check ()
else
compare=diff
fi
- $compare summary.exp summary.got || Exit 1
+ $compare summary.exp summary.got || exit 1
}
if test $use_colors = yes; then
@@ -311,7 +311,7 @@ done > tap
# Lots of non-failures (300 per kind).
(cat tap && cat tap && cat tap) > all.test
-test $(wc -l <all.test) -eq 900 || Exit 99 # Sanity check.
+test $(wc -l <all.test) -eq 900 || exit 99 # Sanity check.
echo 1..900 >> all.test # Test plan.
do_check --pass <<END
$success_header
@@ -327,7 +327,7 @@ END
# 1 failure and lots of non-failures means failure.
(cat tap && echo "not ok" && cat tap) > all.test
-test $(wc -l <all.test) -eq 601 || Exit 99 # Sanity check.
+test $(wc -l <all.test) -eq 601 || exit 99 # Sanity check.
echo 1..601 >> all.test # Test plan.
do_check --fail <<END
$failure_header
@@ -343,7 +343,7 @@ END
# 1 error and lots of non-failures means failure.
(cat tap && sed 30q tap && echo 'Bail out!') > all.test
-test $(wc -l <all.test) -eq 331 || Exit 99 # Sanity check.
+test $(wc -l <all.test) -eq 331 || exit 99 # Sanity check.
echo 1..331 >> all.test # Test plan.
do_check --fail <<END
$failure_header
diff --git a/t/ax/test-init.sh b/t/ax/test-init.sh
index ba3c1e6..b92e373 100644
--- a/t/ax/test-init.sh
+++ b/t/ax/test-init.sh
@@ -22,19 +22,6 @@
# Enable the errexit shell flag early.
set -e
-# The name of the current test (without the '.sh' or '.tap' suffix).
-# Test scripts can override it if they need to (but this should
-# be done carefully).
-if test -z "$me"; then
- # Strip all directory components.
- me=${argv0##*/}
- # Strip test suffix.
- case $me in
- *.tap) me=${me%.tap};;
- *.sh) me=${me%.sh} ;;
- esac
-fi
-
## --------------------- ##
## Early sanity checks. ##
@@ -153,22 +140,24 @@ am_keeping_testdirs ()
esac
}
-# This is used in 'Exit' and in the exit trap. See comments in the latter
-# for more information,
+# This is used in '_am_exit' and in the exit trap. See comments in
+# the latter for more information.
am__test_skipped=no
# 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 ()
+# sh inside this function (FIXME: is this still relevant now that we
+# require a POSIX shell?).
+_am_exit ()
{
set +e
# See comments in the exit trap for the reason we do this.
test 77 = $1 && am__test_skipped=yes
- (exit $1); exit $1
+ # Spurious escaping to ensure we do not call our 'exit' alias.
+ (\exit $1); \exit $1
}
+alias exit=_am_exit
if test $am_using_tap = yes; then
am_funcs_file=tap-functions.sh
@@ -179,11 +168,11 @@ fi
if test -f "$am_testauxdir/$am_funcs_file"; then
. "$am_testauxdir/$am_funcs_file" || {
echo "$me: error sourcing $am_testauxdir/$am_funcs_file" >&2
- Exit 99
+ exit 99
}
else
echo "$me: $am_testauxdir/$am_funcs_file not found" >&2
- Exit 99
+ exit 99
fi
unset am_funcs_file
@@ -255,7 +244,7 @@ AUTOMAKE_run ()
cat stderr >&2
cat stdout
if test $am_using_tap != yes; then
- test $am__got_rc -eq $am__exp_rc || Exit 1
+ test $am__got_rc -eq $am__exp_rc || exit 1
return
fi
if test -z "$am__desc"; then
@@ -319,12 +308,12 @@ extract_configure_help ()
grep_configure_help ()
{
./configure --help > am--all-help \
- || { cat am--all-help; Exit 1; }
+ || { cat am--all-help; exit 1; }
cat am--all-help
extract_configure_help "$1" am--all-help > am--our-help \
- || { cat am--our-help; Exit 1; }
+ || { cat am--our-help; exit 1; }
cat am--our-help
- $EGREP "$2" am--our-help || Exit 1
+ $EGREP "$2" am--our-help || exit 1
}
# seq_ - print a sequence of numbers
@@ -477,7 +466,8 @@ fetch_tap_driver ()
# TODO: we should devise a way to make the shell TAP driver tested also
# TODO: with /bin/sh, for better coverage.
case $am_tap_implementation in
- perl)
+ # Extra quoting required to avoid maintainer-check spurious failures.
+ 'perl')
$PERL -MTAP::Parser -e 1 \
|| skip_all_ "cannot import TAP::Parser perl module"
sed "1s|#!.*|#! $PERL -w|" "$am_scriptdir"/tap-driver.pl >tap-driver
@@ -686,8 +676,8 @@ do
priv_check_temp=priv-check.$$
touch $priv_check_temp && chmod a-w $priv_check_temp \
|| framework_failure_ "creating unwritable file $priv_check_temp"
- # Not a useless use of subshell: lesser shells like Solaris /bin/sh
- # can exit if a builtin fails.
+ # Not a useless use of subshell: lesser shells might bail
+ # out if a builtin fails.
overwrite_status=0
(echo foo >> $priv_check_temp) || overwrite_status=$?
rm -f $priv_check_temp
@@ -696,7 +686,8 @@ do
fi
unset priv_check_temp overwrite_status
;;
- perl-threads)
+ # Extra quoting required to avoid maintainer-check spurious failures.
+ 'perl-threads')
if test "$WANT_NO_THREADS" = "yes"; then
skip_all_ "Devel::Cover cannot cope with threads"
fi
@@ -718,8 +709,8 @@ do
ro_dir_temp=ro_dir.$$
mkdir $ro_dir_temp && chmod a-w $ro_dir_temp \
|| framework_failure_ "creating unwritable directory $ro_dir_temp"
- # Not a useless use of subshell: lesser shells like Solaris /bin/sh
- # can exit if a builtin fails.
+ # Not a useless use of subshell: lesser shells might bail
+ # out if a builtin fails.
create_status=0
(: > $ro_dir_temp/probe) || create_status=$?
rm -rf $ro_dir_temp
@@ -774,31 +765,6 @@ do
esac
done
-# Using just $am_top_builddir for the check here is ok, since the
-# further temporary subdirectory where the test will be run is
-# ensured not to contain any whitespace character.
-case $am_top_builddir in
- *\ *|*\ *)
- case " $required " in
- *' libtool '* | *' libtoolize '* )
- skip_all_ "libtool has problems with spaces in builddir name";;
- esac
- ;;
-esac
-
-# This test is necessary, although Automake's configure script bails out
-# when $srcdir contains spaces. This is because $am_top_srcdir is in not
-# configure-time $srcdir, but is instead configure-time $abs_srcdir, and
-# that is allowed to contain spaces.
-case $am_top_srcdir in
- *\ * |*\ *)
- case " $required " in
- *' libtool '* | *' libtoolize '* | *' gettext '* )
- skip_all_ "spaces in srcdir name: libtool/gettext tests won't work";;
- esac
- ;;
-esac
-
# We might need extra macros, e.g., from Libtool or Gettext.
case " $required " in *\ libtool*) . ./t/libtool-macros.dir/get.sh;; esac
case " $required " in *\ gettext*) . ./t/gettext-macros.dir/get.sh;; esac
@@ -842,7 +808,8 @@ trap 'exit_status=$?
am_keeping_testdirs || rm_rf_ $testSubDir
set +x
echo "$me: exit $exit_status"
- exit $exit_status
+ # Spurious escaping to ensure we do not call our "exit" alias.
+ \exit $exit_status
' 0
trap "fatal_ 'caught signal SIGHUP'" 1
trap "fatal_ 'caught signal SIGINT'" 2
@@ -859,7 +826,6 @@ trap "fatal_ 'caught signal SIGTERM'" 15
# OTOH, at least these shells that do *not* exhibit that behaviour:
# - modern version of the Almquist Shell (at least 0.5.5.1), on
# both Solaris and GNU/Linux
-# - Solaris 10 /bin/sh
# - public domain Korn Shell, version 5.2.14, on Debian GNU/Linux
trap "fatal_ 'caught signal SIGQUIT'" 3
# Ignore further SIGPIPE in the trap code. This is required to avoid
@@ -881,12 +847,12 @@ else
# by the cleanup trap below if the test passes. If the test doesn't pass,
# this directory will be kept, to facilitate debugging.
testSubDir=t/$me.dir
- test ! -d $testSubDir || rm_rf_ $testSubDir \
+ test ! -e $testSubDir || rm_rf_ $testSubDir \
|| framework_failure_ "removing old test subdirectory"
test -d t || mkdir t
mkdir $testSubDir \
|| framework_failure_ "creating test subdirectory"
- # The trailing './'ris to avoid CDPATH issues.
+ # The leading './' is to avoid CDPATH issues.
cd ./$testSubDir \
|| framework_failure_ "cannot chdir into test subdirectory"
if test x"$am_create_testdir" != x"empty"; then
diff --git a/t/ax/testsuite-summary-checks.sh b/t/ax/testsuite-summary-checks.sh
index 2419718..d31a94c 100644
--- a/t/ax/testsuite-summary-checks.sh
+++ b/t/ax/testsuite-summary-checks.sh
@@ -20,7 +20,7 @@
# testsuite output, packages with and without bug-report addresses,
# testsuites in subdirectories, ...)
-. ./defs || Exit 1
+. ./defs || exit 1
case $use_colors in
yes)
@@ -80,9 +80,9 @@ do_check ()
st=0; $MAKE "$@" check >stdout || st=$?
cat stdout
if $expect_failure; then
- test $st -gt 0 || Exit 1
+ test $st -gt 0 || exit 1
else
- test $st -eq 0 || Exit 1
+ test $st -eq 0 || exit 1
fi
$PERL "$am_testauxdir"/extract-testsuite-summary.pl stdout >summary.got \
|| fatal_ "cannot extract testsuite summary"
@@ -94,7 +94,7 @@ do_check ()
else
compare=diff
fi
- $compare summary.exp summary.got || Exit 1
+ $compare summary.exp summary.got || exit 1
}
br='============================================================================'
diff --git a/t/backcompat-acout.sh b/t/backcompat-acout.sh
index 9088aae..f2e552b 100755
--- a/t/backcompat-acout.sh
+++ b/t/backcompat-acout.sh
@@ -16,7 +16,7 @@
# Backward-compatibility: AC_OUTPUT with arguments.
-. ./defs || Exit 1
+. ./defs || exit 1
mkdir sub
: > Makefile.am
diff --git a/t/backsl.sh b/t/backsl.sh
index 48d70c7..fb34ee1 100755
--- a/t/backsl.sh
+++ b/t/backsl.sh
@@ -16,7 +16,7 @@
# Test for "\" problems. Bug report from Joerg-Martin Schwarz.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
@@ -30,5 +30,5 @@ END
$ACLOCAL
$AUTOMAKE
-grep '^_SOURCE' Makefile.in && Exit 1
-Exit 0
+grep '^_SOURCE' Makefile.in && exit 1
+exit 0
diff --git a/t/backsl2.sh b/t/backsl2.sh
index 82e2f08..5d9d6d1 100755
--- a/t/backsl2.sh
+++ b/t/backsl2.sh
@@ -17,7 +17,7 @@
# We must skip the backslash, not complain about './\' not existing.
# Reported by Rick Scott <address@hidden>
-. ./defs || Exit 1
+. ./defs || exit 1
cat > Makefile.am << 'END'
SUBDIRS = \
diff --git a/t/backsl4.sh b/t/backsl4.sh
index c11d20d..707d358 100755
--- a/t/backsl4.sh
+++ b/t/backsl4.sh
@@ -17,7 +17,7 @@
# Make sure we diagnose and fix white spaces following backslash.
# Report from Peter Muir.
-. ./defs || Exit 1
+. ./defs || exit 1
echo AC_OUTPUT >>configure.ac
diff --git a/t/backslash-tricks.sh b/t/backslash-tricks.sh
index e236183..d005765 100755
--- a/t/backslash-tricks.sh
+++ b/t/backslash-tricks.sh
@@ -30,7 +30,7 @@
# and newline sequence, because GNU make handles that gracefully.
#
-. ./defs || Exit 1
+. ./defs || exit 1
echo AC_OUTPUT >> configure.ac
diff --git a/t/badline.sh b/t/badline.sh
index 3f548f7..3d71425 100755
--- a/t/badline.sh
+++ b/t/badline.sh
@@ -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
cat > configure.ac << END
AC_INIT([$me], [1.0])
@@ -28,6 +28,6 @@ END
: > Makefile.am
-$ACLOCAL || Exit 1
+$ACLOCAL || exit 1
AUTOMAKE_fails
grep 'configure.ac:3:.*info_TEXINFOS' stderr
diff --git a/t/badopt.sh b/t/badopt.sh
index b06657f..b548a4f 100755
--- a/t/badopt.sh
+++ b/t/badopt.sh
@@ -16,7 +16,7 @@
# Test to make sure bad options cause error.
-. ./defs || Exit 1
+. ./defs || exit 1
echo 'AUTOMAKE_OPTIONS = zardoz' > Makefile.am
diff --git a/t/badprog.sh b/t/badprog.sh
index 81ff5b7..6134e3e 100755
--- a/t/badprog.sh
+++ b/t/badprog.sh
@@ -17,7 +17,7 @@
# Test to make sure that programs with bad names are properly
# transformed.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
diff --git a/t/block.sh b/t/block.sh
index a6e9e32..7cdb5ff 100755
--- a/t/block.sh
+++ b/t/block.sh
@@ -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
@@ -30,5 +30,5 @@ END
$ACLOCAL
$AUTOMAKE
-(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/t/bsource.sh b/t/bsource.sh
index 0ab31f7..e3e481d 100755
--- a/t/bsource.sh
+++ b/t/bsource.sh
@@ -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
cat > Makefile.am << 'END'
noinst_SCRIPTS = hostname
@@ -32,7 +32,7 @@ $AUTOCONF
./configure
for t in all check install; do
- $MAKE -n $t-recursive 2>stderr && { cat stderr >&2; Exit 1; }
+ $MAKE -n $t-recursive 2>stderr && { cat stderr >&2; exit 1; }
cat stderr >&2
grep " [Nn]o rule to make target.*[\`\"']$t-recursive" stderr
done
diff --git a/t/built-sources-check.sh b/t/built-sources-check.sh
index 28fa21f..d4d3c51 100755
--- a/t/built-sources-check.sh
+++ b/t/built-sources-check.sh
@@ -18,7 +18,7 @@
# PR/359.
# For gen-testsuite-part: ==> try-with-serial-tests <==
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_CONFIG_FILES([dir/Makefile])
@@ -58,10 +58,10 @@ $AUTOCONF
$AUTOMAKE -a
./configure --prefix "$(pwd)/inst"
-$MAKE check >stdout || { cat stdout; Exit 1; }
+$MAKE check >stdout || { cat stdout; exit 1; }
cat stdout
grep '^PASS: subrun\.sh *$' stdout
-grep 'PASS.*echo\.sh' stdout && Exit 1
+grep 'PASS.*echo\.sh' stdout && exit 1
$MAKE distcheck
diff --git a/t/built-sources-cond.sh b/t/built-sources-cond.sh
index d74abab..ac78a97 100755
--- a/t/built-sources-cond.sh
+++ b/t/built-sources-cond.sh
@@ -16,7 +16,7 @@
# Interaction of BUILT_SOURCES with conditionals.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac <<'END'
AM_CONDITIONAL([COND1], [test $cond1 = yes])
diff --git a/t/built-sources-install.sh b/t/built-sources-install.sh
index 307864c..2f53bb5 100755
--- a/t/built-sources-install.sh
+++ b/t/built-sources-install.sh
@@ -17,7 +17,7 @@
# Make sure 'install:' honors $(BUILT_SOURCES).
# PR/359.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_CONFIG_FILES([dir/Makefile])
@@ -57,7 +57,7 @@ END
$ACLOCAL
$AUTOCONF
$AUTOMAKE
-./configure --prefix "`pwd`/inst"
+./configure --prefix "$(pwd)/inst"
# Now make sure these two files are rebuilt during make install.
$MAKE install
diff --git a/t/built-sources-subdir.sh b/t/built-sources-subdir.sh
index 976b794..7c03771 100755
--- a/t/built-sources-subdir.sh
+++ b/t/built-sources-subdir.sh
@@ -19,7 +19,7 @@
# all-recursive-am which depended on BUILT_SOURCES.
required=cc
-. ./defs || Exit 1
+. ./defs || exit 1
mkdir lib
diff --git a/t/built-sources.sh b/t/built-sources.sh
index b60a637..902cee1 100755
--- a/t/built-sources.sh
+++ b/t/built-sources.sh
@@ -17,7 +17,7 @@
# Basic test on BUILT_SOURCES.
required=cc
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac <<'END'
AC_PROG_CC
diff --git a/t/c-demo.sh b/t/c-demo.sh
index c461876..2f51cf7 100755
--- a/t/c-demo.sh
+++ b/t/c-demo.sh
@@ -19,7 +19,7 @@
required=cc
am_create_testdir=empty
-. ./defs || Exit 1
+. ./defs || exit 1
cat > configure.ac << 'END'
AC_INIT([GNU C Demo], [22.3.2], address@hidden)
@@ -154,8 +154,8 @@ $MAKE test-objs
VERBOSE=x $MAKE check
if cross_compiling; then
- test ! -f tests/test-suite.log
- test ! -f tests/test.log
+ test ! -e tests/test-suite.log
+ test ! -e tests/test.log
else
test -f tests/test-suite.log
grep 'Foo, Bar!' tests/test.log
@@ -173,7 +173,7 @@ if ! cross_compiling && ! grep "[ $tab]depmode=none"
Makefile; then
fi
$MAKE clean
-test ! -f lib/foo.h
+test ! -e lib/foo.h
test -f lib/bar.h
:
diff --git a/t/candist.sh b/t/candist.sh
index aaa40d4..d87836a 100755
--- a/t/candist.sh
+++ b/t/candist.sh
@@ -16,7 +16,7 @@
# Test to make sure things that cannot be dist_'ed are diagnosed.
-. ./defs || Exit 1
+. ./defs || exit 1
echo AC_OUTPUT >>configure.ac
@@ -29,4 +29,4 @@ $ACLOCAL
AUTOMAKE_fails
test 2 -eq $(grep -c 'dist.*forbidden' stderr)
-Exit 0
+exit 0
diff --git a/t/canon-name.sh b/t/canon-name.sh
index 3e8de08..59f8d8d 100755
--- a/t/canon-name.sh
+++ b/t/canon-name.sh
@@ -17,7 +17,7 @@
# PR 511: Make sure we warn about e.g. AC_CONFIG_FILES([./gmakefile]),
# as not all make implementations treat 'file' and './file' equally.
-. ./defs || Exit 1
+. ./defs || exit 1
cat > configure.ac <<END
AC_INIT([$me], [1.0])
diff --git a/t/canon.sh b/t/canon.sh
index 0c4ec7f..be65bf7 100755
--- a/t/canon.sh
+++ b/t/canon.sh
@@ -16,7 +16,7 @@
# Test to make sure that name canonicalization error works.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
diff --git a/t/canon2.sh b/t/canon2.sh
index 4d39a7e..d9869e8 100755
--- a/t/canon2.sh
+++ b/t/canon2.sh
@@ -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
@@ -30,6 +30,6 @@ echo '@setfilename frob' > frob.texi
$ACLOCAL
$AUTOMAKE
-grep zar-doz_TEXINFOS Makefile.in && Exit 1
+grep zar-doz_TEXINFOS Makefile.in && exit 1
:
diff --git a/t/canon3.sh b/t/canon3.sh
index 25a8e71..4a95cb5 100755
--- a/t/canon3.sh
+++ b/t/canon3.sh
@@ -16,7 +16,7 @@
# Yet another canonicalization test.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
@@ -31,6 +31,6 @@ END
$ACLOCAL
$AUTOMAKE
-$FGREP 'perm_number.c' Makefile.in && Exit 1
+$FGREP 'perm_number.c' Makefile.in && exit 1
:
diff --git a/t/canon4.sh b/t/canon4.sh
index 6cdfd41..e57667d 100755
--- a/t/canon4.sh
+++ b/t/canon4.sh
@@ -17,7 +17,7 @@
# Test to make sure name canonicalization happens for static libraries.
# Keep this in sync with sister test 'canon6.test'.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
@@ -35,6 +35,6 @@ END
$ACLOCAL
$AUTOMAKE
-grep '^ *libx-y.*=' Makefile.in && Exit 1
+grep '^ *libx-y.*=' Makefile.in && exit 1
:
diff --git a/t/canon5.sh b/t/canon5.sh
index 8a3f427..eba456a 100755
--- a/t/canon5.sh
+++ b/t/canon5.sh
@@ -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
cat >> configure.ac << 'END'
AC_PROG_CC
diff --git a/t/canon6.sh b/t/canon6.sh
index 64f946c..dc4acd6 100755
--- a/t/canon6.sh
+++ b/t/canon6.sh
@@ -18,7 +18,7 @@
# Keep this in sync with sister test 'canon4.test'.
required='libtoolize'
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
@@ -37,6 +37,6 @@ END
$ACLOCAL
$AUTOMAKE -a
-grep '^ *libx-y.*=' Makefile.in && Exit 1
+grep '^ *libx-y.*=' Makefile.in && exit 1
:
diff --git a/t/canon7.sh b/t/canon7.sh
index d9d22c2..8ffeffb 100755
--- a/t/canon7.sh
+++ b/t/canon7.sh
@@ -17,7 +17,7 @@
# Stress test on canonicalization.
required='cc libtool libtoolize'
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
diff --git a/t/canon8.sh b/t/canon8.sh
index 180e333..bb5e7f9 100755
--- a/t/canon8.sh
+++ b/t/canon8.sh
@@ -16,7 +16,7 @@
# Check that canonicalization does not transliterate the '@' charactrer.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
@@ -32,6 +32,6 @@ $AUTOMAKE
# The first grep is here mostly for debugging.
grep foob.rquux Makefile.in
grep address@hidden Makefile.in
-grep 'address@hidden' Makefile.in && Exit 1
+grep 'address@hidden' Makefile.in && exit 1
:
diff --git a/t/ccnoco.sh b/t/ccnoco.sh
index 60898c8..2e5bd4f 100755
--- a/t/ccnoco.sh
+++ b/t/ccnoco.sh
@@ -18,7 +18,7 @@
# understand '-c -o'.
required=gcc
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
diff --git a/t/ccnoco2.sh b/t/ccnoco2.sh
index 6d4bf9c..e97558b 100755
--- a/t/ccnoco2.sh
+++ b/t/ccnoco2.sh
@@ -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
cat >>configure.ac <<EOF
AC_CONFIG_FILES([src/Makefile])
diff --git a/t/ccnoco3.sh b/t/ccnoco3.sh
index a17ebc7..0361b41 100755
--- a/t/ccnoco3.sh
+++ b/t/ccnoco3.sh
@@ -17,7 +17,7 @@
# Test to make sure 'compile' doesn't call 'mv SRC SRC'.
required=gcc
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
@@ -69,8 +69,8 @@ mkdir build
cd build
../configure
-$MAKE 2>stderr || { cat stderr >&2; Exit 1; }
+$MAKE 2>stderr || { cat stderr >&2; exit 1; }
cat stderr >&2
-grep 'mv.*the same file' stderr && Exit 1
+grep 'mv.*the same file' stderr && exit 1
:
diff --git a/t/check-concurrency-bug9245.sh b/t/check-concurrency-bug9245.sh
index 177806a..108f142 100755
--- a/t/check-concurrency-bug9245.sh
+++ b/t/check-concurrency-bug9245.sh
@@ -20,7 +20,7 @@
# keep the test anyway, for extra safety.
# See automake bug#9245.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_OUTPUT
@@ -45,13 +45,13 @@ $AUTOMAKE -a
./configure
for j in '' -j1 -j2; do
- $MAKE $j check && Exit 1
- $MAKE $j TESTS=foo.test check && Exit 1
- $MAKE $j recheck && Exit 1
- $MAKE $j TESTS=foo check && Exit 1
+ $MAKE $j check && exit 1
+ $MAKE $j TESTS=foo.test check && exit 1
+ $MAKE $j recheck && exit 1
+ $MAKE $j TESTS=foo check && exit 1
rm -f test-suite.log
- $MAKE $j test-suite.log && Exit 1
- test -f test-suite.log || Exit 1
+ $MAKE $j test-suite.log && exit 1
+ test -f test-suite.log || exit 1
done
:
diff --git a/t/check-exported-srcdir.sh b/t/check-exported-srcdir.sh
index 25a4722..ff48a5f 100755
--- a/t/check-exported-srcdir.sh
+++ b/t/check-exported-srcdir.sh
@@ -19,7 +19,7 @@
# environment of the tests. This is documented in the manual.
# For gen-testsuite-part: ==> try-with-serial-tests <==
-. ./defs || Exit 1
+. ./defs || exit 1
show_info ()
{
@@ -58,7 +58,7 @@ $AUTOMAKE -a
cd ../BuildDir
../SrcDir/configure
-$MAKE check || { show_info; Exit 1; }
+$MAKE check || { show_info; exit 1; }
show_info
:
diff --git a/t/check-fd-redirect.sh b/t/check-fd-redirect.sh
index 618aa80..0d31e89 100755
--- a/t/check-fd-redirect.sh
+++ b/t/check-fd-redirect.sh
@@ -19,7 +19,7 @@
# See also related test 'parallel-tests-fd-redirect.test'.
# For gen-testsuite-part: ==> try-with-serial-tests <==
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_OUTPUT
@@ -55,11 +55,11 @@ do_check ()
test $st -eq 0
grep '[ /]foo\.test: foofoofoo$' stdout
grep '[ /]foo\.test: barbarbar$' stderr
- grep 'this line' four && Exit 1
+ grep 'this line' four && exit 1
grep '^3333$' four
grep '^this line will not be removed$' five
grep '^ok ok ok$' five
- $EGREP '(foofoofoo|barbarbar|3333|ok ok ok|this line)' foo.log && Exit 1
+ $EGREP '(foofoofoo|barbarbar|3333|ok ok ok|this line)' foo.log && exit 1
:
}
diff --git a/t/check-no-test-driver.sh b/t/check-no-test-driver.sh
index f86b4da..bcb2cc9 100755
--- a/t/check-no-test-driver.sh
+++ b/t/check-no-test-driver.sh
@@ -18,7 +18,7 @@
# installed or referenced when the 'serial-tests' option is used.
am_serial_tests=yes
-. ./defs || Exit 1
+. ./defs || exit 1
cat > Makefile.am <<'END'
AUTOMAKE_OPTIONS = serial-tests
@@ -29,8 +29,8 @@ $ACLOCAL
for opts in '' '-a' '--add-missing --copy'; do
$AUTOMAKE $opts
- $FGREP 'test-driver' Makefile.in && Exit 1
- find . | $FGREP 'test-driver' && Exit 1
+ $FGREP 'test-driver' Makefile.in && exit 1
+ find . | $FGREP 'test-driver' && exit 1
: For shells with busted 'set -e'.
done
diff --git a/t/check-subst-prog.sh b/t/check-subst-prog.sh
index 540c749..dc1947e 100755
--- a/t/check-subst-prog.sh
+++ b/t/check-subst-prog.sh
@@ -19,7 +19,7 @@
# For gen-testsuite-part: ==> try-with-serial-tests <==
required='cc native'
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
diff --git a/t/check-subst.sh b/t/check-subst.sh
index 3cc2bc4..b743ca3 100755
--- a/t/check-subst.sh
+++ b/t/check-subst.sh
@@ -20,7 +20,7 @@
# See also sister test 'check-subst-prog.test'.
# For gen-testsuite-part: ==> try-with-serial-tests <==
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_SUBST([script_tests], ['subst-pass-script.sh subst-xfail-script.sh'])
diff --git a/t/check-tests-in-builddir.sh b/t/check-tests-in-builddir.sh
index 5b3cb22..6785877 100755
--- a/t/check-tests-in-builddir.sh
+++ b/t/check-tests-in-builddir.sh
@@ -18,7 +18,7 @@
# well as in builddir, and that is prefers those in the builddir.
# For gen-testsuite-part: ==> try-with-serial-tests <==
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_OUTPUT
@@ -52,28 +52,28 @@ exit 0
END
chmod a+x bar.test
-$MAKE check >out 2>&1 || { cat out; Exit1; }
+$MAKE check >out 2>&1 || { cat out; exit 1; }
cat out
# The serial test driver does not strip VPATH components from
# the name of the test, but the parallel driver should.
if test x"$am_serial_tests" = x"yes"; then
grep '^PASS: .*foo\.test *$' out
else
- grep '\.\./foo' out && Exit 1
+ grep '\.\./foo' out && exit 1
grep '^PASS: foo\.test *$' out
fi
grep '^PASS: bar\.test *$' out
rm -f test-suite.log foo.log bar.log
-FOO_EXIT_STATUS=1 $MAKE check >out 2>&1 && { cat out; Exit1; }
+FOO_EXIT_STATUS=1 $MAKE check >out 2>&1 && { cat out; exit 1; }
cat out
# The serial test driver does not strip VPATH components from
# the name of the test, but the parallel driver should.
if test x"$am_serial_tests" = x"yes"; then
grep '^FAIL: .*foo\.test *$' out
else
- grep '\.\./foo' out && Exit 1
+ grep '\.\./foo' out && exit 1
grep '^FAIL: foo\.test *$' out
fi
grep '^PASS: bar\.test *$' out
@@ -83,7 +83,7 @@ rm -f test-suite.log foo.log bar.log
# Check that if the same test is present in srcdir and builddir,
# the one in builddir is preferred.
cp bar.test foo.test
-FOO_EXIT_STATUS=1 $MAKE check >out 2>&1 || { cat out; Exit1; }
+FOO_EXIT_STATUS=1 $MAKE check >out 2>&1 || { cat out; exit 1; }
cat out
grep '^PASS: foo\.test *$' out
grep '^PASS: bar\.test *$' out
diff --git a/t/check10.sh b/t/check10.sh
index d108335..ce04e3d 100755
--- a/t/check10.sh
+++ b/t/check10.sh
@@ -18,7 +18,7 @@
# This test only makes sense for the older serial testsuite driver.
am_serial_tests=yes
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_OUTPUT
@@ -71,15 +71,15 @@ $AUTOMAKE -a
$MAKE check TESTS="pass skip xfail"
$MAKE check
:
-) >stdout || { cat stdout; Exit 1; }
+) >stdout || { cat stdout; exit 1; }
cat stdout
-grep '1 [tT]ests' stdout && Exit 1
-grep '[02-9] [tT]est ' stdout && Exit 1
-grep '1 .* were ' stdout && Exit 1
-grep '[02-9].* was .*run' stdout && Exit 1
-grep 'All 1 ' stdout && Exit 1
-$EGREP '1 (un)?expected (failures|passes)' stdout && Exit 1
-$EGREP '[^1] (un)?expected (failure|pass)\)' stdout && Exit 1
+grep '1 [tT]ests' stdout && exit 1
+grep '[02-9] [tT]est ' stdout && exit 1
+grep '1 .* were ' stdout && exit 1
+grep '[02-9].* was .*run' stdout && exit 1
+grep 'All 1 ' stdout && exit 1
+$EGREP '1 (un)?expected (failures|passes)' stdout && exit 1
+$EGREP '[^1] (un)?expected (failure|pass)\)' stdout && exit 1
:
diff --git a/t/check11.sh b/t/check11.sh
index 9d56a7c..1c76487 100755
--- a/t/check11.sh
+++ b/t/check11.sh
@@ -17,7 +17,7 @@
# Check skip summary.
# For gen-testsuite-part: ==> try-with-serial-tests <==
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_OUTPUT
@@ -40,19 +40,19 @@ $AUTOMAKE -a
./configure
-$MAKE check TESTS=skip >stdout || { cat stdout; Exit 1; }
+$MAKE check TESTS=skip >stdout || { cat stdout; exit 1; }
cat stdout
if test x"$am_serial_tests" = x"yes"; then
- grep '1.*passed' stdout && Exit 1
+ grep '1.*passed' stdout && exit 1
: For shells with buggy 'set -e'.
else
count_test_results total=1 pass=0 fail=0 skip=1 xfail=0 xpass=0 error=0
fi
-$MAKE check TESTS="skip skip2" >stdout || { cat stdout; Exit 1; }
+$MAKE check TESTS="skip skip2" >stdout || { cat stdout; exit 1; }
cat stdout
if test x"$am_serial_tests" = x"yes"; then
- grep '2.*passed' stdout && Exit 1
+ grep '2.*passed' stdout && exit 1
: For shells with buggy 'set -e'.
else
count_test_results total=2 pass=0 fail=0 skip=2 xfail=0 xpass=0 error=0
diff --git a/t/check12.sh b/t/check12.sh
index 79a45e5..d438dbd 100755
--- a/t/check12.sh
+++ b/t/check12.sh
@@ -19,7 +19,7 @@
# For gen-testsuite-part: ==> try-with-serial-tests <==
required=runtest
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_OUTPUT
@@ -146,27 +146,27 @@ for vpath in : false; do
cp -f config.status config-status.sav
$MAKE distclean
- test ! -r hammer.log
- test ! -r hammer.sum
- test ! -r spanner.log
- test ! -r spanner.sum
- test ! -r test-suite.log
- test ! -r a.log
- test ! -r b.log
- test ! -r local.log
+ test ! -e hammer.log
+ test ! -e hammer.sum
+ test ! -e spanner.log
+ test ! -e spanner.sum
+ test ! -e test-suite.log
+ test ! -e a.log
+ test ! -e b.log
+ test ! -e local.log
mv -f config-status.sav config.status
./config.status
- NAIL=screw $MAKE check && Exit 1
+ NAIL=screw $MAKE check && exit 1
test -f hammer.log
test -f hammer.sum
test -f spanner.log
test -f spanner.sum
grep 'FAIL: test_hammer' hammer.sum
- grep 'FAIL:' spanner.sum && Exit 1
+ grep 'FAIL:' spanner.sum && exit 1
- B_EXIT_STATUS=1 $MAKE check && Exit 1
+ B_EXIT_STATUS=1 $MAKE check && exit 1
if test x"$am_serial_tests" != x"yes"; then
cat test-suite.log
cat a.log
@@ -175,21 +175,21 @@ for vpath in : false; do
grep '^b\.test: exit status: 1$' b.log
grep '^FAIL: b$' test-suite.log
grep '^b\.test: exit status: 1$' test-suite.log
- grep '^a\.test' test-suite.log && Exit 1
+ grep '^a\.test' test-suite.log && exit 1
: For shells with busted 'set -e'.
fi
- CHECKLOCAL_EXIT_STATUS=1 $MAKE check && Exit 1
+ CHECKLOCAL_EXIT_STATUS=1 $MAKE check && exit 1
grep 'check-local failed :-(' local.log
env NAIL=screw B_EXIT_STATUS=23 CHECKLOCAL_EXIT_STATUS=1 \
- $MAKE -k check && Exit 1
+ $MAKE -k check && exit 1
test -f hammer.log
test -f hammer.sum
test -f spanner.log
test -f spanner.sum
grep 'FAIL: test_hammer' hammer.sum
- grep 'FAIL:' spanner.sum && Exit 1
+ grep 'FAIL:' spanner.sum && exit 1
if test x"$am_serial_tests" != x"yes"; then
cat test-suite.log
cat a.log
@@ -198,7 +198,7 @@ for vpath in : false; do
grep '^b\.test: exit status: 23$' b.log
grep '^FAIL: b$' test-suite.log
grep '^b\.test: exit status: 23$' test-suite.log
- grep '^a\.test' test-suite.log && Exit 1
+ grep '^a\.test' test-suite.log && exit 1
: For shells with busted 'set -e'.
fi
grep 'check-local failed :-(' local.log
diff --git a/t/check2.sh b/t/check2.sh
index 439f04b..9a1124a 100755
--- a/t/check2.sh
+++ b/t/check2.sh
@@ -17,7 +17,7 @@
# Test Automake style tests.
# For gen-testsuite-part: ==> try-with-serial-tests <==
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_CONFIG_FILES([dir/Makefile])
@@ -51,10 +51,10 @@ $AUTOCONF
$AUTOMAKE
./configure
-$MAKE check >stdout || { cat stdout; Exit 1; }
+$MAKE check >stdout || { cat stdout; exit 1; }
cat stdout
grep '^PASS: subrun\.sh *$' stdout
-grep 'PASS.*echo\.sh' stdout && Exit 1
+grep 'PASS.*echo\.sh' stdout && exit 1
$EGREP '^check:.*check-recursive' Makefile.in
$EGREP '^check:.*check-am' dir/Makefile.in
diff --git a/t/check4.sh b/t/check4.sh
index 0e2554c..d7c9fac 100755
--- a/t/check4.sh
+++ b/t/check4.sh
@@ -17,7 +17,7 @@
# Make sure 'make -k check' processes all directories.
# For gen-testsuite-part: ==> try-with-serial-tests <==
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_CONFIG_FILES([dir/Makefile])
@@ -51,18 +51,18 @@ $AUTOMAKE --add-missing
./configure --prefix "$(pwd)/inst"
-$MAKE check >stdout && { cat stdout; Exit 1; }
+$MAKE check >stdout && { cat stdout; exit 1; }
cat stdout
grep '^FAIL: fail\.sh *$' stdout
-grep '^PASS: ok\.sh *$' stdout && Exit 1
+grep '^PASS: ok\.sh *$' stdout && exit 1
-$MAKE -k check >stdout && { cat stdout; Exit 1; }
+$MAKE -k check >stdout && { cat stdout; exit 1; }
cat stdout
grep '^FAIL: fail\.sh *$' stdout
grep '^PASS: ok\.sh *$' stdout
# Should also works when -k is not in first position.
-$MAKE -s -k check >stdout && { cat stdout; Exit 1; }
+$MAKE -s -k check >stdout && { cat stdout; exit 1; }
cat stdout
grep '^FAIL: fail\.sh *' stdout
grep '^PASS: ok\.sh *' stdout
@@ -70,7 +70,7 @@ grep '^PASS: ok\.sh *' stdout
# Try with a long-option that do not have a short option equivalent
# (here, --no-print-directory). That should cause all options to
# appear verbatim in MAKEFLAGS.
-$MAKE --no-print-directory -k check >stdout && { cat stdout; Exit 1; }
+$MAKE --no-print-directory -k check >stdout && { cat stdout; exit 1; }
cat stdout
grep '^FAIL: fail\.sh *$' stdout
grep '^PASS: ok\.sh *$' stdout
diff --git a/t/check5.sh b/t/check5.sh
index 2e5e792..df5a8af 100755
--- a/t/check5.sh
+++ b/t/check5.sh
@@ -18,7 +18,7 @@
# For gen-testsuite-part: ==> try-with-serial-tests <==
required='cc native'
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
diff --git a/t/check6.sh b/t/check6.sh
index 0f33f8d..d885713 100755
--- a/t/check6.sh
+++ b/t/check6.sh
@@ -18,7 +18,7 @@
# Also test that Solaris make VPATH rewriting is honored
# For gen-testsuite-part: ==> try-with-serial-tests <==
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_OUTPUT
diff --git a/t/check7.sh b/t/check7.sh
index 184ceb4..d145f8a 100755
--- a/t/check7.sh
+++ b/t/check7.sh
@@ -18,7 +18,7 @@
# For gen-testsuite-part: ==> try-with-serial-tests <==
required=cc
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
diff --git a/t/check8.sh b/t/check8.sh
index b50a512..24eab72 100755
--- a/t/check8.sh
+++ b/t/check8.sh
@@ -18,7 +18,7 @@
# For gen-testsuite-part: ==> try-with-serial-tests <==
required='cc native'
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
@@ -65,7 +65,7 @@ $AUTOMAKE -a
./configure
AM_COLOR_TESTS=always $MAKE check >stdout 2>stderr \
- && { cat stdout; cat stderr >&2; Exit 1; }
+ && { cat stdout; cat stderr >&2; exit 1; }
cat stdout
cat stderr >&2
grep 'XPASS.* foo$' stdout
@@ -76,15 +76,15 @@ grep '^[^X]*FAIL.* baz' stdout
grep 'XFAIL.* sub/baz' stdout
# The parallel test driver should cause circular dependencies.
# Look for known warnings from a couple of 'make' implementations.
-grep -i 'circular.*dependency' stderr && Exit 1
-grep -i 'graph cycles' stderr && Exit 1
+grep -i 'circular.*dependency' stderr && exit 1
+grep -i 'graph cycles' stderr && exit 1
$MAKE distclean
mkdir build
cd build
../configure
-$MAKE check >stdout && { cat stdout; Exit 1; }
+$MAKE check >stdout && { cat stdout; exit 1; }
cat stdout
# Note: we are not grepping for the space in the lines from the 'foo'
# tests, due to the Solaris make VPATH rewriting (if we fix that, we
diff --git a/t/checkall.sh b/t/checkall.sh
index 3b04d56..4320574 100755
--- a/t/checkall.sh
+++ b/t/checkall.sh
@@ -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
diff --git a/t/clean.sh b/t/clean.sh
index 279e162..80f56df 100755
--- a/t/clean.sh
+++ b/t/clean.sh
@@ -16,7 +16,7 @@
# Test to make sure a clean target depends on previous one.
-. ./defs || Exit 1
+. ./defs || exit 1
: > Makefile.am
diff --git a/t/cleanvars.sh b/t/cleanvars.sh
index 2f14e17..a5d0506 100755
--- a/t/cleanvars.sh
+++ b/t/cleanvars.sh
@@ -22,7 +22,7 @@
# Especially checks that it is possible to extend them also from a
# "wrapper" makefile never processed nor seen by Automake.
-. ./defs || Exit 1
+. ./defs || exit 1
echo AC_OUTPUT >> configure.ac
diff --git a/t/colneq2.sh b/t/colneq2.sh
index b313441..124b6d2 100755
--- a/t/colneq2.sh
+++ b/t/colneq2.sh
@@ -16,7 +16,7 @@
# Test that := in var substitutions works.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_OUTPUT
diff --git a/t/colon.sh b/t/colon.sh
index f5cb4e0..f3e95a6 100755
--- a/t/colon.sh
+++ b/t/colon.sh
@@ -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.ac <<'END'
AC_CONFIG_FILES([foo.h:foo.hin])
diff --git a/t/colon2.sh b/t/colon2.sh
index 2b06151..b59ad49 100755
--- a/t/colon2.sh
+++ b/t/colon2.sh
@@ -17,7 +17,7 @@
# Make sure ":" works with files automake generates.
# See also sister test 'colon3.test'.
-. ./defs || Exit 1
+. ./defs || exit 1
cat > configure.ac <<END
AC_INIT([$me], [1.0])
@@ -43,7 +43,7 @@ $FGREP 'zardoz.am' zardoz.in
$FGREP 'zardoz.in' zardoz.in
sed -e 's|zardoz\.am|zrdz.am|g' \
-e 's|zardoz\.in|zrdz.in|g' \
- <zardoz.in | $FGREP 'zardoz' && Exit 1
+ <zardoz.in | $FGREP 'zardoz' && exit 1
# The configure-generated Makefile should depend on zardoz.in, two.in and
# three.in. The automake-generated zardoz.in should depend on zardoz.am.
@@ -58,7 +58,7 @@ test -f Makefile # Sanity check.
$MAKE dummy
# Again, make sure that the generated Makefile do not unduly
# refer to 'zardoz' .
-$MAKE -n zardoz && Exit 1
+$MAKE -n zardoz && exit 1
$sleep
cat >> zardoz.am <<END
diff --git a/t/colon3.sh b/t/colon3.sh
index 5d7b3b2..5ef2267 100755
--- a/t/colon3.sh
+++ b/t/colon3.sh
@@ -18,7 +18,7 @@
# This test is for multiple ":"s.
# See also sister test 'colon2.test'.
-. ./defs || Exit 1
+. ./defs || exit 1
cat > configure.ac <<END
AC_INIT([$me], [1.0])
@@ -47,7 +47,7 @@ $FGREP 'zardoz.am' zardoz.in
$FGREP 'zardoz.in' zardoz.in
sed -e 's|zardoz\.am|zrdz.am|g' \
-e 's|zardoz\.in|zrdz.in|g' \
- <zardoz.in | $FGREP 'zardoz' && Exit 1
+ <zardoz.in | $FGREP 'zardoz' && exit 1
# The configure-generated Makefile should depend on zardoz.in, two.in and
# three.in. The automake-generated zardoz.in should depend on zardoz.am.
@@ -64,7 +64,7 @@ test -f Makefile # Sanity check.
$MAKE dummy
# Again, make sure that the generated Makefile do not unduly
# refer to 'zardoz' .
-$MAKE -n zardoz && Exit 1
+$MAKE -n zardoz && exit 1
$sleep
cat >> zardoz.am <<END
diff --git a/t/colon4.sh b/t/colon4.sh
index 6dad3ab..34f0571 100755
--- a/t/colon4.sh
+++ b/t/colon4.sh
@@ -18,7 +18,7 @@
# rebuild rules.
# Test from Maciej W. Rozycki.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac <<END
AC_CONFIG_FILES([zardoz:one:two:three])
@@ -35,5 +35,5 @@ $AUTOMAKE
# The rule should regenerate the file "zardoz", not a meaningless
# file "'zardoz:one:two".
-$FGREP 'zardoz:one:two' Makefile.in && Exit 1
-Exit 0
+$FGREP 'zardoz:one:two' Makefile.in && exit 1
+exit 0
diff --git a/t/colon5.sh b/t/colon5.sh
index 6ce2e2b..aac3c22 100755
--- a/t/colon5.sh
+++ b/t/colon5.sh
@@ -16,7 +16,7 @@
# Another multi-":" test, this time from Doug Evans.
-. ./defs || Exit 1
+. ./defs || exit 1
cat > configure.ac <<END
AC_INIT([$me], [1.0])
@@ -50,8 +50,8 @@ $AUTOMAKE
./configure
-grep '=GrEpMe_am=' Makefile && Exit 1 # Sanity check.
-grep '=GrEpMe_dep=' Makefile && Exit 1 # Likewise.
+grep '=GrEpMe_am=' Makefile && exit 1 # Sanity check.
+grep '=GrEpMe_dep=' Makefile && exit 1 # Likewise.
$MAKE test-distcommon
$MAKE test-distdir
diff --git a/t/colon6.sh b/t/colon6.sh
index bf2dacd..6c4639d 100755
--- a/t/colon6.sh
+++ b/t/colon6.sh
@@ -16,7 +16,7 @@
# Yet another multi-":" test, this time from Ken Pizzini.
-. ./defs || Exit 1
+. ./defs || exit 1
cat > configure.ac <<END
AC_INIT([$me], [1.0])
@@ -37,7 +37,7 @@ $AUTOMAKE
# These are older "grepping checks", kept mostly for backward-compatibility.
# They might (unlikely, but possibly) require updating when automake
# internals are changed. Just relax or remove if they become too fragile.
-$EGREP 'Makefile:.*(demo|version)' demo/Makefile.in && Exit 1
+$EGREP 'Makefile:.*(demo|version)' demo/Makefile.in && exit 1
grep 'version\.good:.*version\.gin' demo/Makefile.in
$AUTOCONF
@@ -69,7 +69,7 @@ for vpath in : false; do
# Makefile should not depend on version.good.
rm -f version.good
$MAKE Makefile
- test ! -r version.good
+ test ! -e version.good
# version.good should be rebuilt from version.gin.
$MAKE version.good
@@ -78,11 +78,11 @@ for vpath in : false; do
# Makefile should not depend on version.gin.
rm -f ../$srcdir/demo/version.gin
$MAKE Makefile
- test ! -r ../$srcdir/demo/version.gin # Sanity check.
+ test ! -e ../$srcdir/demo/version.gin # Sanity check.
# version.good should depend on version.gin.
rm -f version.good
- $MAKE version.good 2>stderr && { cat stderr >&2; Exit 1; }
+ $MAKE version.good 2>stderr && { cat stderr >&2; exit 1; }
cat stderr >&2
# Try to verify that we errored out for the right reason.
$FGREP version.gin stderr
diff --git a/t/colon7.sh b/t/colon7.sh
index 0d3cc1b..4254c5b 100755
--- a/t/colon7.sh
+++ b/t/colon7.sh
@@ -17,7 +17,7 @@
# Another test for a failing ":" in AC_OUTPUT.
# Report from Maciej Stachowiak.
-. ./defs || Exit 1
+. ./defs || exit 1
cat > configure.ac << 'END'
AC_INIT([colon7], [1.0])
@@ -44,7 +44,7 @@ $ACLOCAL
$AUTOMAKE
# Should nowhere refer to 'bar.in'.
-$FGREP 'bar.in' Makefile.in subdir/Makefile.in && Exit 1
+$FGREP 'bar.in' Makefile.in subdir/Makefile.in && exit 1
$AUTOCONF
./configure
diff --git a/t/color.sh b/t/color.sh
index 9e4ac04..9b3b3bc 100755
--- a/t/color.sh
+++ b/t/color.sh
@@ -19,7 +19,7 @@
required='grep-nonprint'
# For gen-testsuite-part: ==> try-with-serial-tests <==
-. ./defs || Exit 1
+. ./defs || exit 1
# Escape '[' for grep, below.
red="$esc\[0;31m"
@@ -91,7 +91,7 @@ test_no_color ()
{
# Not a useless use of cat; see above comments "grep-nonprinting"
# requirement in 'test-init.sh'.
- cat stdout | grep "$esc" && Exit 1
+ cat stdout | grep "$esc" && exit 1
:
}
@@ -110,11 +110,11 @@ for vpath in false :; do
# Forced colorization should take place also with non-ANSI terminals;
# hence the "TERM=dumb" definition.
$MAKE check AM_COLOR_TESTS=always TERM=dumb >stdout \
- && { cat stdout; Exit 1; }
+ && { cat stdout; exit 1; }
cat stdout
test_color
- $MAKE check TERM=ansi >stdout && { cat stdout; Exit 1; }
+ $MAKE check TERM=ansi >stdout && { cat stdout; exit 1; }
cat stdout
test_no_color
diff --git a/t/color2.sh b/t/color2.sh
index 841c585..18734c9 100755
--- a/t/color2.sh
+++ b/t/color2.sh
@@ -19,7 +19,7 @@
required='grep-nonprint'
# For gen-testsuite-part: ==> try-with-serial-tests <==
-. ./defs || Exit 1
+. ./defs || exit 1
# Escape '[' for grep, below.
red="$esc\[0;31m"
@@ -30,8 +30,7 @@ mgn="$esc\[0;35m"
std="$esc\[m"
# This test requires a working a working 'expect' program.
-# Creative quoting required to avoid spurious maintainer-check failure.
-(set +e; expect -c 'exit ''77'; test $? -eq 77) \
+(set +e; expect -c 'exit 77'; test $? -eq 77) \
|| skip_ "requires a working expect program"
# Do the tests.
@@ -98,7 +97,7 @@ test_no_color ()
{
# Not a useless use of cat; see above comments "grep-nonprinting"
# requirement in 'test-init.sh'.
- cat stdout | grep "$esc" && Exit 1
+ cat stdout | grep "$esc" && exit 1
:
}
@@ -120,17 +119,17 @@ for vpath in false :; do
$srcdir/configure
TERM=ansi MAKE=$MAKE expect -f $srcdir/expect-make >stdout \
- || { cat stdout; Exit 1; }
+ || { cat stdout; exit 1; }
cat stdout
test_color
TERM=dumb MAKE=$MAKE expect -f $srcdir/expect-make >stdout \
- || { cat stdout; Exit 1; }
+ || { cat stdout; exit 1; }
cat stdout
test_no_color
AM_COLOR_TESTS=no MAKE=$MAKE expect -f $srcdir/expect-make >stdout \
- || { cat stdout; Exit 1; }
+ || { cat stdout; exit 1; }
cat stdout
test_no_color
diff --git a/t/comment.sh b/t/comment.sh
index 6ca98ba..3508bed 100755
--- a/t/comment.sh
+++ b/t/comment.sh
@@ -17,7 +17,7 @@
# 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
diff --git a/t/comment2.sh b/t/comment2.sh
index a63075c..124e273 100755
--- a/t/comment2.sh
+++ b/t/comment2.sh
@@ -17,7 +17,7 @@
# Make sure comment recognition works in PROGRAMS. Report from Mark
# Galassi.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
@@ -30,5 +30,5 @@ END
$ACLOCAL
$AUTOMAKE
-grep '^image_proc' Makefile.in && Exit 1
-Exit 0
+grep '^image_proc' Makefile.in && exit 1
+exit 0
diff --git a/t/comment4.sh b/t/comment4.sh
index 616877a..3a2407e 100755
--- a/t/comment4.sh
+++ b/t/comment4.sh
@@ -16,7 +16,7 @@
# Make sure commented variables are output near their comments.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac <<'EOF'
AC_OUTPUT
diff --git a/t/comment6.sh b/t/comment6.sh
index 19fc43b..e0c37cf 100755
--- a/t/comment6.sh
+++ b/t/comment6.sh
@@ -18,7 +18,7 @@
# Automake 1.6.1 seems to have a problem parsing comments that use
# '\' to span multiple lines.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac <<'EOF'
AC_OUTPUT
@@ -47,7 +47,7 @@ do_check ()
$MAKE test
grep '^# SOME_FILES =' Makefile
# No useless munging please.
- grep '#.*file[123]' Makefile && Exit 1
+ grep '#.*file[123]' Makefile && exit 1
:
}
diff --git a/t/comment7.sh b/t/comment7.sh
index 634cc20..7e45853 100755
--- a/t/comment7.sh
+++ b/t/comment7.sh
@@ -17,7 +17,7 @@
# Make sure comment for conditional variables are output near the
# corresponding conditional definitions.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac <<'EOF'
AM_CONDITIONAL([COND], [true])
@@ -54,4 +54,4 @@ sed -n '/^#.*VAR.*COND_FALSE/ {
}' Makefile.in |
grep '@address@hidden = bar'
-:
+:
diff --git a/t/comment8.sh b/t/comment8.sh
index 58b5cd3..1ce6638 100755
--- a/t/comment8.sh
+++ b/t/comment8.sh
@@ -17,7 +17,7 @@
# Make sure += does not append to a comment.
# Report from Stepan Kasal.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac <<'EOF'
AM_CONDITIONAL([COND1], [true])
diff --git a/t/comment9.sh b/t/comment9.sh
index a75fafc..49a9f6f 100755
--- a/t/comment9.sh
+++ b/t/comment9.sh
@@ -17,7 +17,7 @@
# Make sure ##-comments are ignored in variable definitions.
# Report from Julien Sopena.
-. ./defs || Exit 1
+. ./defs || exit 1
cat > Makefile.am << 'EOF'
TESTS = \
@@ -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/t/comments-in-var-def.sh b/t/comments-in-var-def.sh
index 5c01d76..dbb3b14 100755
--- a/t/comments-in-var-def.sh
+++ b/t/comments-in-var-def.sh
@@ -17,7 +17,7 @@
# Make sure Automake ignores in-line comments when using variables,
# but preserve them in the output.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac <<'END'
AC_OUTPUT
diff --git a/t/compile.sh b/t/compile.sh
index 638a0d7..1da1cde 100755
--- a/t/compile.sh
+++ b/t/compile.sh
@@ -17,7 +17,7 @@
# Make sure 'compile' preserves spaces in its arguments.
am_create_testdir=empty
-. ./defs || Exit 1
+. ./defs || exit 1
get_shell_script compile
@@ -33,13 +33,13 @@ rm -f 'a c' ./-o a.o a.c
./compile touch a.o -- -o 'a c.o' a.c
test -f 'a c.o'
-test ! -f ./-o
-test ! -f a.o
+test ! -e ./-o
+test ! -e a.o
test -f a.c
# Make sure 'compile' works for .obj too.
./compile touch a.obj -- -o ac.obj a.c
-test ! -f a.obj
+test ! -e a.obj
test ac.obj
:
diff --git a/t/compile2.sh b/t/compile2.sh
index f808607..5f38775 100755
--- a/t/compile2.sh
+++ b/t/compile2.sh
@@ -17,7 +17,7 @@
# Make sure 'compile' deals correctly with Windows-style paths.
am_create_testdir=empty
-. ./defs || Exit 1
+. ./defs || exit 1
get_shell_script compile
diff --git a/t/compile3.sh b/t/compile3.sh
index a1cc479..e8bf8a4 100755
--- a/t/compile3.sh
+++ b/t/compile3.sh
@@ -18,7 +18,7 @@
am_create_testdir=empty
required=xsi-lib-shell
-. ./defs || Exit 1
+. ./defs || exit 1
get_shell_script compile
diff --git a/t/compile4.sh b/t/compile4.sh
index 8e516e3..2e275a3 100755
--- a/t/compile4.sh
+++ b/t/compile4.sh
@@ -18,7 +18,7 @@
# with respect to absolute paths.
required='cl'
-. ./defs || Exit 1
+. ./defs || exit 1
get_shell_script compile
diff --git a/t/compile5.sh b/t/compile5.sh
index 0f787cc..89c5be3 100755
--- a/t/compile5.sh
+++ b/t/compile5.sh
@@ -17,7 +17,7 @@
# Make sure the file name translation in the 'compile' script works
# correctly
-. ./defs || Exit 1
+. ./defs || exit 1
get_shell_script compile
@@ -73,7 +73,7 @@ for sp in '' ' '; do
res=$(./compile ./cl -L${sp}"$cwd" | sed -e 's/-link -LIBPATH://')
case $res in
?:[\\/]*) ;;
- *) Exit 1 ;;
+ *) exit 1 ;;
esac
done
diff --git a/t/compile6.sh b/t/compile6.sh
index 3979802..ee47c17 100755
--- a/t/compile6.sh
+++ b/t/compile6.sh
@@ -18,7 +18,7 @@
am_create_testdir=empty
required=xsi-lib-shell
-. ./defs || Exit 1
+. ./defs || exit 1
get_shell_script compile
diff --git a/t/compile_f90_c_cxx.sh b/t/compile_f90_c_cxx.sh
index 806c59f..74a5478 100755
--- a/t/compile_f90_c_cxx.sh
+++ b/t/compile_f90_c_cxx.sh
@@ -18,7 +18,7 @@
# mixed source objects.
# (copied from compile_f_c_cxx.test) Mike Nolta <address@hidden>
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
diff --git a/t/compile_f_c_cxx.sh b/t/compile_f_c_cxx.sh
index 2f093ba..419d802 100755
--- a/t/compile_f_c_cxx.sh
+++ b/t/compile_f_c_cxx.sh
@@ -18,7 +18,7 @@
# mixed source objects.
# Matthew D. Langston <address@hidden>
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
diff --git a/t/cond-basic.sh b/t/cond-basic.sh
index 5d18b5c..0b79032 100755
--- a/t/cond-basic.sh
+++ b/t/cond-basic.sh
@@ -16,7 +16,7 @@
# Check basic use of conditionals.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AM_CONDITIONAL([TEST], [true])
diff --git a/t/cond.sh b/t/cond.sh
index f7f0a8c..04fb9fa 100755
--- a/t/cond.sh
+++ b/t/cond.sh
@@ -16,7 +16,7 @@
# Check basic use of conditionals.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AM_CONDITIONAL([TEST], [true])
@@ -34,8 +34,8 @@ 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 'address@hidden@VAR = true$' Makefile.in
grep 'address@hidden@VAR = false$' Makefile.in
diff --git a/t/cond10.sh b/t/cond10.sh
index 56a9083..a556a99 100755
--- a/t/cond10.sh
+++ b/t/cond10.sh
@@ -16,7 +16,7 @@
# Test for bug in conditionals. From Raja R Harinath.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
diff --git a/t/cond11.sh b/t/cond11.sh
index b53cb70..95073d1 100755
--- a/t/cond11.sh
+++ b/t/cond11.sh
@@ -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
cat >> configure.ac << 'END'
AC_SUBST([CC], [false])
diff --git a/t/cond13.sh b/t/cond13.sh
index 1ab328d..c23df15 100755
--- a/t/cond13.sh
+++ b/t/cond13.sh
@@ -17,7 +17,7 @@
# Test for bug in conditionals.
# Report from Lars J. Aas.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
diff --git a/t/cond14.sh b/t/cond14.sh
index 7f300e8..345171e 100755
--- a/t/cond14.sh
+++ b/t/cond14.sh
@@ -17,7 +17,7 @@
# Test for bug in conditionals.
# Report from Robert Boehne.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
diff --git a/t/cond15.sh b/t/cond15.sh
index 8ee799b..6ce37d7 100755
--- a/t/cond15.sh
+++ b/t/cond15.sh
@@ -16,7 +16,7 @@
# Regression test for conditionally defined overriding of automatic rules.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
diff --git a/t/cond16.sh b/t/cond16.sh
index 11a4f68..ded3370 100755
--- a/t/cond16.sh
+++ b/t/cond16.sh
@@ -18,7 +18,7 @@
# references.
# Report from Richard Boulton.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AM_CONDITIONAL([COND1], [true])
diff --git a/t/cond17.sh b/t/cond17.sh
index 37a0793..837fa02 100755
--- a/t/cond17.sh
+++ b/t/cond17.sh
@@ -18,7 +18,7 @@
# according to a conditional.
# Report from Richard Boulton.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
diff --git a/t/cond18.sh b/t/cond18.sh
index 32c0ab2..22bbfcf 100755
--- a/t/cond18.sh
+++ b/t/cond18.sh
@@ -17,7 +17,7 @@
# Regression test for substitution references to conditional variables.
# Report from Richard Boulton.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AM_CONDITIONAL([COND1], [true])
diff --git a/t/cond19.sh b/t/cond19.sh
index 86f677e..b0dd05c 100755
--- a/t/cond19.sh
+++ b/t/cond19.sh
@@ -17,7 +17,7 @@
# Regression test for substitution references to conditional variables.
# Report from Richard Boulton.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_SUBST([CC], [false])
diff --git a/t/cond20.sh b/t/cond20.sh
index 40e41f1..403c609 100755
--- a/t/cond20.sh
+++ b/t/cond20.sh
@@ -17,7 +17,7 @@
# Regression test for recursion handling in substitution references to
# conditional variables.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
diff --git a/t/cond21.sh b/t/cond21.sh
index 7719c83..f5c748c 100755
--- a/t/cond21.sh
+++ b/t/cond21.sh
@@ -16,7 +16,7 @@
# Check for use of = and += in different conditions.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AM_CONDITIONAL([COND1], [true])
diff --git a/t/cond22.sh b/t/cond22.sh
index 7a58c24..10e1d4d 100755
--- a/t/cond22.sh
+++ b/t/cond22.sh
@@ -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
cat >> configure.ac << 'END'
CC=false; AC_SUBST([CC])
diff --git a/t/cond23.sh b/t/cond23.sh
index d6c2bdf..522cffa 100755
--- a/t/cond23.sh
+++ b/t/cond23.sh
@@ -17,7 +17,7 @@
# Check that conditional redefinitions of AC_SUBST'ed variables are detected.
# Report from Patrik Weiskircher.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >>configure.ac <<EOF
AM_CONDITIONAL([COND], [true])
diff --git a/t/cond24.sh b/t/cond24.sh
index b7038cc..eaaf3d7 100755
--- a/t/cond24.sh
+++ b/t/cond24.sh
@@ -17,7 +17,7 @@
# Check that conditional redefinitions of AC_SUBST'ed variables are detected.
# Report from Patrik Weiskircher.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >>configure.ac <<EOF
AC_SUBST([foo], [bar])
diff --git a/t/cond25.sh b/t/cond25.sh
index c427033..2119a8a 100755
--- a/t/cond25.sh
+++ b/t/cond25.sh
@@ -17,7 +17,7 @@
# Check that conditional primaries can use non-conditional directories.
# From Pavel Roskin.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >>configure.ac << 'EOF'
AM_CONDITIONAL([USE_FOO], [true])
diff --git a/t/cond26.sh b/t/cond26.sh
index f0aac96..74cc7cc 100755
--- a/t/cond26.sh
+++ b/t/cond26.sh
@@ -17,7 +17,7 @@
# Check that non-conditional primaries can use conditional directories.
# Reported by Juergen Keil.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >>configure.ac << 'EOF'
AM_CONDITIONAL([USE_FOO], [true])
diff --git a/t/cond27.sh b/t/cond27.sh
index 0a8263d..fa4aa94 100755
--- a/t/cond27.sh
+++ b/t/cond27.sh
@@ -17,7 +17,7 @@
# Check that non-conditional primaries cannot use directories defined
# in some conditions (but not others).
-. ./defs || Exit 1
+. ./defs || exit 1
cat >>configure.ac << 'EOF'
AM_CONDITIONAL([USE_FOO], [true])
@@ -32,7 +32,7 @@ EOF
$ACLOCAL
AUTOMAKE_fails
-grep ' USE_FOO' stderr && Exit 1
+grep ' USE_FOO' stderr && exit 1
grep '!USE_FOO' stderr
:
diff --git a/t/cond28.sh b/t/cond28.sh
index 7a6bcff..4df7446 100755
--- a/t/cond28.sh
+++ b/t/cond28.sh
@@ -17,7 +17,7 @@
# Check that conditional primaries can use directories defined
# in the same conditions (but not others).
-. ./defs || Exit 1
+. ./defs || exit 1
cat >>configure.ac << 'EOF'
AM_CONDITIONAL([USE_FOO], [true])
diff --git a/t/cond3.sh b/t/cond3.sh
index 2bcb8c1..4a348d1 100755
--- a/t/cond3.sh
+++ b/t/cond3.sh
@@ -17,7 +17,7 @@
# Test sources listed in conditional.
# Report from Rob Savoye <address@hidden>, and Lars J. Aas.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
diff --git a/t/cond30.sh b/t/cond30.sh
index 495842c..da954ed 100755
--- a/t/cond30.sh
+++ b/t/cond30.sh
@@ -17,7 +17,7 @@
# For PR/352: make sure we support bin_PROGRAMS, lib_LIBRARIES and
# lib_LTLIBRARIES being defined conditionally.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >>configure.ac <<'EOF'
m4_define([AM_PROG_AR], [:])
diff --git a/t/cond31.sh b/t/cond31.sh
index d6006cb..b849a1a 100755
--- a/t/cond31.sh
+++ b/t/cond31.sh
@@ -16,7 +16,7 @@
# Make sure we define conditional _DEPENDENCIES correctly.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >>configure.ac <<'EOF'
AC_SUBST([CC], [false])
diff --git a/t/cond32.sh b/t/cond32.sh
index 7ff1a41..07b7814 100755
--- a/t/cond32.sh
+++ b/t/cond32.sh
@@ -16,7 +16,7 @@
# Make sure the user can override a conditional _DEPENDENCIES.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >>configure.ac <<'EOF'
AM_CONDITIONAL([C1], [test -z "$two"])
diff --git a/t/cond33.sh b/t/cond33.sh
index d8b6087..53225cb 100755
--- a/t/cond33.sh
+++ b/t/cond33.sh
@@ -18,7 +18,7 @@
# correctly.
# Report from Ralf Corsepius.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >>configure.ac <<'EOF'
AM_CONDITIONAL([INC], [test -z "$two"])
@@ -54,12 +54,12 @@ chmod a-w nowhere
./configure --prefix="$cwd"/nowhere --bindir="$cwd"/bin \
--includedir="$cwd"/inc
$MAKE installdirs
-test ! -d bin
+test ! -e bin
test -d inc/foo
-test ! -f inc/foo/foo.h
+test ! -e inc/foo/foo.h
rm -rf inc
$MAKE install
-test ! -d bin
+test ! -e bin
test -f inc/foo/foo.h
$MAKE distdircheck
@@ -68,11 +68,11 @@ rm -rf inc
./configure two=two --prefix="$cwd"/nowhere --bindir="$cwd"/bin \
--includedir="$cwd"/inc
$MAKE install
-test ! -d inc
+test ! -e inc
test -f bin/x.sh
rm -rf inc
$MAKE installdirs
-test ! -d inc
+test ! -e inc
test -d bin
$MAKE distdircheck
diff --git a/t/cond34.sh b/t/cond34.sh
index 8349406..3d37a2b 100755
--- a/t/cond34.sh
+++ b/t/cond34.sh
@@ -17,7 +17,7 @@
# Check for _DEPENDENCIES definition with conditional _LDADD.
# Report from Elena A. Vengerova.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >>configure.ac <<'EOF'
AM_CONDITIONAL([TWO], [test -n "$two"])
@@ -54,21 +54,21 @@ $AUTOCONF
$AUTOMAKE
./configure
-$MAKE dep-test1 >stdout || { cat stdout; Exit 1; }
+$MAKE dep-test1 >stdout || { cat stdout; exit 1; }
cat stdout
$FGREP 'BEG: one.z somethingelse.a :END' stdout
-$MAKE dep-test2 >stdout || { cat stdout; Exit 1; }
+$MAKE dep-test2 >stdout || { cat stdout; exit 1; }
cat stdout
$FGREP 'BEG: three.z :END' stdout
./configure two=2
-$MAKE dep-test1 >stdout || { cat stdout; Exit 1; }
+$MAKE dep-test1 >stdout || { cat stdout; exit 1; }
cat stdout
$FGREP 'BEG: two.z somethingelse.a :END' stdout
-$MAKE dep-test2 >stdout || { cat stdout; Exit 1; }
+$MAKE dep-test2 >stdout || { cat stdout; exit 1; }
cat stdout
$FGREP 'BEG: two.z somethingelse.a :END' stdout
diff --git a/t/cond35.sh b/t/cond35.sh
index a870902..ea663ce 100755
--- a/t/cond35.sh
+++ b/t/cond35.sh
@@ -18,7 +18,7 @@
# Report from Roman Fietze.
required='cc lex yacc'
-. ./defs || Exit 1
+. ./defs || exit 1
cat >>configure.ac <<'EOF'
AM_CONDITIONAL([CASE_A], [test -z "$case_B"])
diff --git a/t/cond36.sh b/t/cond36.sh
index d9b0699..2b8e584 100755
--- a/t/cond36.sh
+++ b/t/cond36.sh
@@ -16,7 +16,7 @@
# Check rules output for parser defined conditionally.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >>configure.ac <<'EOF'
AM_CONDITIONAL([CASE_A], [test -z "$case_B"])
diff --git a/t/cond37.sh b/t/cond37.sh
index 6423d39..31a1f40 100755
--- a/t/cond37.sh
+++ b/t/cond37.sh
@@ -17,7 +17,7 @@
# Check conditional local rules.
# Report from Simon Josefsson.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >>configure.ac <<'EOF'
AM_CONDITIONAL([CASE_A], [test -n "$case_A"])
@@ -39,19 +39,19 @@ $AUTOCONF
$AUTOMAKE
./configure
-$MAKE check >stdout || { cat stdout; Exit 1; }
+$MAKE check >stdout || { cat stdout; exit 1; }
cat stdout
-grep GrepMe1 stdout && Exit 1
-$MAKE install >stdout || { cat stdout; Exit 1; }
+grep GrepMe1 stdout && exit 1
+$MAKE install >stdout || { cat stdout; exit 1; }
cat stdout
grep GrepMe2 stdout
./configure case_A=1
-$MAKE check >stdout || { cat stdout; Exit 1; }
+$MAKE check >stdout || { cat stdout; exit 1; }
cat stdout
grep GrepMe1 stdout
-$MAKE install >stdout || { cat stdout; Exit 1; }
+$MAKE install >stdout || { cat stdout; exit 1; }
cat stdout
-grep GrepMe2 stdout && Exit 1
+grep GrepMe2 stdout && exit 1
:
diff --git a/t/cond38.sh b/t/cond38.sh
index e63d8d1..d90dce5 100755
--- a/t/cond38.sh
+++ b/t/cond38.sh
@@ -17,7 +17,7 @@
# Check conditional variable ordering.
# Report from Ed Hartnett.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >>configure.ac <<'EOF'
AM_CONDITIONAL([CASE_A], :)
diff --git a/t/cond39.sh b/t/cond39.sh
index 840b8b8..4cbda48 100755
--- a/t/cond39.sh
+++ b/t/cond39.sh
@@ -17,7 +17,7 @@
# Build either as CONFIG_FILE or as PROGRAM.
required=cc
-. ./defs || Exit 1
+. ./defs || exit 1
mkdir sub
@@ -78,24 +78,24 @@ $AUTOCONF
$AUTOMAKE --add-missing
./configure COND=true
-$MAKE 2>stderr || { cat stderr >&2; Exit 1; }
+$MAKE 2>stderr || { cat stderr >&2; exit 1; }
cat stderr >&2
-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 >&2; Exit 1; }
+$MAKE 2>stderr || { cat stderr >&2; exit 1; }
cat stderr >&2
-grep 'overriding commands' stderr && Exit 1
+grep 'overriding commands' stderr && exit 1
./prog1
./sub/prog2
$MAKE clean
diff --git a/t/cond4.sh b/t/cond4.sh
index 9bd0cc6..72d98c9 100755
--- a/t/cond4.sh
+++ b/t/cond4.sh
@@ -16,7 +16,7 @@
# Another sources-in-conditional test. Report from Tim Goodwin.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_SUBST([CC], [false])
@@ -48,8 +48,8 @@ $ACLOCAL
$AUTOMAKE -i
# We should not output useless definitions.
-grep 'address@hidden@' Makefile.in && Exit 1
-grep 'address@hidden@' Makefile.in && Exit 1
+grep 'address@hidden@' Makefile.in && exit 1
+grep 'address@hidden@' Makefile.in && exit 1
$AUTOCONF
diff --git a/t/cond40.sh b/t/cond40.sh
index 7dadfc1..8725a03 100755
--- a/t/cond40.sh
+++ b/t/cond40.sh
@@ -16,7 +16,7 @@
# Test AM_COND_IF.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >>configure.ac <<'END'
AC_DEFUN([FOO],
@@ -58,26 +58,26 @@ $AUTOMAKE -a
./configure cond=yes cond1=yes cond2=no cond3=yes
test -f file1
-test ! -f file2
+test ! -e 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 ! -e file2
test -f file3
$MAKE distclean
./configure cond=no cond1=yes cond2=yes
-test ! -f file1
+test ! -e file1
test -f file2
-test ! -f file3
+test ! -e file3
rm -f file2
-$MAKE file1 && Exit 1
+$MAKE file1 && exit 1
$MAKE file2
-$MAKE file3 && Exit 1
-test ! -f file1
+$MAKE file3 && exit 1
+test ! -e file1
test -f file2
-test ! -f file3
+test ! -e file3
:
diff --git a/t/cond41.sh b/t/cond41.sh
index 7c59a0a..9f4cc53 100755
--- a/t/cond41.sh
+++ b/t/cond41.sh
@@ -16,14 +16,14 @@
# AM_COND_IF with an undefined condition should fail.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >>configure.ac <<'END'
AM_COND_IF([BAD_COND], [AC_CONFIG_FILES([file1])])
AC_OUTPUT
END
-$ACLOCAL 2>stderr && { cat stderr >&2; Exit 1; }
+$ACLOCAL 2>stderr && { cat stderr >&2; exit 1; }
cat stderr >&2
grep '^configure\.ac:4:.*AM_COND_IF.* no such condition.*BAD_COND' stderr
diff --git a/t/cond42.sh b/t/cond42.sh
index c217726..d7f885e 100755
--- a/t/cond42.sh
+++ b/t/cond42.sh
@@ -18,7 +18,7 @@
# This shouldn't happen with user input, as _AM_COND_* are not documented,
# but better to be safe.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >>configure.ac <<'END'
AM_CONDITIONAL([COND], [:])
diff --git a/t/cond43.sh b/t/cond43.sh
index 028168e..a6c7545 100755
--- a/t/cond43.sh
+++ b/t/cond43.sh
@@ -16,7 +16,7 @@
# Ensure an error with underquoted usage of AM_COND_IF in configure.ac.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >>configure.ac <<'END'
AM_CONDITIONAL([COND1], [:])
diff --git a/t/cond44.sh b/t/cond44.sh
index 8cc2c2e..71c3bcd 100755
--- a/t/cond44.sh
+++ b/t/cond44.sh
@@ -17,7 +17,7 @@
# Check that redefinitions of AC_SUBST'ed AM_SUBST_NOTMAKE'd variables
# are not diagnosed. See cond23.test.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >>configure.ac <<EOF
AM_CONDITIONAL([COND], [true])
@@ -33,6 +33,6 @@ EOF
$ACLOCAL
AUTOMAKE_run
-grep 'libdir was already defined' stderr && Exit 1
-grep '^libdir = ' Makefile.in && Exit 1
-Exit 0
+grep 'libdir was already defined' stderr && exit 1
+grep '^libdir = ' Makefile.in && exit 1
+exit 0
diff --git a/t/cond45.sh b/t/cond45.sh
index 1296cd1..ceddc63 100755
--- a/t/cond45.sh
+++ b/t/cond45.sh
@@ -17,7 +17,7 @@
# Check that redefinitions of AC_SUBST'ed AM_SUBST_NOTMAKE'd variables
# are not diagnosed. See cond24.test.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >>configure.ac <<EOF
AC_SUBST([foo], [bar])
@@ -34,6 +34,6 @@ EOF
$ACLOCAL
AUTOMAKE_run
-grep 'foo was already defined' stderr && Exit 1
-grep '^foo =' Makefile.in && Exit 1
-Exit 0
+grep 'foo was already defined' stderr && exit 1
+grep '^foo =' Makefile.in && exit 1
+exit 0
diff --git a/t/cond46.sh b/t/cond46.sh
index c89caf9..59820c4 100755
--- a/t/cond46.sh
+++ b/t/cond46.sh
@@ -16,7 +16,7 @@
# Ensure the right condition is listed after 'else' and 'endif'.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AM_CONDITIONAL([USE_A], [test x = y])
diff --git a/t/cond5.sh b/t/cond5.sh
index 8accd67..fb5c920 100755
--- a/t/cond5.sh
+++ b/t/cond5.sh
@@ -16,7 +16,7 @@
# Yet another sources-in-conditional test. Report from Tim Goodwin.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
@@ -60,10 +60,10 @@ while test $try -le 30; do
cat stderr >&2
# Automake must fail with a proper error message.
grep 'variable.*OPT_SRC.*recursively defined' stderr
- Exit 0
+ exit 0
fi
done
# The automake process probably hung. Kill it, and exit with failure.
echo "$me: Automake process $pid hung"
kill $pid
-Exit 1
+exit 1
diff --git a/t/cond6.sh b/t/cond6.sh
index 42fa407..640f496 100755
--- a/t/cond6.sh
+++ b/t/cond6.sh
@@ -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.ac
diff --git a/t/cond7.sh b/t/cond7.sh
index 1651ac9..19cd12e 100755
--- a/t/cond7.sh
+++ b/t/cond7.sh
@@ -16,7 +16,7 @@
# Test for an odd conditional bug. Report from Pavel Roskin.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
compat=yes
@@ -35,5 +35,5 @@ END
$ACLOCAL
$AUTOMAKE
-grep '^[^#].*002' Makefile.in && Exit 1
-Exit 0
+grep '^[^#].*002' Makefile.in && exit 1
+exit 0
diff --git a/t/cond8.sh b/t/cond8.sh
index c498b75..1eab707 100755
--- a/t/cond8.sh
+++ b/t/cond8.sh
@@ -17,7 +17,7 @@
# Test to make sure _PROGRAMS conditionals can be written in a useful
# way.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
@@ -61,7 +61,7 @@ cp x.c y.c
instdir=$(pwd)/_inst || fatal_ "cannot get current directory"
# Skip the rest of the test in case of e.g. missing C compiler.
-./configure --prefix="$instdir" x=yes || Exit $?
+./configure --prefix="$instdir" x=yes || exit $?
$MAKE install
$MAKE get-built
$MAKE get-installed
diff --git a/t/cond9.sh b/t/cond9.sh
index b9addab..9422748 100755
--- a/t/cond9.sh
+++ b/t/cond9.sh
@@ -16,7 +16,7 @@
# Test for bug in conditionals. From Raja R Harinath.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AM_CONDITIONAL([WRONG], [test x = y])
diff --git a/t/condd.sh b/t/condd.sh
index be32b7d..81fd015 100755
--- a/t/condd.sh
+++ b/t/condd.sh
@@ -16,7 +16,7 @@
# Test for bug in conditionals.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
dnl Define a macro with the same name as the conditional to exhibit
@@ -65,7 +65,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/t/condhook.sh b/t/condhook.sh
index bcd0551..c8675e5 100755
--- a/t/condhook.sh
+++ b/t/condhook.sh
@@ -18,7 +18,7 @@
# Keep this in sync with sister test condhook2.test.
# Report by Nik A. Melchior (PR/428).
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AM_CONDITIONAL([TEST], [false])
@@ -43,6 +43,6 @@ $AUTOMAKE
$MAKE install
test -f inst/etc/mumble
-test ! -f bad
+test ! -e bad
:
diff --git a/t/condhook2.sh b/t/condhook2.sh
index f68332c..1ab8d88 100755
--- a/t/condhook2.sh
+++ b/t/condhook2.sh
@@ -17,7 +17,7 @@
# Test install when a conditional install-*-hook is defined.
# Keep this in sync with sister test condhook.test.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AM_CONDITIONAL([TEST], [true])
diff --git a/t/condinc.sh b/t/condinc.sh
index b7011e7..d826f96 100755
--- a/t/condinc.sh
+++ b/t/condinc.sh
@@ -16,7 +16,7 @@
# Make sure a conditional include statement is handled properly.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AM_CONDITIONAL([TOBE], [false])
@@ -36,7 +36,7 @@ END
$ACLOCAL
$AUTOMAKE
-grep '^target:' Makefile.in && Exit 1
+grep '^target:' Makefile.in && exit 1
grep 'address@hidden@target:' Makefile.in
:
diff --git a/t/condinc2.sh b/t/condinc2.sh
index e88b0d2..1763a6d 100755
--- a/t/condinc2.sh
+++ b/t/condinc2.sh
@@ -16,7 +16,7 @@
# Another test of conditional include statements.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AM_CONDITIONAL([TOBE], [false])
diff --git a/t/condlib.sh b/t/condlib.sh
index fae04bf..3c88226 100755
--- a/t/condlib.sh
+++ b/t/condlib.sh
@@ -17,7 +17,7 @@
# Test for bug with conditional library.
# From Harlan Stenn.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_RANLIB
@@ -40,5 +40,5 @@ END
$ACLOCAL
$AUTOMAKE
-$FGREP librsaref.a.c Makefile.in && Exit 1
-Exit 0
+$FGREP librsaref.a.c Makefile.in && exit 1
+exit 0
diff --git a/t/condman2.sh b/t/condman2.sh
index fbb3844..ad97abc 100755
--- a/t/condman2.sh
+++ b/t/condman2.sh
@@ -16,7 +16,7 @@
# 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
diff --git a/t/condman3.sh b/t/condman3.sh
index ae7698b..aa02543 100755
--- a/t/condman3.sh
+++ b/t/condman3.sh
@@ -16,7 +16,7 @@
# Make sure conditionals work with man pages.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AM_CONDITIONAL([COND], [test x"$FOO" = x"true"])
diff --git a/t/confdeps.sh b/t/confdeps.sh
index f508d45..95e60f9 100755
--- a/t/confdeps.sh
+++ b/t/confdeps.sh
@@ -16,7 +16,7 @@
# Make sure that config* files are properly regenerated.
-. ./defs || Exit 1
+. ./defs || exit 1
echo "FOO = foo" > Makefile.am
@@ -32,6 +32,6 @@ echo "$me: Not generated by aclocal ..."
sed -n '3,$p' aclocal.m4 >aclocal.m4t
mv -f aclocal.m4t aclocal.m4
$AUTOMAKE
-grep '^\$(ACLOCAL_M4):' Makefile.in && Exit 1
+grep '^\$(ACLOCAL_M4):' Makefile.in && exit 1
:
diff --git a/t/conff.sh b/t/conff.sh
index d969660..b6f9081 100755
--- a/t/conff.sh
+++ b/t/conff.sh
@@ -17,7 +17,7 @@
# Make sure rebuild rules work even when AC_CONFIG_FILES uses colons.
# Report from Alexander Turbov.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_CONFIG_FILES([bar/Makefile:bar/Makefile.in:Makefile.bot])
@@ -47,10 +47,10 @@ $AUTOMAKE
$MAKE
cd bar
-$MAKE top-rule >stdout || { cat stdout; Exit 1; }
+$MAKE top-rule >stdout || { cat stdout; exit 1; }
cat stdout
grep 'top rule' stdout
-$MAKE bot-rule >stdout || { cat stdout; Exit 1; }
+$MAKE bot-rule >stdout || { cat stdout; exit 1; }
cat stdout
grep 'bot rule' stdout
cd ..
@@ -64,10 +64,10 @@ END
$MAKE
cd bar
-$MAKE top-rule >stdout || { cat stdout; Exit 1; }
+$MAKE top-rule >stdout || { cat stdout; exit 1; }
cat stdout
grep 'top2 rule' stdout
-$MAKE bot-rule >stdout || { cat stdout; Exit 1; }
+$MAKE bot-rule >stdout || { cat stdout; exit 1; }
cat stdout
grep 'bot rule' stdout
cd ..
@@ -81,10 +81,10 @@ END
$MAKE
cd bar
-$MAKE top-rule >stdout || { cat stdout; Exit 1; }
+$MAKE top-rule >stdout || { cat stdout; exit 1; }
cat stdout
grep 'top2 rule' stdout
-$MAKE bot-rule >stdout || { cat stdout; Exit 1; }
+$MAKE bot-rule >stdout || { cat stdout; exit 1; }
cat stdout
grep 'bot2 rule' stdout
cd ..
diff --git a/t/conff2.sh b/t/conff2.sh
index 2c42f29..728d78e 100755
--- a/t/conff2.sh
+++ b/t/conff2.sh
@@ -16,7 +16,7 @@
# Make sure empty calls to AC_CONFIG_FILES or AC_CONFIG_HEADERS are diagnosed.
-. ./defs || Exit 1
+. ./defs || exit 1
# We avoid using configure.ac stub initialized by ./defs, since we need
# to keep track of line numbers (to grep for error messages).
diff --git a/t/conffile-leading-dot.sh b/t/conffile-leading-dot.sh
index 3c5ba97..2146183 100755
--- a/t/conffile-leading-dot.sh
+++ b/t/conffile-leading-dot.sh
@@ -18,7 +18,7 @@
# with a dot (like "./Makefile"), since the remake rules might be subtly
# broken in that case.
-. ./defs || Exit 1
+. ./defs || exit 1
cat > configure.ac << END
AC_INIT([$me], [1.0])
@@ -53,7 +53,7 @@ $sleep
touch Makefile.am
# Check that remake rules do truly break -- otherwise automake is
# giving a bogus warning.
-$MAKE 2>stderr && { cat stderr >&2; Exit 1; }
+$MAKE 2>stderr && { cat stderr >&2; exit 1; }
cat stderr >&2
grep "config\\.status:.*invalid argument.*Makefile" stderr
diff --git a/t/confh-subdir-clean.sh b/t/confh-subdir-clean.sh
index 26f3957..75024f6 100755
--- a/t/confh-subdir-clean.sh
+++ b/t/confh-subdir-clean.sh
@@ -16,7 +16,7 @@
# Test to make sure config headers in subdirectories are cleaned.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_CONFIG_HEADERS([sub/config.h:sub/config.hin])
@@ -35,6 +35,6 @@ 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/t/confh.sh b/t/confh.sh
index d09e39c..6da0429 100755
--- a/t/confh.sh
+++ b/t/confh.sh
@@ -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.ac << 'END'
AC_CONFIG_HEADERS([include/config.h])
diff --git a/t/confh4.sh b/t/confh4.sh
index ddcbeba..9331fcb 100755
--- a/t/confh4.sh
+++ b/t/confh4.sh
@@ -24,7 +24,7 @@
# Also check that our preprocessing code is smart enough not to pass
# repeated '-I<DIR>' options on the compiler command line.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_CONFIG_FILES([include/Makefile sub/Makefile])
diff --git a/t/confh5.sh b/t/confh5.sh
index c35c3e8..354c88c 100755
--- a/t/confh5.sh
+++ b/t/confh5.sh
@@ -16,7 +16,7 @@
# Make sure we do not distribute header sources when they are built.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_SUBST([FOO], [NameToBeGrepped])
@@ -31,7 +31,6 @@ cat > Makefile.am << 'END'
test: distdir
test -f $(distdir)/config.h.in
test -f $(distdir)/include/config.h.in.in
- : # Solaris Sh does not support 'test -e'.
test ! -f $(distdir)/include/config.h.in
test ! -r $(distdir)/include/config.h.in
END
diff --git a/t/confh6.sh b/t/confh6.sh
index c94c7ba..fa6aab4 100755
--- a/t/confh6.sh
+++ b/t/confh6.sh
@@ -18,7 +18,7 @@
# idea is that if config.h is in a subdir, and there is no Makefile in
# that subdir, then we want to build config.h as the top level.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_CONFIG_HEADERS([subdir/config.h])
diff --git a/t/confh7.sh b/t/confh7.sh
index 0bc2465..ec0edbe 100755
--- a/t/confh7.sh
+++ b/t/confh7.sh
@@ -17,7 +17,7 @@
# Test to make sure several config headers are allowed.
# See also sister "semantic" test 'confh8.test'.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_CONFIG_HEADERS([config.h two.h])
diff --git a/t/confh8.sh b/t/confh8.sh
index 77ada54..009ae30 100755
--- a/t/confh8.sh
+++ b/t/confh8.sh
@@ -17,7 +17,7 @@
# Test to make sure several config headers are allowed.
# See also sister "minimalistic" test 'confh7.test'.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_CONFIG_HEADERS([one.h two.h])
diff --git a/t/confincl.sh b/t/confincl.sh
index dfc7551..4527a14 100755
--- a/t/confincl.sh
+++ b/t/confincl.sh
@@ -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.ac << 'END'
AC_PROG_CC
@@ -31,6 +31,6 @@ END
$ACLOCAL
$AUTOMAKE
-$FGREP '@CONFIG_INCLUDE_SPEC@' Makefile.in && Exit 1
+$FGREP '@CONFIG_INCLUDE_SPEC@' Makefile.in && exit 1
:
diff --git a/t/conflnk.sh b/t/conflnk.sh
index 93851ca..8446ac8 100755
--- a/t/conflnk.sh
+++ b/t/conflnk.sh
@@ -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
echo 'SUBDIRS = sdir' > Makefile.am
: > src
@@ -60,11 +60,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/t/conflnk2.sh b/t/conflnk2.sh
index 4a1478b..fa0b009 100755
--- a/t/conflnk2.sh
+++ b/t/conflnk2.sh
@@ -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
cat > Makefile.am << 'END'
SUBDIRS = sdir
diff --git a/t/conflnk3.sh b/t/conflnk3.sh
index ffb0d98..a0b8842 100755
--- a/t/conflnk3.sh
+++ b/t/conflnk3.sh
@@ -17,7 +17,7 @@
# Test to make sure that AC_CONFIG_LINKS using a variable source
# is not broken.
-. ./defs || Exit 1
+. ./defs || exit 1
cat > Makefile.am << 'END'
SUBDIRS = sdir
@@ -59,8 +59,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 -r sdir/dest2
@@ -71,12 +71,12 @@ test -r dest5
$MAKE test
$MAKE distclean
-test ! -r sdir/dest2
-test ! -r sdir/dest3
+test ! -e sdir/dest2
+test ! -e sdir/dest3
test -r dest # Should still exist, Automake knows nothing about it.
test -r dest5 # Ditto.
rm -f dest dest5
-test ! -r dest4
+test ! -e dest4
mkdir build
cd build
diff --git a/t/conflnk4.sh b/t/conflnk4.sh
index a1f2f0e..090f809 100755
--- a/t/conflnk4.sh
+++ b/t/conflnk4.sh
@@ -17,7 +17,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
mkdir nonmk-subdir sdir sdir/mk-subdir
: > src
@@ -72,10 +72,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/t/confsub.sh b/t/confsub.sh
index db9f80e..de21d51 100755
--- a/t/confsub.sh
+++ b/t/confsub.sh
@@ -17,7 +17,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.ac << 'END'
AC_CONFIG_FILES([subdir/Makefile])
@@ -43,7 +43,7 @@ $AUTOMAKE
#
# 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
./configure
diff --git a/t/confvar.sh b/t/confvar.sh
index e77563e..39739d9 100755
--- a/t/confvar.sh
+++ b/t/confvar.sh
@@ -16,7 +16,7 @@
# Test to make sure configure_vars stuff works.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_SUBST([QBERT])
diff --git a/t/confvar2.sh b/t/confvar2.sh
index bc6ffca..fc78f6e 100755
--- a/t/confvar2.sh
+++ b/t/confvar2.sh
@@ -16,7 +16,7 @@
# Test for bug reported by Jim Meyering.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_SUBST([OTHER_SCRIPTS])
diff --git a/t/copy.sh b/t/copy.sh
index 9ae7292..64a829d 100755
--- a/t/copy.sh
+++ b/t/copy.sh
@@ -17,7 +17,7 @@
# Test to make sure '-c' works. Report from Andris Pavenis.
# See also the much more in-depth test 'add-missing'.
-. ./defs || Exit 1
+. ./defs || exit 1
# We'll have to cater to systems like MSYS/MinGW where there are no
# true symlinks ('ln -s' behaves like 'cp -p'); see automake bug#10441.
diff --git a/t/cscope.tap b/t/cscope.tap
index 25e9a41..31e8268 100755
--- a/t/cscope.tap
+++ b/t/cscope.tap
@@ -16,7 +16,7 @@
# Test cscope functionality.
-. ./defs || Exit 1
+. ./defs || exit 1
plan_ 18
@@ -85,10 +85,10 @@ test_cleanup ()
# VPATH build.
$MAKE distcleancheck
fi \
- && test ! -f cscope.files \
- && test ! -f cscope.out \
- && test ! -f cscope.in.out \
- && test ! -f cscope.po.out \
+ && test ! -e cscope.files \
+ && test ! -e cscope.out \
+ && test ! -e cscope.in.out \
+ && test ! -e cscope.po.out \
|| r='not ok'
result_ "$r" "[$pfx] make distcheck"
}
diff --git a/t/cscope2.sh b/t/cscope2.sh
index f72bb6a..631642f 100755
--- a/t/cscope2.sh
+++ b/t/cscope2.sh
@@ -17,7 +17,7 @@
# The 'cscope' target should not fail if there are no sources.
required=
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_OUTPUT
diff --git a/t/cscope3.sh b/t/cscope3.sh
index 47bcd4d..30e8c0c 100755
--- a/t/cscope3.sh
+++ b/t/cscope3.sh
@@ -19,7 +19,7 @@
# is empty.
required=cscope
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_CONFIG_FILES([sub/Makefile])
diff --git a/t/cxx-demo.sh b/t/cxx-demo.sh
index 869c2b3..77f7c83 100755
--- a/t/cxx-demo.sh
+++ b/t/cxx-demo.sh
@@ -18,7 +18,7 @@
required=c++
am_create_testdir=empty
-. ./defs || Exit 1
+. ./defs || exit 1
cat > configure.ac << 'END'
AC_INIT([GNU C++ Demo], [1.3], address@hidden)
@@ -69,7 +69,7 @@ $AUTOCONF
$AUTOMAKE --add-missing
test -f build-aux/depcomp
# Not needed by C++ compilers.
-test ! -f build-aux/compile
+test ! -e build-aux/compile
cat > work.h++ << 'END'
#define ACTION "work"
@@ -165,7 +165,7 @@ END
Good morning, work.
END
for p in play work; do
- ./$p > got.$p || { cat got.$p; Exit 1; }
+ ./$p > got.$p || { cat got.$p; exit 1; }
cat exp.$p
cat got.$p
diff exp.$p got.$p
diff --git a/t/cxx-fortran.sh b/t/cxx-fortran.sh
index b2138db..7b7e9cb 100755
--- a/t/cxx-fortran.sh
+++ b/t/cxx-fortran.sh
@@ -18,7 +18,7 @@
# For now, require the GNU compilers, to avoid possible spurious failure.
required='gfortran g++'
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CXX
@@ -55,7 +55,7 @@ $ACLOCAL
$AUTOCONF
$AUTOMAKE -a
# The C++ linker should be preferred.
-grep '\$(FCLINK)' Makefile.in && Exit 1
+grep '\$(FCLINK)' Makefile.in && exit 1
grep '.\$(CXXLINK)' Makefile.in
./configure
diff --git a/t/cxx-lt-demo.sh b/t/cxx-lt-demo.sh
index 5180f8d..8dbbe18 100755
--- a/t/cxx-lt-demo.sh
+++ b/t/cxx-lt-demo.sh
@@ -18,7 +18,7 @@
required='libtoolize c++'
am_create_testdir=empty
-. ./defs || Exit 1
+. ./defs || exit 1
cat > configure.ac << 'END'
AC_INIT([GNU C++/Libtool Demo], [0.73], address@hidden)
@@ -95,9 +95,9 @@ $AUTOMAKE --add-missing --copy
ls -l . ax # For debugging.
for f in ltmain.sh depcomp config.guess config.sub; do
- test -f ax/$f && test ! -h ax/$f || Exit 1
+ test -f ax/$f && test ! -h ax/$f || exit 1
done
-test ! -f ax/compile # Not required by C++ compilers.
+test ! -e ax/compile # Not required by C++ compilers.
cat > src/main.cc << 'END'
#include "libfoo.h++"
diff --git a/t/cxx2.sh b/t/cxx2.sh
index 243e607..7ffba4e 100755
--- a/t/cxx2.sh
+++ b/t/cxx2.sh
@@ -16,7 +16,7 @@
# Test that Automake suggests using AC_PROG_CXX if C++ sources are used.
-. ./defs || Exit 1
+. ./defs || exit 1
echo AC_PROG_CC >>configure.ac
diff --git a/t/cxxcpp.sh b/t/cxxcpp.sh
index 2eaefad..cd5d392 100755
--- a/t/cxxcpp.sh
+++ b/t/cxxcpp.sh
@@ -16,7 +16,7 @@
# Make sure automake sees AC_PROG_CXXCPP. From Garth Corral.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CXXCPP
diff --git a/t/cxxlibobj.sh b/t/cxxlibobj.sh
index 6f4ce2e..b6d0231 100755
--- a/t/cxxlibobj.sh
+++ b/t/cxxlibobj.sh
@@ -16,7 +16,7 @@
# Test to make sure LIBOBJS and C++ sources work right.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CXX
diff --git a/t/cxxlink.sh b/t/cxxlink.sh
index 5ce3beb..ff271c3 100755
--- a/t/cxxlink.sh
+++ b/t/cxxlink.sh
@@ -16,7 +16,7 @@
# Test to make sure C++ linker is used when appropriate.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
diff --git a/t/cygnus-no-more.sh b/t/cygnus-no-more.sh
index 4be0561..66ef57d 100755
--- a/t/cygnus-no-more.sh
+++ b/t/cygnus-no-more.sh
@@ -18,7 +18,7 @@
# That feature will be removed in the next major Automake release.
# See automake bug#11034.
-. ./defs || Exit 1
+. ./defs || exit 1
warn_rx='support for Cygnus.*trees.*removed'
diff --git a/t/cygwin32.sh b/t/cygwin32.sh
index 9415fb6..95b442e 100755
--- a/t/cygwin32.sh
+++ b/t/cygwin32.sh
@@ -16,7 +16,7 @@
# Test basic Cygwin32 functionality.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
@@ -32,7 +32,7 @@ END
$ACLOCAL
$AUTOMAKE
-grep '^CYGWIN' Makefile.in && Exit 1
+grep '^CYGWIN' Makefile.in && exit 1
grep 'EXEEXT' Makefile.in
:
diff --git a/t/dash.sh b/t/dash.sh
index 992bf62..6c9c9e0 100755
--- a/t/dash.sh
+++ b/t/dash.sh
@@ -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
diff --git a/t/defun.sh b/t/defun.sh
index 9b66a56..5a4530c 100755
--- a/t/defun.sh
+++ b/t/defun.sh
@@ -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_THREE])
diff --git a/t/defun2.sh b/t/defun2.sh
index 0b3f96b..2c74cc4 100755
--- a/t/defun2.sh
+++ b/t/defun2.sh
@@ -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.ac << 'END'
dnl if buggy this will require getloadavg.c
diff --git a/t/dejagnu-absolute-builddir.sh b/t/dejagnu-absolute-builddir.sh
index 8cdc3a1..22f7cc5 100755
--- a/t/dejagnu-absolute-builddir.sh
+++ b/t/dejagnu-absolute-builddir.sh
@@ -18,7 +18,7 @@
# to an absolute path.
required=runtest
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_OUTPUT
diff --git a/t/dejagnu-relative-srcdir.sh b/t/dejagnu-relative-srcdir.sh
index 05ae200..9fdf179 100755
--- a/t/dejagnu-relative-srcdir.sh
+++ b/t/dejagnu-relative-srcdir.sh
@@ -18,7 +18,7 @@
# (both as TCL variable and as environment variable).
required=runtest
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_OUTPUT
diff --git a/t/dejagnu-siteexp-append.sh b/t/dejagnu-siteexp-append.sh
index c3bfff6..c980c85 100755
--- a/t/dejagnu-siteexp-append.sh
+++ b/t/dejagnu-siteexp-append.sh
@@ -17,7 +17,7 @@
# Check that the files in $(EXTRA_DEJAGNU_SITE_CONFIG) get appended to
# site.exp in the same order in which they're listed in that variable.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_OUTPUT
diff --git a/t/dejagnu-siteexp-extend.sh b/t/dejagnu-siteexp-extend.sh
index f0f6194..45d8a22 100755
--- a/t/dejagnu-siteexp-extend.sh
+++ b/t/dejagnu-siteexp-extend.sh
@@ -18,7 +18,7 @@
# automake-generated Makefile.
required=runtest
-. ./defs || Exit 1
+. ./defs || exit 1
write_check_for ()
{
@@ -78,7 +78,7 @@ set baz "/foo/"
set qux "/foo/"
END
-$MAKE check && { cat site.exp; Exit 1; }
+$MAKE check && { cat site.exp; exit 1; }
grep 'PASS: test_foo' tool.sum
grep 'FAIL: test_bar' tool.sum
grep 'FAIL: test_baz' tool.sum
@@ -104,7 +104,7 @@ $sleep
$AUTOMAKE Makefile
./config.status Makefile
-$MAKE check || { cat site.exp; Exit 1; }
+$MAKE check || { cat site.exp; exit 1; }
cat site.exp
cat bar.dir/bar
$FGREP '/bar/' site.exp
@@ -147,13 +147,13 @@ grep 'zardoz.*/quux/' site.exp
$MAKE check
grep 'PASS: test_zardoz' tool.sum
grep 'zardoz: /zardoz/' tool.log
-grep 'zardoz.*quux' tool.log && Exit 1
+grep 'zardoz.*quux' tool.log && exit 1
# Check that files in $(EXTRA_DEJAGNU_SITE_CONFIG) are not distributed
# by default.
$MAKE distdir
ls -l $distdir
-test ! -r $distdir/bar.dir/bar
-test ! -r $distdir/quux.exp
+test ! -e $distdir/bar.dir/bar
+test ! -e $distdir/quux.exp
:
diff --git a/t/dejagnu-siteexp-useredit.sh b/t/dejagnu-siteexp-useredit.sh
index 63fc18b..42f4d44 100755
--- a/t/dejagnu-siteexp-useredit.sh
+++ b/t/dejagnu-siteexp-useredit.sh
@@ -17,7 +17,7 @@
# Check that the user can edit the Makefile-generated site.exp, and
# have its edits survive to the remaking of that file.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_OUTPUT
diff --git a/t/dejagnu.sh b/t/dejagnu.sh
index 583158f..a3bec52 100755
--- a/t/dejagnu.sh
+++ b/t/dejagnu.sh
@@ -17,7 +17,7 @@
# Superficial test to check that dejagnu tests and automake-style
# tests can coexist. See also related deeper test 'check12.test'.
-. ./defs || Exit 1
+. ./defs || exit 1
cat > Makefile.am << 'END'
AUTOMAKE_OPTIONS = dejagnu
diff --git a/t/dejagnu2.sh b/t/dejagnu2.sh
index 8feb5de..5b75bb6 100755
--- a/t/dejagnu2.sh
+++ b/t/dejagnu2.sh
@@ -16,7 +16,7 @@
# Make sure we don't override the user's site.exp rule.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac <<'END'
AC_OUTPUT
diff --git a/t/dejagnu3.sh b/t/dejagnu3.sh
index 7d15bc9..42345be 100755
--- a/t/dejagnu3.sh
+++ b/t/dejagnu3.sh
@@ -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
cat > hammer << 'END'
#! /bin/sh
@@ -63,7 +63,7 @@ $MAKE distcheck
# Ensure that the envvar RUNTESTFLAGS is used.
# Report from Mark Mitchell.
RUNTESTFLAGS=--unknown-runtest-option $MAKE check >output 2>&1 \
- && { cat output; Exit 1; }
+ && { cat output; exit 1; }
cat output
$FGREP 'unknown-runtest-option' output
diff --git a/t/dejagnu4.sh b/t/dejagnu4.sh
index 1c94798..655218b 100755
--- a/t/dejagnu4.sh
+++ b/t/dejagnu4.sh
@@ -24,7 +24,7 @@
# previous tools, but at first glance "make check" has passed.
required=runtest
-. ./defs || Exit 1
+. ./defs || exit 1
cat > hammer << 'END'
#! /bin/sh
@@ -93,7 +93,7 @@ mv -f thammer hammer
chmod +x hammer
rm -f hammer.log hammer.sum spanner.log spanner.sum
-$MAKE check && Exit 1
+$MAKE check && exit 1
test -f hammer.log
test -f hammer.sum
test -f spanner.log
diff --git a/t/dejagnu5.sh b/t/dejagnu5.sh
index 26eaa60..d64a7f2 100755
--- a/t/dejagnu5.sh
+++ b/t/dejagnu5.sh
@@ -18,7 +18,7 @@
# the package by default.
required=runtest
-. ./defs || Exit 1
+. ./defs || exit 1
package=$me
diff --git a/t/dejagnu6.sh b/t/dejagnu6.sh
index 38255f6..80ff027 100755
--- a/t/dejagnu6.sh
+++ b/t/dejagnu6.sh
@@ -17,7 +17,7 @@
# Check that "make check" fails, when a DejaGnu test fails.
required=runtest
-. ./defs || Exit 1
+. ./defs || exit 1
cat > faildeja << 'END'
#! /bin/sh
@@ -50,7 +50,7 @@ $AUTOMAKE --add-missing
./configure
-$MAKE check && Exit 1
+$MAKE check && exit 1
test -f faildeja.log
test -f faildeja.sum
$FGREP 'FAIL: failing_deja_test' faildeja.sum
diff --git a/t/dejagnu7.sh b/t/dejagnu7.sh
index a926955..d34931b 100755
--- a/t/dejagnu7.sh
+++ b/t/dejagnu7.sh
@@ -18,7 +18,7 @@
# (to detect TCL errors) on a file with TCL errors.
required=runtest
-. ./defs || Exit 1
+. ./defs || exit 1
runtest --help | grep '.*--status' \
|| skip_ "dejagnu lacks support for '--status'"
@@ -54,7 +54,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/t/deleted-am.sh b/t/deleted-am.sh
index e3612a3..d3d2616 100755
--- a/t/deleted-am.sh
+++ b/t/deleted-am.sh
@@ -19,7 +19,7 @@
# erroring out when a still-required file is missing.
# See also discussion about automake bug#9768.
-. ./defs || Exit 1
+. ./defs || exit 1
echo AC_OUTPUT >> configure.ac
@@ -35,12 +35,12 @@ $AUTOMAKE
$MAKE
rm -f zardoz.am
-$MAKE 2>stderr && { cat stderr >&2; Exit 1; }
+$MAKE 2>stderr && { cat stderr >&2; exit 1; }
cat stderr >&2
# This error will come from automake, not make, so we can be stricter
# in our grepping of it.
grep 'cannot open.*zardoz\.am' stderr
-grep 'foobar\.am' stderr && Exit 1 # No spurious error, please.
+grep 'foobar\.am' stderr && exit 1 # No spurious error, please.
# Try with one less indirection.
: > foobar.am
@@ -48,7 +48,7 @@ $AUTOMAKE Makefile
./config.status Makefile
$MAKE # Sanity check.
rm -f foobar.am
-$MAKE 2>stderr && { cat stderr >&2; Exit 1; }
+$MAKE 2>stderr && { cat stderr >&2; exit 1; }
cat stderr >&2
# This error will come from automake, not make, so we can be stricter
# in our grepping of it.
diff --git a/t/deleted-m4.sh b/t/deleted-m4.sh
index 328657e..a5fb0e8 100755
--- a/t/deleted-m4.sh
+++ b/t/deleted-m4.sh
@@ -19,7 +19,7 @@
# erroring out when a still-required file is missing.
# See also discussion about automake bug#9768.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac <<'END'
m4_include([foobar.m4])
@@ -39,13 +39,13 @@ $AUTOMAKE
$MAKE
rm -f zardoz.m4
-$MAKE 2>stderr && { cat stderr >&2; Exit 1; }
+$MAKE 2>stderr && { cat stderr >&2; exit 1; }
cat stderr >&2
# This error will come from aclocal, not make, so we can be stricter
# in our grepping of it.
grep ' foobar\.m4:1:.*zardoz\.m4.*does not exist' stderr
# No spurious errors, please.
-$FGREP -v ' foobar.m4:1:' stderr | $FGREP 'foobar.m4' && Exit 1
+$FGREP -v ' foobar.m4:1:' stderr | $FGREP 'foobar.m4' && exit 1
# Try with one less indirection.
: > foobar.m4
@@ -54,12 +54,12 @@ $AUTOCONF
./configure
$MAKE # Sanity check.
rm -f foobar.m4
-$MAKE 2>stderr && { cat stderr >&2; Exit 1; }
+$MAKE 2>stderr && { cat stderr >&2; exit 1; }
cat stderr >&2
# This error will come from aclocal, not make, so we can be stricter
# in our grepping of it.
grep 'foobar\.m4.*does not exist' stderr
# No spurious errors, please (ok, this is really paranoid).
-$FGREP 'zardoz.m4' stderr && Exit 1
+$FGREP 'zardoz.m4' stderr && exit 1
:
diff --git a/t/depacl2.sh b/t/depacl2.sh
index 378a1a2..897a5a2 100755
--- a/t/depacl2.sh
+++ b/t/depacl2.sh
@@ -17,7 +17,7 @@
# Test to make sure dependencies work when required macro is part of
# autoconf.
-. ./defs || Exit 1
+. ./defs || exit 1
echo 'AM_FOO' >> configure.ac
echo 'AC_DEFUN([AM_FOO], [AC_REQUIRE([AC_HEADER_STDC])])' > AM_FOO.m4
diff --git a/t/depcomp-implicit-auxdir.sh b/t/depcomp-implicit-auxdir.sh
index 7c20a6a..fed6d95 100755
--- a/t/depcomp-implicit-auxdir.sh
+++ b/t/depcomp-implicit-auxdir.sh
@@ -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
diff --git a/t/depcomp-recover.sh b/t/depcomp-recover.sh
index a93319c..77775f6 100755
--- a/t/depcomp-recover.sh
+++ b/t/depcomp-recover.sh
@@ -20,7 +20,7 @@
# removed.
required=cc
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac <<'END'
AC_PROG_CC
@@ -76,7 +76,7 @@ for vpath in : false; do
$srcdir/configure --enable-dependency-tracking
$MAKE
- depdir=`$MAKE -s --no-print-directory get-depdir` \
+ depdir=$($MAKE -s --no-print-directory get-depdir) \
&& test -n "$depdir" \
&& test -d $depdir \
&& test -d sub/src/$depdir \
diff --git a/t/depcomp-shuffle-sub-vpath.sh b/t/depcomp-shuffle-sub-vpath.sh
index 223008f..18fde7e 100755
--- a/t/depcomp-shuffle-sub-vpath.sh
+++ b/t/depcomp-shuffle-sub-vpath.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+# Copyright (C) 2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/t/depcomp-shuffle-sub.sh b/t/depcomp-shuffle-sub.sh
index 57abf0c..21f703b 100755
--- a/t/depcomp-shuffle-sub.sh
+++ b/t/depcomp-shuffle-sub.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+# Copyright (C) 2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -18,6 +18,6 @@
# - in-tree build
# - use of subdir objects
-. ./defs-static || exit '99'
+. ./defs-static || exit 99
xdir='sub' vpath='no'
. "$am_testauxdir"/depcomp-shuffle.sh
diff --git a/t/depcomp-shuffle-vpath.sh b/t/depcomp-shuffle-vpath.sh
index ea8cbda..4baf20f 100755
--- a/t/depcomp-shuffle-vpath.sh
+++ b/t/depcomp-shuffle-vpath.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2010-2012 Free Software Foundation, Inc.
+# Copyright (C) 2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -18,6 +18,6 @@
# - VPATH build
# - no use of subdir objects
-. ./defs-static || exit '99'
+. ./defs-static || exit 99
xdir='' vpath='yes'
. "$am_testauxdir"/depcomp-shuffle.sh
diff --git a/t/depcomp-shuffle.sh b/t/depcomp-shuffle.sh
index 3a284db..23ce20c 100755
--- a/t/depcomp-shuffle.sh
+++ b/t/depcomp-shuffle.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+# Copyright (C) 2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -18,6 +18,6 @@
# - in-tree build
# - no use of subdir objects
-. ./defs-static || exit '99'
+. ./defs-static || exit 99
xdir='' vpath='no'
. "$am_testauxdir"/depcomp-shuffle.sh
diff --git a/t/depcomp.sh b/t/depcomp.sh
index f2e0370..63c702f 100755
--- a/t/depcomp.sh
+++ b/t/depcomp.sh
@@ -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.ac << END
AC_INIT([$me], [1.0])
diff --git a/t/depcomp2.sh b/t/depcomp2.sh
index 624dee6..c29d9cd 100755
--- a/t/depcomp2.sh
+++ b/t/depcomp2.sh
@@ -18,7 +18,7 @@
# From Pavel Roskin.
required=cc
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_CONFIG_FILES([subdir/Makefile])
@@ -43,7 +43,7 @@ END
$ACLOCAL
$AUTOMAKE --add-missing
$AUTOCONF
-./configure 2>stderr || { cat stderr >&2; Exit 1; }
+./configure 2>stderr || { cat stderr >&2; exit 1; }
cat stderr >&2
test ! -s stderr
diff --git a/t/depcomp8a.sh b/t/depcomp8a.sh
index 7467f1c..eac0d1d 100755
--- a/t/depcomp8a.sh
+++ b/t/depcomp8a.sh
@@ -20,7 +20,7 @@
# same thing for libtool objects.
required=cc
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
@@ -50,7 +50,7 @@ $AUTOMAKE -a
grep include Makefile.in # For debugging.
grep 'include.*\./\$(DEPDIR)/foo\.P' Makefile.in
grep 'include.*[^a-zA-Z0-9_/]sub/\$(DEPDIR)/bar\.P' Makefile.in
-$EGREP 'include.*/(\.|sub)/\$\(DEPDIR\)' Makefile.in && Exit 1
+$EGREP 'include.*/(\.|sub)/\$\(DEPDIR\)' Makefile.in && exit 1
$AUTOCONF
# Don't reject slower dependency extractors, for better coverage.
diff --git a/t/depcomp8b.sh b/t/depcomp8b.sh
index 1ecbbfd..1e87df9 100755
--- a/t/depcomp8b.sh
+++ b/t/depcomp8b.sh
@@ -20,7 +20,7 @@
# same thing for non-libtool objects.
required='cc libtoolize'
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
@@ -45,7 +45,7 @@ $AUTOMAKE -a
grep include Makefile.in # For debugging.
grep 'include.*\./\$(DEPDIR)/foo\.P' Makefile.in
grep 'include.*[^a-zA-Z0-9_/]sub/\$(DEPDIR)/bar\.P' Makefile.in
-$EGREP 'include.*/(\.|sub)/\$\(DEPDIR\)' Makefile.in && Exit 1
+$EGREP 'include.*/(\.|sub)/\$\(DEPDIR\)' Makefile.in && exit 1
$AUTOCONF
# Don't reject slower dependency extractors, for better coverage.
diff --git a/t/depdist.sh b/t/depdist.sh
index 39ad48e..103308e 100755
--- a/t/depdist.sh
+++ b/t/depdist.sh
@@ -18,7 +18,7 @@
# From Eric Magnien.
required=cc
-. ./defs || Exit 1
+. ./defs || exit 1
rm -f configure.ac
diff --git a/t/depend.sh b/t/depend.sh
index 23359ca..83add10 100755
--- a/t/depend.sh
+++ b/t/depend.sh
@@ -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
echo AC_PROG_CC >> configure.ac
diff --git a/t/depend3.sh b/t/depend3.sh
index 8f8431a..65f83ce 100755
--- a/t/depend3.sh
+++ b/t/depend3.sh
@@ -16,7 +16,7 @@
# Test _DEPENDENCIES variable. From Lee Iverson.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
diff --git a/t/depend4.sh b/t/depend4.sh
index 560648d..c9f4a79 100755
--- a/t/depend4.sh
+++ b/t/depend4.sh
@@ -16,7 +16,7 @@
# Check that dependencies are included when there are many header files.
-. ./defs || Exit 1
+. ./defs || exit 1
echo AC_PROG_CC >> configure.ac
diff --git a/t/deprecated-acinit.sh b/t/deprecated-acinit.sh
index d130f9c..516b139 100755
--- a/t/deprecated-acinit.sh
+++ b/t/deprecated-acinit.sh
@@ -17,7 +17,7 @@
# Check that automake and autoconf complain about an old-style AC_INIT
# call used with a new-style AM_AUTOMAKE_INIT call.
-. ./defs || Exit 1
+. ./defs || exit 1
: > Makefile.am
@@ -37,11 +37,11 @@ for ac_init in AC_INIT 'AC_INIT([Makefile.am])'; do
AC_CONFIG_FILES([Makefile])
END
cat configure.ac # For debugging.
- $ACLOCAL 2>stderr && { cat stderr >&2; Exit 1; }
+ $ACLOCAL 2>stderr && { cat stderr >&2; exit 1; }
cat stderr >&2
grep "^configure\\.ac:.* $errmsg" stderr
cp aclocal-m4.sav aclocal.m4
- $AUTOCONF 2>stderr && { cat stderr >&2; Exit 1; }
+ $AUTOCONF 2>stderr && { cat stderr >&2; exit 1; }
cat stderr >&2
grep "^configure\\.ac:.* $errmsg" stderr
AUTOMAKE_fails
diff --git a/t/destdir.sh b/t/destdir.sh
index 22bf184..f10480b 100755
--- a/t/destdir.sh
+++ b/t/destdir.sh
@@ -21,7 +21,7 @@
# It will only work for non-root users.
required='ro-dir'
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac <<'EOF'
AC_OUTPUT
@@ -45,6 +45,6 @@ $ACLOCAL
$AUTOCONF
$AUTOMAKE -a
./configure
-$MAKE distcheck && Exit 1
+$MAKE distcheck && exit 1
:
diff --git a/t/dirlist-abspath.sh b/t/dirlist-abspath.sh
index f33f445..3c25fba 100755
--- a/t/dirlist-abspath.sh
+++ b/t/dirlist-abspath.sh
@@ -17,7 +17,7 @@
# Check use of absolute paths in dirlist.
am_create_testdir=empty
-. ./defs || Exit 1
+. ./defs || exit 1
mkdir acdir-more sub sub/acdir
echo "$(pwd)/acdir-more" > sub/acdir/dirlist
@@ -35,7 +35,7 @@ $ACLOCAL --system-acdir acdir
$AUTOCONF
# Only -I directories are subject to file inclusion.
-grep m4_include aclocal.m4 && Exit 1
+grep m4_include aclocal.m4 && exit 1
grep 'foo-foo--foo' configure
diff --git a/t/dirlist.sh b/t/dirlist.sh
index 98cd710..319726c 100755
--- a/t/dirlist.sh
+++ b/t/dirlist.sh
@@ -16,7 +16,7 @@
# Check dirlist support.
-. ./defs || Exit 1
+. ./defs || exit 1
cat > configure.ac <<EOF
AC_INIT([$me], [1.0])
@@ -45,13 +45,13 @@ $AUTOCONF
# There should be no m4_include in aclocal.m4, even though 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/t/dirlist2.sh b/t/dirlist2.sh
index 3eacd2f..26320f6 100755
--- a/t/dirlist2.sh
+++ b/t/dirlist2.sh
@@ -16,7 +16,7 @@
# Check dirlist globbing support.
-. ./defs || Exit 1
+. ./defs || exit 1
cat > configure.ac <<EOF
AC_INIT([$me], [1.0])
@@ -47,7 +47,7 @@ $AUTOCONF
# There should be no m4_include in aclocal.m4, even though 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/t/discover.sh b/t/discover.sh
index 7a01dc7..4ecf2ef 100755
--- a/t/discover.sh
+++ b/t/discover.sh
@@ -16,7 +16,7 @@
# Test to make sure LIBOBJS file cannot be mentioned explicitly.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_RANLIB
diff --git a/t/dist-auxdir-many-subdirs.sh b/t/dist-auxdir-many-subdirs.sh
index caa4e86..d509836 100755
--- a/t/dist-auxdir-many-subdirs.sh
+++ b/t/dist-auxdir-many-subdirs.sh
@@ -19,7 +19,7 @@
am_create_testdir=empty
required=cc
-. ./defs || Exit 1
+. ./defs || exit 1
count=0
ocwd=$(pwd) || fatal_ "cannot get current working directory"
diff --git a/t/dist-auxfile-2.sh b/t/dist-auxfile-2.sh
index f977893..06e5f8a 100755
--- a/t/dist-auxfile-2.sh
+++ b/t/dist-auxfile-2.sh
@@ -20,7 +20,7 @@
# Related to automake bug#9651.
am_create_testdir=empty
-. ./defs || Exit 1
+. ./defs || exit 1
cat > configure.ac <<END
AC_INIT([$me], [1.0])
diff --git a/t/dist-auxfile.sh b/t/dist-auxfile.sh
index 546148b..baa8d27 100755
--- a/t/dist-auxfile.sh
+++ b/t/dist-auxfile.sh
@@ -20,7 +20,7 @@
# directory was set to '.' by AC_CONFIG_AUX_DIR.
am_create_testdir=empty
-. ./defs || Exit 1
+. ./defs || exit 1
i=0
for auxdir in build-aux ''; do
@@ -59,9 +59,9 @@ END
END
mkdir subdir
- echo > subdir/Makefile.am # 'echo', not ':', for Solaris /bin/sh.
+ : > subdir/Makefile.am
- test -z "$auxdir" || mkdir "$auxdir" || Exit 99
+ test -z "$auxdir" || mkdir "$auxdir" || exit 99
if test -z "$auxdir"; then
auxdir=.
@@ -84,7 +84,7 @@ END
$AUTOMAKE
./configure
$MAKE test
- $EGREP '(foo\.txt|bar\.sh|zardoz)' subdir/Makefile.in && Exit 1
+ $EGREP '(foo\.txt|bar\.sh|zardoz)' subdir/Makefile.in && exit 1
$MAKE distcheck
diff --git a/t/dist-formats.tap b/t/dist-formats.tap
index 3b51c7f..4d86add 100755
--- a/t/dist-formats.tap
+++ b/t/dist-formats.tap
@@ -18,7 +18,7 @@
# archives.
am_create_testdir=empty
-. ./defs || Exit 1
+. ./defs || exit 1
plan_ 70
diff --git a/t/dist-included-parent-dir.sh b/t/dist-included-parent-dir.sh
index a74c6db..aed1051 100755
--- a/t/dist-included-parent-dir.sh
+++ b/t/dist-included-parent-dir.sh
@@ -16,7 +16,7 @@
# Make sure included files in parent directory are distributed.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_CONFIG_FILES([sub/Makefile])
diff --git a/t/dist-missing-am.sh b/t/dist-missing-am.sh
index 5bef889..df5801a 100755
--- a/t/dist-missing-am.sh
+++ b/t/dist-missing-am.sh
@@ -19,7 +19,7 @@
# required '.am' file from a distribution tarball.
# See discussion about automake bug#9768.
-. ./defs || Exit 1
+. ./defs || exit 1
echo AC_OUTPUT >> configure.ac
@@ -54,12 +54,12 @@ for vpath in false :; do
cd $distdir
./configure
fi
- $MAKE 2>stderr && { cat stderr >&2; Exit 1; }
+ $MAKE 2>stderr && { cat stderr >&2; exit 1; }
cat stderr >&2
# This error comes from automake, not make, so we can be stricter
# in our grepping of it.
grep 'cannot open.*zardoz\.am' stderr
- grep 'foobar\.am' stderr && Exit 1 # No spurious error, please.
+ grep 'foobar\.am' stderr && exit 1 # No spurious error, please.
cd "$ocwd" || fatal_ "cannot chdir back to top-level test directory"
done
diff --git a/t/dist-missing-included-m4.sh b/t/dist-missing-included-m4.sh
index ab491bc..08b91fa 100755
--- a/t/dist-missing-included-m4.sh
+++ b/t/dist-missing-included-m4.sh
@@ -20,7 +20,7 @@
# See discussion about automake bug#9768.
# See also sister test 'dist-missing-m4.test'.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac <<'END'
m4_include([foobar.m4])
@@ -56,12 +56,12 @@ for vpath in false :; do
cd $distdir
./configure
fi
- $MAKE 2>stderr && { cat stderr >&2; Exit 1; }
+ $MAKE 2>stderr && { cat stderr >&2; exit 1; }
cat stderr
# This error will come from automake, not make, so we can be stricter
# in our grepping of it.
grep 'zardoz\.m4.*does not exist' stderr
- grep 'foobar\.m4' stderr && Exit 1 # No spurious error, please.
+ grep 'foobar\.m4' stderr && exit 1 # No spurious error, please.
cd "$ocwd" || fatal_ "cannot chdir back to top-level test directory"
done
diff --git a/t/dist-missing-m4.sh b/t/dist-missing-m4.sh
index b0e1de2..79473b0 100755
--- a/t/dist-missing-m4.sh
+++ b/t/dist-missing-m4.sh
@@ -20,7 +20,7 @@
# See discussion about automake bug#9768.
# See also sister test 'dist-missing-included-m4.test'.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac <<'END'
m4_pattern_forbid([^MY_])
@@ -58,12 +58,12 @@ for vpath in false :; do
cd $distdir
./configure
fi
- $MAKE 2>stderr && { cat stderr; Exit 1; }
+ $MAKE 2>stderr && { cat stderr; exit 1; }
cat stderr
# This error will come from autoconf, not make, so we can be stricter
# in our grepping of it.
grep 'possibly undefined .*MY_ZARDOZ' stderr
- grep 'MY_FOOBAR' stderr && Exit 1 # No spurious error, please.
+ grep 'MY_FOOBAR' stderr && exit 1 # No spurious error, please.
cd "$ocwd" || fatal_ "cannot chdir back to top-level test directory"
done
diff --git a/t/dist-pr109765.sh b/t/dist-pr109765.sh
index 2e22e84..50085a6 100755
--- a/t/dist-pr109765.sh
+++ b/t/dist-pr109765.sh
@@ -19,7 +19,7 @@
# so that the latter ones fail.
required=bzip2
-. ./defs || Exit 1
+. ./defs || exit 1
echo AC_OUTPUT >> configure.ac
: > Makefile.am
@@ -31,9 +31,9 @@ $AUTOMAKE || fatal_ "automake failed"
./configure
$MAKE dist-gzip dist-bzip2
-gzip -dc $distdir.tar.gz | tar tf - > one || { cat one; Exit 1; }
+gzip -dc $distdir.tar.gz | tar tf - > one || { cat one; exit 1; }
cat one
-bzip2 -dc $distdir.tar.gz | tar tf - > two || { cat two; Exit 1; }
+bzip2 -dc $distdir.tar.gz | tar tf - > two || { cat two; exit 1; }
cat two
$FGREP "$distdir/Makefile.am" one
diff --git a/t/dist-readonly.sh b/t/dist-readonly.sh
index 2bf2a6d..b7b0e0e 100755
--- a/t/dist-readonly.sh
+++ b/t/dist-readonly.sh
@@ -20,7 +20,7 @@
# This test expect the user to be unable to write on files lacking
# write permissions -- so it won't work if the user is 'root'.
required='non-root cc'
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
@@ -53,10 +53,10 @@ $AUTOMAKE
./configure
$MAKE distdir
ls -l $distdir # For debugging.
-test -f foo.c && test ! -w foo.c || Exit 1
-(echo x > foo.c) && Exit 1
-test -f bar.txt && test ! -w bar.txt || Exit 1
-(echo x > bar.txt) && Exit 1
+test -f foo.c && test ! -w foo.c || exit 1
+(echo x > foo.c) && exit 1
+test -f bar.txt && test ! -w bar.txt || exit 1
+(echo x > bar.txt) && exit 1
$MAKE distcheck
:
diff --git a/t/dist-repeated.sh b/t/dist-repeated.sh
index b73d196..db5cf4f 100755
--- a/t/dist-repeated.sh
+++ b/t/dist-repeated.sh
@@ -18,7 +18,7 @@
# The distdir target should take care of not copying it more than one
# time anyway.
-. ./defs || Exit 1
+. ./defs || exit 1
echo AC_OUTPUT >> configure.ac
diff --git a/t/dist-srcdir.sh b/t/dist-srcdir.sh
index 88d8d4a..64cdcd8 100755
--- a/t/dist-srcdir.sh
+++ b/t/dist-srcdir.sh
@@ -17,9 +17,9 @@
# We use EXTRA_DIST to distribute stuff *explicitly* from the srcdir.
am_create_testdir=empty
-. ./defs || Exit 1
+. ./defs || exit 1
-ocwd=`pwd` || fatal_ "cannot get current working directory"
+ocwd=$(pwd) || fatal_ "cannot get current working directory"
mkdir src
cd src
diff --git a/t/dist-srcdir2.sh b/t/dist-srcdir2.sh
index e64d412..52146cd 100755
--- a/t/dist-srcdir2.sh
+++ b/t/dist-srcdir2.sh
@@ -21,7 +21,7 @@
# limitation should be explained in depth in comments in file
# 'lib/am/distdir.am').
-. ./defs || Exit 1
+. ./defs || exit 1
echo AC_OUTPUT >> configure.ac
@@ -38,12 +38,12 @@ cd build
../configure
echo bad > filename-that-is-easy-to-grep
-$MAKE distdir 2>stderr && { cat stderr >&2; Exit 1; }
+$MAKE distdir 2>stderr && { cat stderr >&2; exit 1; }
cat stderr >&2
grep 'filename-that-is-easy-to-grep' stderr
echo good > ../filename-that-is-easy-to-grep
$MAKE distdir
-test "`cat $distdir/filename-that-is-easy-to-grep`" = good
+test "$(cat $distdir/filename-that-is-easy-to-grep)" = good
:
diff --git a/t/distcheck-configure-flags-am.sh
b/t/distcheck-configure-flags-am.sh
index be214ff..828199e 100755
--- a/t/distcheck-configure-flags-am.sh
+++ b/t/distcheck-configure-flags-am.sh
@@ -17,7 +17,7 @@
# Check support for AM_DISTCHECK_CONFIGURE_FLAGS at "make distcheck"
# time, and its interactions with DISTCHECK_CONFIGURE_FLAGS.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_ARG_ENABLE([success], [], [success=$enableval], [success=no])
@@ -40,7 +40,7 @@ $AUTOMAKE
$FGREP '$(DISTCHECK_CONFIGURE_FLAGS)' Makefile.in
$FGREP '$(AM_DISTCHECK_CONFIGURE_FLAGS)' Makefile.in
grep 'DISTCHECK_CONFIGURE_FLAGS.*AM_DISTCHECK_CONFIGURE_FLAGS' Makefile.in \
- && Exit 1
+ && exit 1
$AUTOCONF
./configure --enable-success sentence='it works :-)'
@@ -59,7 +59,7 @@ END
$AUTOMAKE Makefile
./config.status Makefile
-$MAKE distcheck 2>stderr && { cat stderr >&2; Exit 1; }
+$MAKE distcheck 2>stderr && { cat stderr >&2; exit 1; }
cat stderr >&2
grep "^configure:.* success='no', sentence='it works :-)'" stderr
diff --git a/t/distcheck-configure-flags-subpkg.sh
b/t/distcheck-configure-flags-subpkg.sh
index 17dfc9c..567dd58 100755
--- a/t/distcheck-configure-flags-subpkg.sh
+++ b/t/distcheck-configure-flags-subpkg.sh
@@ -20,7 +20,7 @@
# passed down to the configure script of the subpackage. This is
# explicitly documented in the manual.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_CONFIG_SUBDIRS([subpkg])
@@ -63,7 +63,7 @@ $FGREP 'DISTCHECK_CONFIGURE_FLAGS' Makefile.in
subpkg/Makefile.in
grep '^AM_DISTCHECK_CONFIGURE_FLAGS =' Makefile.in
grep '^DISTCHECK_CONFIGURE_FLAGS =' Makefile.in
-$EGREP '^(AM_)?DISTCHECK_CONFIGURE_FLAGS' subpkg/Makefile.in && Exit 1
+$EGREP '^(AM_)?DISTCHECK_CONFIGURE_FLAGS' subpkg/Makefile.in && exit 1
./configure dc=ok am_dc=ok
@@ -74,7 +74,7 @@ $MAKE distcheck
# ... but not when "make distcheck" is run from the subpackage.
cd subpkg
-$MAKE distcheck 2>stderr && { cat stderr >&2; Exit 1; }
+$MAKE distcheck 2>stderr && { cat stderr >&2; exit 1; }
cat stderr >&2
grep '^configure:.* dc=KO am_dc=KO' stderr
diff --git a/t/distcheck-configure-flags.sh b/t/distcheck-configure-flags.sh
index bb6f840..fdec9a5 100755
--- a/t/distcheck-configure-flags.sh
+++ b/t/distcheck-configure-flags.sh
@@ -16,7 +16,7 @@
# Check support for DISTCHECK_CONFIGURE_FLAGS at "make distcheck" time.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_ARG_ENABLE([success], [], [success=$enableval], [success=no])
@@ -48,7 +48,7 @@ $MAKE distcheck \
DISTCHECK_CONFIGURE_FLAGS="--enable-success=yes sentence='it works :-)'"
# Sanity check.
-$MAKE distcheck 2>stderr && { cat stderr >&2; Exit 1; }
+$MAKE distcheck 2>stderr && { cat stderr >&2; exit 1; }
cat stderr >&2
grep "^configure:.* success='no', sentence=''" stderr
diff --git a/t/distcheck-hook.sh b/t/distcheck-hook.sh
index eee3f07..ef64805 100755
--- a/t/distcheck-hook.sh
+++ b/t/distcheck-hook.sh
@@ -16,7 +16,7 @@
# Check basic support for distcheck-hook.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_OUTPUT
@@ -43,9 +43,9 @@ $AUTOCONF
./configure
$MAKE
-$MAKE check && Exit 1
+$MAKE check && exit 1
$MAKE distdir
-test -f $distdir/dc-hook-has-run && Exit 1
+test -f $distdir/dc-hook-has-run && exit 1
$MAKE distcheck
:
diff --git a/t/distcheck-hook2.sh b/t/distcheck-hook2.sh
index 3eccc4f..7c7352b 100755
--- a/t/distcheck-hook2.sh
+++ b/t/distcheck-hook2.sh
@@ -18,7 +18,7 @@
# Automake, and that a used-defined 'distcheck-hook' is *not* honored
# in a subpackage Makefile.am.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_CONFIG_SUBDIRS([subpkg])
@@ -63,14 +63,14 @@ cd ..
# For debugging.
$FGREP 'distcheck-hook' Makefile.in subpkg/Makefile.in
-$FGREP 'distcheck-hook' subpkg/Makefile.in && Exit 1
+$FGREP 'distcheck-hook' subpkg/Makefile.in && exit 1
$FGREP '$(MAKE) distcheck-hook' Makefile.in
grep '^distcheck-hook:' Makefile.in
./configure
$MAKE
-$MAKE check && Exit 1
+$MAKE check && exit 1
cd subpkg
$MAKE check
cd ..
diff --git a/t/distcheck-missing-m4.sh b/t/distcheck-missing-m4.sh
index 6366455..b266918 100755
--- a/t/distcheck-missing-m4.sh
+++ b/t/distcheck-missing-m4.sh
@@ -18,7 +18,7 @@
# missing from the dist tarball (interaction with '--install').
# See automake bug#9037.
-. ./defs || Exit 1
+. ./defs || exit 1
cwd=$(pwd) || fatal_ "cannot get current working directory"
@@ -60,19 +60,19 @@ ACLOCAL_PATH=$cwd/pth; export ACLOCAL_PATH
# We don't use '--install' here. Our distcheck-hook should catch this.
$ACLOCAL -I m4
$AUTOCONF
-$EGREP 'MY_(FOO|BAR|BAZ|ZAR)' configure && Exit 1 # Sanity check.
+$EGREP 'MY_(FOO|BAR|BAZ|ZAR)' configure && exit 1 # Sanity check.
$AUTOMAKE
check_no_spurious_error ()
{
- $EGREP -i 'mkdir:|:.*(permission|denied)' output && Exit 1
- grep -i 'autom4te.*\.cache' output && Exit 1
- : # To placate 'set -e'.
+ $EGREP -i 'mkdir:|:.*(permission|denied)' output && exit 1
+ grep -i 'autom4te.*\.cache' output && exit 1
+ : To placate 'set -e'.
}
./configure
-$MAKE distcheck >output 2>&1 && { cat output; Exit 1; }
+$MAKE distcheck >output 2>&1 && { cat output; exit 1; }
cat output
for x in bar baz zar; do
$EGREP "required m4 file.*not distributed.* $x.m4( |$)" output
@@ -95,15 +95,15 @@ MY_BLA
END
$MAKE
-$EGREP 'MY_(FOO|BAR|BAZ|QUX|ZAR|BLA)' configure && Exit 1 # Sanity check.
+$EGREP 'MY_(FOO|BAR|BAZ|QUX|ZAR|BLA)' configure && exit 1 # Sanity check.
-$MAKE distcheck >output 2>&1 && { cat output; Exit 1; }
+$MAKE distcheck >output 2>&1 && { cat output; exit 1; }
cat output
$EGREP "required m4 file.*not distributed.* qux.m4( |$)" output
$EGREP "required m4 file.*not distributed.* bla.m4( |$)" output
check_no_spurious_error
# Check that we don't complain for files that should have been found.
-$FGREP " (bar|baz|zar).m4" output && Exit 1
+$FGREP " (bar|baz|zar).m4" output && exit 1
# Now we again use '--install', and "make distcheck" should pass.
$ACLOCAL -I m4 --install
diff --git a/t/distcheck-outdated-m4.sh b/t/distcheck-outdated-m4.sh
index 34084df..3c3336c 100755
--- a/t/distcheck-outdated-m4.sh
+++ b/t/distcheck-outdated-m4.sh
@@ -18,7 +18,7 @@
# files in a dist tarball (interaction with '--install').
# See automake bug#9037.
-. ./defs || Exit 1
+. ./defs || exit 1
cwd=$(pwd) || fatal_ "cannot get current working directory"
@@ -59,9 +59,9 @@ $MAKE distcheck # Sanity check.
check_no_spurious_error ()
{
- $EGREP -i 'mkdir:|:.*(permission|denied)' output && Exit 1
- grep -i 'autom4te.*\.cache' output && Exit 1
- : # To placate 'set -e'.
+ $EGREP -i 'mkdir:|:.*(permission|denied)' output && exit 1
+ grep -i 'autom4te.*\.cache' output && exit 1
+ : To placate 'set -e'.
}
# We start to use a new "third-party" macro in a new version
@@ -77,13 +77,13 @@ AC_DEFUN([MY_ZARDOZ], [:])
END
$MAKE # Rebuild configure and makefiles.
-$MAKE distcheck >output 2>&1 && { cat output; Exit 1; }
+$MAKE distcheck >output 2>&1 && { cat output; exit 1; }
cat output
$EGREP "required m4 file.* outdated.* baz.m4( |$)" output
check_no_spurious_error
# Check that we don't complain for files that aren't outdated.
-$EGREP " (foo|bar).m4" output && Exit 1
+$EGREP " (foo|bar).m4" output && exit 1
# Now we again use '--install' explicitly, and "make distcheck"
# should pass.
@@ -117,12 +117,12 @@ AC_DEFUN([MY_FNORD], [:])
END
$MAKE # Rebuild configure and makefiles.
-$MAKE distcheck >output 2>&1 && { cat output; Exit 1; }
+$MAKE distcheck >output 2>&1 && { cat output; exit 1; }
cat output
$EGREP "required m4 file.* outdated.* fnord.m4( |$)" output
check_no_spurious_error
# Check that we don't complain for files that aren't outdated.
-$EGREP " (foo|bar|baz).m4" output && Exit 1
+$EGREP " (foo|bar|baz).m4" output && exit 1
# Now we again use '--install' explicitly, and "make distcheck"
# should pass.
diff --git a/t/distcheck-override-infodir.sh b/t/distcheck-override-infodir.sh
index e3bff09..8ebcd95 100755
--- a/t/distcheck-override-infodir.sh
+++ b/t/distcheck-override-infodir.sh
@@ -18,7 +18,7 @@
# working. Related to automake bug#9579.
required='makeinfo tex texi2dvi install-info'
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_OUTPUT
@@ -56,6 +56,6 @@ $MAKE
$MAKE distcheck
$MAKE distcheck infodir="$(pwd)"/_info
-test -f _info/dir || Exit 99 # Sanity check.
+test -f _info/dir || exit 99 # Sanity check.
:
diff --git a/t/distcheck-pr10470.sh b/t/distcheck-pr10470.sh
index de8a984..a030f90 100755
--- a/t/distcheck-pr10470.sh
+++ b/t/distcheck-pr10470.sh
@@ -19,7 +19,7 @@
# by a process (e.g., that is its "current working directory").
# See automake bug#10470.
-. ./defs || Exit 1
+. ./defs || exit 1
mkdir foo.d
sh -c "cd foo.d && sleep '4'" &
@@ -49,7 +49,7 @@ $AUTOMAKE
./configure
# We can build the distribution.
-$MAKE distcheck 2>stderr || { cat stderr >&2; Exit 1; }
+$MAKE distcheck 2>stderr || { cat stderr >&2; exit 1; }
cat stderr >&2
# Sanity check: verify that our code has hit a problem removing
# the distdir, but has recovered from it.
diff --git a/t/distcheck-pr9579.sh b/t/distcheck-pr9579.sh
index 09fd190..58c9b6e 100755
--- a/t/distcheck-pr9579.sh
+++ b/t/distcheck-pr9579.sh
@@ -17,7 +17,7 @@
# Check against automake bug#9579: distcheck does not always detect
# incomplete uninstall as advertised.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_OUTPUT
@@ -54,7 +54,7 @@ $MAKE uninstall
test -f inst/share/dir
rm -rf inst
-$MAKE distcheck 2>stderr && { cat stderr >&2; Exit 1; }
+$MAKE distcheck 2>stderr && { cat stderr >&2; exit 1; }
cat stderr >&2
grep 'ERROR: files left after uninstall:' stderr
@@ -86,7 +86,7 @@ test -f inst/mu/share/info/dir
test -f inst/share/info/more/dir
rm -rf inst
-$MAKE distcheck 2>stderr && { cat stderr >&2; Exit 1; }
+$MAKE distcheck 2>stderr && { cat stderr >&2; exit 1; }
cat stderr >&2
grep 'ERROR: files left after uninstall:' stderr
diff --git a/t/distcheck-writable-srcdir.sh b/t/distcheck-writable-srcdir.sh
index bbc50f4..034dc1e 100755
--- a/t/distcheck-writable-srcdir.sh
+++ b/t/distcheck-writable-srcdir.sh
@@ -21,7 +21,7 @@
# case too (since it doesn't cost us anything but this test).
# See automake bug#10878.
-. ./defs || Exit 1
+. ./defs || exit 1
echo AC_OUTPUT >> configure.ac
diff --git a/t/distcleancheck.sh b/t/distcleancheck.sh
index 39197d7..5cdd6f1 100755
--- a/t/distcleancheck.sh
+++ b/t/distcleancheck.sh
@@ -18,7 +18,7 @@
# The example Makefile.am we use is from the FAQ entry 'distcleancheck'.
required=cc
-. ./defs || Exit 1
+. ./defs || exit 1
cat >>configure.ac << 'END'
AC_PROG_CC
@@ -62,7 +62,7 @@ mv -f t Makefile.am
$AUTOMAKE
./configure
$MAKE
-$MAKE distcheck 2>stderr && { cat srderr >&2; Exit 1; }
+$MAKE distcheck 2>stderr && { cat srderr >&2; exit 1; }
cat stderr >&2
grep 'ERROR:.*files left in build directory after distclean' stderr
diff --git a/t/distcom-subdir.sh b/t/distcom-subdir.sh
index ac1420f..c6b6926 100755
--- a/t/distcom-subdir.sh
+++ b/t/distcom-subdir.sh
@@ -18,7 +18,7 @@
# by a subdir Makefile.am, it is distributed by that Makefile.am.
required=cc
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_CONFIG_FILES([subdir/Makefile])
@@ -47,7 +47,7 @@ END
$ACLOCAL
$AUTOCONF
$AUTOMAKE
-test ! -f depcomp
+test ! -e depcomp
cat >> subdir/Makefile.am << 'END'
bin_PROGRAMS = foo
diff --git a/t/distcom2.sh b/t/distcom2.sh
index 08d2679..28cc53b 100755
--- a/t/distcom2.sh
+++ b/t/distcom2.sh
@@ -18,7 +18,7 @@
# Report from Pavel Roskin. Report of problems with '--no-force' from
# Scott James Remnant (Debian #206299)
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
diff --git a/t/distcom3.sh b/t/distcom3.sh
index 8ed0809..d83409e 100755
--- a/t/distcom3.sh
+++ b/t/distcom3.sh
@@ -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
cat > Makefile.am << 'END'
README:
@@ -32,9 +32,9 @@ END
$ACLOCAL
# Should not warn about missing README, since it is a target.
-$AUTOMAKE --add-missing --gnu >output 2>&1 || { cat output; Exit 1; }
+$AUTOMAKE --add-missing --gnu >output 2>&1 || { cat output; exit 1; }
cat output
-grep README output && Exit 1
+grep README output && exit 1
sed -n -e '/^am__dist_common =.*\\$/ {
:loop
diff --git a/t/distcom4.sh b/t/distcom4.sh
index c8cc2c5..4d98b17 100755
--- a/t/distcom4.sh
+++ b/t/distcom4.sh
@@ -19,7 +19,7 @@
# Makefile in that directory. distcom5.test performs the same
# test with a Makefile in the directory.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_CONFIG_FILES([tests/autoconf:tests/wrapper.in],
diff --git a/t/distcom5.sh b/t/distcom5.sh
index 7440397..4d3789d 100755
--- a/t/distcom5.sh
+++ b/t/distcom5.sh
@@ -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
cat >> configure.ac << 'END'
AC_CONFIG_FILES([tests/autoconf:tests/wrapper.in],
diff --git a/t/distdir.sh b/t/distdir.sh
index 9f365b7..9d0d6ee 100755
--- a/t/distdir.sh
+++ b/t/distdir.sh
@@ -21,7 +21,7 @@
# Also test the situation when the lsit of distributed files contains
# a directory and a file in it, and repeated directories.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_OUTPUT
@@ -64,7 +64,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 $me-1.0
# Remove the dot from VERSION for the next grep.
@@ -73,7 +73,7 @@ cat stdout
# 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.*\.' stdout && Exit 1
+grep 'MKDIR_P.*\.' stdout && exit 1
cd ..
./configure --prefix "$(pwd)"
diff --git a/t/disthook.sh b/t/disthook.sh
index 98f086d..6fefacb 100755
--- a/t/disthook.sh
+++ b/t/disthook.sh
@@ -16,7 +16,7 @@
# Check that 'dist-hook' works. See automake bug#10878.
-. ./defs || Exit 1
+. ./defs || exit 1
echo AC_OUTPUT >> configure.ac
@@ -72,12 +72,10 @@ $MAKE distdir
ls -l $distdir $distdir/doc
cd $distdir
test "$(cat write)" = "all is ok"
-test ! -f removed
-test ! -r removed
+test ! -e removed
test -f doc/README
test -f doc/RELEASE-DATE
-test ! -f doc/HACING
-test ! -r doc/HACING
+test ! -e doc/HACING
./execute
./execute | grep 'I run successfully'
cd ..
diff --git a/t/distlinks.sh b/t/distlinks.sh
index 97b5b49..7d05b6e 100755
--- a/t/distlinks.sh
+++ b/t/distlinks.sh
@@ -17,7 +17,7 @@
# Check that distributed symlinks in the source tree will be expanded
# as regular files in $(distdir).
-. ./defs || Exit 1
+. ./defs || exit 1
echo text > file
diff --git a/t/distlinksbrk.sh b/t/distlinksbrk.sh
index 04c6b7f..c863ec8 100755
--- a/t/distlinksbrk.sh
+++ b/t/distlinksbrk.sh
@@ -17,7 +17,7 @@
# Check that distributed broken symlinks cause 'make dist' to fail, and
# to do so with (mostly) meaningful diagnostic.
-. ./defs || Exit 1
+. ./defs || exit 1
# We need, for our broken symlinks, names that make it hard to get false
# positives when grepping make output to look for them.
@@ -34,11 +34,11 @@ ln -s "$(pwd)/nonesuch" $lnk2
ln -s $lnk1 $lnka
ln -s $lnka $lnkb
-# Sanity checks. Use 'test -r', since Solaris Sh doesn't grok 'test -e'.
-test ! -r $lnk1
-test ! -r $lnk2
-test ! -r $lnka
-test ! -r $lnkb
+# Sanity checks.
+test ! -e $lnk1
+test ! -e $lnk2
+test ! -e $lnka
+test ! -e $lnkb
test -h $lnk1
test -h $lnk2
test -h $lnka
@@ -60,10 +60,10 @@ $AUTOMAKE
ls -l # For debugging.
# Distribution must fail.
-$MAKE distdir && Exit 1
+$MAKE distdir && exit 1
# Names of distributed broken symlinks should be reported in make output.
-$MAKE -k distdir 2>stderr && { cat stderr >&2; Exit 1; }
+$MAKE -k distdir 2>stderr && { cat stderr >&2; exit 1; }
cat stderr >&2
$FGREP $lnk1 stderr
$FGREP $lnk2 stderr
diff --git a/t/distname.sh b/t/distname.sh
index 0ef3cdb..19806ce 100755
--- a/t/distname.sh
+++ b/t/distname.sh
@@ -18,7 +18,7 @@
# From Rainer Orth.
required=cc
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_CONFIG_SRCDIR([a.c])
@@ -40,8 +40,8 @@ $AUTOMAKE --include-deps --copy --add-missing
$MAKE dist
gzip -d $me-1.0.tar.gz
-tar tf $me-1.0.tar > stdout || { cat stdout; Exit 1; }
+tar tf $me-1.0.tar > stdout || { cat stdout; exit 1; }
cat stdout
-$FGREP ./$me-1.0/a.c stdout && Exit 1
+$FGREP ./$me-1.0/a.c stdout && exit 1
:
diff --git a/t/dmalloc.sh b/t/dmalloc.sh
index 2bf6a7c..3f37eb5 100755
--- a/t/dmalloc.sh
+++ b/t/dmalloc.sh
@@ -16,7 +16,7 @@
# Simple checks on the 'AM_WITH_DMALLOC' macro.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_CONFIG_HEADERS([config.h])
diff --git a/t/dollar.sh b/t/dollar.sh
index 7f8de16..214345b 100755
--- a/t/dollar.sh
+++ b/t/dollar.sh
@@ -18,7 +18,7 @@
# Java people need this.
# PR/317, reported by Eric Siegerman and Philip Fong.
-. ./defs || Exit 1
+. ./defs || exit 1
echo AC_OUTPUT >> configure.ac
diff --git a/t/double-colon-rules.sh b/t/double-colon-rules.sh
index ef7c45a..b6803cc 100755
--- a/t/double-colon-rules.sh
+++ b/t/double-colon-rules.sh
@@ -19,7 +19,7 @@
# seen in input Makefile.am, but also that GNU make support of double-colon
# rules is as reliable and well-working as we expect and need.
-. ./defs || Exit 1
+. ./defs || exit 1
echo AC_OUTPUT >> configure.ac
diff --git a/t/double.sh b/t/double.sh
index 7f353b7..6e1b96f 100755
--- a/t/double.sh
+++ b/t/double.sh
@@ -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.ac
diff --git a/t/dup2.sh b/t/dup2.sh
index d405828..82d341c 100755
--- a/t/dup2.sh
+++ b/t/dup2.sh
@@ -16,7 +16,7 @@
# Make sure aclocal only warns about definitions overridden by acinclude.m4.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AM_FUNC_STRTOD
diff --git a/t/else.sh b/t/else.sh
index 74d2158..4bf82f6 100755
--- a/t/else.sh
+++ b/t/else.sh
@@ -16,7 +16,7 @@
# Test to make sure line numbers are correct in some error reports.
-. ./defs || Exit 1
+. ./defs || exit 1
echo 'AM_CONDITIONAL(FOO, true)' >> configure.ac
diff --git a/t/empty-data-primary.sh b/t/empty-data-primary.sh
index 23f8a7d..a8e1b16 100755
--- a/t/empty-data-primary.sh
+++ b/t/empty-data-primary.sh
@@ -17,7 +17,7 @@
# Test for bug where if the list of installables is empty, invalid sh
# code is generated.
-. ./defs || Exit 1
+. ./defs || exit 1
echo AC_OUTPUT >>configure.ac
echo 'data_DATA =' >Makefile.am
diff --git a/t/empty-sources-primary.tap b/t/empty-sources-primary.tap
index 87f5348..3e5b3f4 100755
--- a/t/empty-sources-primary.tap
+++ b/t/empty-sources-primary.tap
@@ -17,7 +17,7 @@
# A test for missing _SOURCES variable. Also test to make sure empty
# _SOURCES suppresses assumption about default name.
-. ./defs || Exit 1
+. ./defs || exit 1
plan_ 5
diff --git a/t/ensure-dir-exists.sh b/t/ensure-dir-exists.sh
index d47d22f..bc396b6 100755
--- a/t/ensure-dir-exists.sh
+++ b/t/ensure-dir-exists.sh
@@ -17,7 +17,7 @@
# Test Automake-provided internal macro 'am__ensure_dir_exists'.
am_create_testdir=empty
-. ./defs || Exit 1
+. ./defs || exit 1
cp "$am_amdir"/header-vars.am . \
|| fatal_ "fetching makefile fragment headers-vars.am"
diff --git a/t/exdir.sh b/t/exdir.sh
index 6e048d2..0c249e4 100755
--- a/t/exdir.sh
+++ b/t/exdir.sh
@@ -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
diff --git a/t/exdir2.sh b/t/exdir2.sh
index ddaac58..cf17f58 100755
--- a/t/exdir2.sh
+++ b/t/exdir2.sh
@@ -16,7 +16,7 @@
# Test to make sure undefined directories are invalid.
-. ./defs || Exit 1
+. ./defs || exit 1
cat > Makefile.am << 'EOF'
quuz_DATA = zot.html
@@ -25,5 +25,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/t/exdir3.sh b/t/exdir3.sh
index 672548c..6d602cb 100755
--- a/t/exdir3.sh
+++ b/t/exdir3.sh
@@ -16,7 +16,7 @@
# Test to make sure pkgdatadir can be overridden via AC_SUBST.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >>configure.ac <<'EOF'
AC_SUBST([pkgdatadir], ["FOO"])
diff --git a/t/exeext.sh b/t/exeext.sh
index 5f43957..409ac75 100755
--- a/t/exeext.sh
+++ b/t/exeext.sh
@@ -22,7 +22,7 @@
# aren't left around. Report from Jim Meyering.
required=cc
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
@@ -65,11 +65,11 @@ grep '^rmt$(EXEEXT):' Makefile.in
test $(grep -c '^bin_PROGRAMS =' Makefile.in) -eq 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
-$MAKE EXEEXT=.foo print > stdout || { cat stdout; Exit 1; }
+$MAKE EXEEXT=.foo print > stdout || { cat stdout; exit 1; }
cat stdout
grep '1BEG: maude.foo mt.foo :END1' stdout
@@ -79,7 +79,7 @@ grep '4BEG: rmt.foo :END4' stdout
./configure revert=yes
-$MAKE EXEEXT=.foo print > stdout || { cat stdout; Exit 1; }
+$MAKE EXEEXT=.foo print > stdout || { cat stdout; exit 1; }
cat stdout
grep '1BEG: maude.foo :END1' stdout
diff --git a/t/exeext2.sh b/t/exeext2.sh
index 3315ad8..956acff 100755
--- a/t/exeext2.sh
+++ b/t/exeext2.sh
@@ -16,7 +16,7 @@
# Make sure no-exeext option works.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
diff --git a/t/exeext3.sh b/t/exeext3.sh
index 9561c7a..e12462a 100755
--- a/t/exeext3.sh
+++ b/t/exeext3.sh
@@ -16,7 +16,7 @@
# Make sure we can override a program rule.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
diff --git a/t/exeext4.sh b/t/exeext4.sh
index c69f656..acb16cc 100755
--- a/t/exeext4.sh
+++ b/t/exeext4.sh
@@ -18,7 +18,7 @@
# programs, but not to @address@hidden
am_serial_tests=yes
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AM_CONDITIONAL([COND], [test -n "$cond"])
diff --git a/t/exsource.sh b/t/exsource.sh
index 0c8a426..d573321 100755
--- a/t/exsource.sh
+++ b/t/exsource.sh
@@ -17,7 +17,7 @@
# Test to make sure EXTRA_..._SOURCES actually works.
# Bug report from Henrik Frystyk Nielsen.
-. ./defs || Exit 1
+. ./defs || exit 1
echo AC_PROG_CC >> configure.ac
diff --git a/t/ext.sh b/t/ext.sh
index 72ff211..1a198c1 100755
--- a/t/ext.sh
+++ b/t/ext.sh
@@ -16,7 +16,7 @@
# Test to make sure extensions are set correctly for various languages.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_F77
@@ -37,7 +37,7 @@ $AUTOMAKE
$FGREP '%.$(OBJEXT)' Makefile.in # For debugging.
for ext in f for f90 f95 F F90 F95 r m mm upc; do
- grep "%.*: %$ext" Makefile.in && Exit 1
+ grep "%.*: %$ext" Makefile.in && exit 1
grep "^%\.\$(OBJEXT): %\.$ext$" Makefile.in
done
diff --git a/t/ext2.sh b/t/ext2.sh
index a114580..a6fcf82 100755
--- a/t/ext2.sh
+++ b/t/ext2.sh
@@ -18,7 +18,7 @@
# Using different extensions for the same language should not
# output the build rules several times.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >>configure.ac <<EOF
AC_PROG_CXX
diff --git a/t/extra-portability.sh b/t/extra-portability.sh
index 3ad6375..fffd6d3 100755
--- a/t/extra-portability.sh
+++ b/t/extra-portability.sh
@@ -20,7 +20,7 @@
# 2. '-Wno-portability' must imply '-Wno-extra-portability'.
# 3. '-Wall' must imply '-Wextra-portability'.
-. ./defs || Exit 1
+. ./defs || exit 1
# We want (almost) complete control over automake options.
AUTOMAKE="$am_original_AUTOMAKE --foreign -Werror"
@@ -77,16 +77,16 @@ grep 'requires.*AM_PROG_AR' stderr
# Disabling extra-portability leaves portability intact (1).
AUTOMAKE_fails -Wportability -Wno-extra-portability
grep 'requires.*AM_PROG_CC_C_O' stderr
-grep 'requires.*AM_PROG_AR' stderr && Exit 1
+grep 'requires.*AM_PROG_AR' stderr && exit 1
# Disabling extra-portability leaves portability intact (2).
AUTOMAKE_fails -Wall -Wno-extra-portability
grep 'requires.*AM_PROG_CC_C_O' stderr
-grep 'requires.*AM_PROG_AR' stderr && Exit 1
+grep 'requires.*AM_PROG_AR' stderr && exit 1
# Enabling portability does not enable extra-portability.
AUTOMAKE_fails -Wportability
grep 'requires.*AM_PROG_CC_C_O' stderr
-grep 'requires.*AM_PROG_AR' stderr && Exit 1
+grep 'requires.*AM_PROG_AR' stderr && exit 1
# Disabling portability disables extra-portability.
$AUTOMAKE -Wno-portability
diff --git a/t/extra-portability2.sh b/t/extra-portability2.sh
index 2d33008..e87dde0 100755
--- a/t/extra-portability2.sh
+++ b/t/extra-portability2.sh
@@ -17,7 +17,7 @@
# Make sure that extra-portability warnings are not enabled by --gnits,
# --gnu and --foreign.
-. ./defs || Exit 1
+. ./defs || exit 1
# We want complete control over automake options.
AUTOMAKE=$am_original_AUTOMAKE
diff --git a/t/extra-programs-empty.sh b/t/extra-programs-empty.sh
index 37e1a2b..189fac4 100755
--- a/t/extra-programs-empty.sh
+++ b/t/extra-programs-empty.sh
@@ -18,7 +18,7 @@
# This check has been introduced in commit 'Release-1-9-254-g9d0eaef'
# into the former test 'subst2.test'.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_CONFIG_FILES([Makefile2 Makefile3])
diff --git a/t/extra.sh b/t/extra.sh
index 7bad9ef..0993706 100755
--- a/t/extra.sh
+++ b/t/extra.sh
@@ -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.ac << 'END'
AC_PROG_CC
@@ -36,5 +36,5 @@ $AUTOMAKE
grep "^zardoz" Makefile.in
# 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/t/extra10.sh b/t/extra10.sh
index 27eb1ed..808d3dd 100755
--- a/t/extra10.sh
+++ b/t/extra10.sh
@@ -19,7 +19,7 @@
# See also sister test 'extra11.test', that check a similar usage
# with the involvement of the $(wildcard) GNU make builtin.
-. ./defs || Exit 1
+. ./defs || exit 1
echo AC_OUTPUT >> configure.ac
diff --git a/t/extra11.sh b/t/extra11.sh
index b97000d..3f97e6b 100755
--- a/t/extra11.sh
+++ b/t/extra11.sh
@@ -17,7 +17,7 @@
# Check for more complex usage of wildcards in EXTRA_DIST.
# Suggested by observations from Braden McDaniel.
-. ./defs || Exit 1
+. ./defs || exit 1
echo AC_OUTPUT >> configure.ac
diff --git a/t/extra12.sh b/t/extra12.sh
index 0745850..67fa1fe 100755
--- a/t/extra12.sh
+++ b/t/extra12.sh
@@ -18,7 +18,7 @@
# $srcdir != $builddir, if properly declared.
# Suggested by observations from Braden McDaniel.
-. ./defs || Exit 1
+. ./defs || exit 1
echo AC_OUTPUT >> configure.ac
diff --git a/t/extra2.sh b/t/extra2.sh
index 30eaeed..e5576a5 100755
--- a/t/extra2.sh
+++ b/t/extra2.sh
@@ -16,7 +16,7 @@
# Check to make sure EXTRA_foo_SOURCES not defined unnecessarily.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
@@ -29,5 +29,5 @@ END
$ACLOCAL
$AUTOMAKE
-grep EXTRA_foo_SOURCES Makefile.in && Exit 1
-Exit 0
+grep EXTRA_foo_SOURCES Makefile.in && exit 1
+exit 0
diff --git a/t/extra3.sh b/t/extra3.sh
index 4065801..02ac789 100755
--- a/t/extra3.sh
+++ b/t/extra3.sh
@@ -16,7 +16,7 @@
# Check to make sure EXTRA_DATA not required.
-. ./defs || Exit 1
+. ./defs || exit 1
echo 'AC_SUBST(CODICIL)' >> configure.ac
diff --git a/t/extra4.sh b/t/extra4.sh
index 5b31b63..286540a 100755
--- a/t/extra4.sh
+++ b/t/extra4.sh
@@ -16,7 +16,7 @@
# Check to make sure EXTRA_DATA can be specified.
-. ./defs || Exit 1
+. ./defs || exit 1
echo 'AC_SUBST(CODICIL)' >> configure.ac
diff --git a/t/extra5.sh b/t/extra5.sh
index 7fdd983..abe8e13 100755
--- a/t/extra5.sh
+++ b/t/extra5.sh
@@ -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.ac
diff --git a/t/extra6.sh b/t/extra6.sh
index 6b51211..b5308af 100755
--- a/t/extra6.sh
+++ b/t/extra6.sh
@@ -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
echo AC_OUTPUT >> configure.ac
diff --git a/t/extra7.sh b/t/extra7.sh
index 4ad7789..b75a0a7 100755
--- a/t/extra7.sh
+++ b/t/extra7.sh
@@ -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
echo AC_OUTPUT >> configure.ac
diff --git a/t/extra8.sh b/t/extra8.sh
index 9eef189..0a4f818 100755
--- a/t/extra8.sh
+++ b/t/extra8.sh
@@ -18,7 +18,7 @@
# and that referring to the same program with inconsistent addition
# of $(EXEEXT) works, too.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >>configure.ac <<'END'
AC_PROG_CC
diff --git a/t/extra9.sh b/t/extra9.sh
index b5a6007..c0bb0f3 100755
--- a/t/extra9.sh
+++ b/t/extra9.sh
@@ -18,7 +18,7 @@
# are missing; but only if the former is not AC_SUBSTed itself
# (lib_LIBRARIES is in the same boat here).
-. ./defs || Exit 1
+. ./defs || exit 1
cat >>configure.ac <<'END'
AC_PROG_CC
@@ -38,6 +38,6 @@ END
$ACLOCAL
AUTOMAKE_fails
grep 'bin_PROGRAMS.*contains configure substitution' stderr
-grep 'lib_LIBRARIES.*contains configure substitution' stderr && Exit 1
+grep 'lib_LIBRARIES.*contains configure substitution' stderr && exit 1
-Exit 0
+exit 0
diff --git a/t/extradep.sh b/t/extradep.sh
index 8398ea6..75daf2e 100755
--- a/t/extradep.sh
+++ b/t/extradep.sh
@@ -17,7 +17,7 @@
# Test EXTRA_*_DEPENDENCIES. See extradep2 for libtool variant.
required=cc
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
@@ -78,20 +78,20 @@ $AUTOCONF
: >foodep
: >foodep2
: >bardep
-$MAKE >stdout || { cat stdout; Exit 1; }
+$MAKE >stdout || { cat stdout; exit 1; }
cat stdout
grep 'making libfoodep' stdout
rm -f foodep
-$MAKE && Exit 1
+$MAKE && exit 1
: >foodep
rm -f foodep2
-$MAKE && Exit 1
+$MAKE && exit 1
: >foodep2
rm -f bardep
-$MAKE && Exit 1
+$MAKE && exit 1
: >bardep
$MAKE
diff --git a/t/extradep2.sh b/t/extradep2.sh
index 011a0d4..554d0be 100755
--- a/t/extradep2.sh
+++ b/t/extradep2.sh
@@ -17,7 +17,7 @@
# Test EXTRA_*_DEPENDENCIES, libtool version; see extradep.test.
required='cc libtoolize'
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
@@ -67,12 +67,12 @@ $AUTOCONF
: >foodep
: >foodep2
: >bardep
-$MAKE >stdout || { cat stdout; Exit 1; }
+$MAKE >stdout || { cat stdout; exit 1; }
cat stdout
grep 'making libfoodep' stdout
rm -f bardep
-$MAKE && Exit 1
+$MAKE && exit 1
: >bardep
$MAKE
diff --git a/t/f90only.sh b/t/f90only.sh
index a65a91e..56e63ef 100755
--- a/t/f90only.sh
+++ b/t/f90only.sh
@@ -17,7 +17,7 @@
# Make sure programs with only Fortran 90 source are handled properly.
# (copied from fonly.test) Mike Nolta <address@hidden>
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_FC
diff --git a/t/flavor.sh b/t/flavor.sh
index 8b999cc..91b3341 100755
--- a/t/flavor.sh
+++ b/t/flavor.sh
@@ -18,7 +18,7 @@
# options like '--ignore-deps' and '--silent-rules' are preserved across
# automake reruns.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AM_MAINTAINER_MODE
diff --git a/t/flibs.sh b/t/flibs.sh
index 4f5701b..d51849f 100755
--- a/t/flibs.sh
+++ b/t/flibs.sh
@@ -17,7 +17,7 @@
# Make sure 'AC_F77_LIBRARY_LDFLAGS' works properly.
# Matthew D. Langston <address@hidden>
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_F77
diff --git a/t/fn99.sh b/t/fn99.sh
index db7f323..f1351bb 100755
--- a/t/fn99.sh
+++ b/t/fn99.sh
@@ -16,7 +16,7 @@
# Check the filename-length-max=99 option.
-. ./defs || Exit 1
+. ./defs || exit 1
echo AC_OUTPUT >> configure.ac
@@ -26,7 +26,7 @@ EXTRA_DIST = 12345678
END
(for i in 1 2 3 4 5 6 7 8 9; do
- mkdir -p 12345678 && cd 12345678 && touch x || Exit 1
+ mkdir -p 12345678 && cd 12345678 && touch x || exit 1
done) || skip_ "failed to create deep directory hierarchy"
# AIX 5.3 'cp -R' is too buggy for 'make dist'.
@@ -40,10 +40,10 @@ $AUTOMAKE
$MAKE distcheck
(for i in 1 2 3 4 5 6 7 8 9 10 11; do
- mkdir -p 12345678 && cd 12345678 && touch x || Exit 1
+ mkdir -p 12345678 && cd 12345678 && touch x || exit 1
done) || skip_ "failed to create deeper directory hierarchy"
-$MAKE dist 2>stderr && { cat stderr >&2; Exit 1; }
+$MAKE dist 2>stderr && { cat stderr >&2; exit 1; }
cat stderr >&2
grep 'filenames are too long' stderr
test 2 -eq $(grep -c 12345678 stderr)
diff --git a/t/fn99subdir.sh b/t/fn99subdir.sh
index 0df282c..eb289b4 100755
--- a/t/fn99subdir.sh
+++ b/t/fn99subdir.sh
@@ -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
# The name is so that 99 is exactly hit (including final \0).
subdirname='cnfsubdir'
@@ -46,9 +46,9 @@ AUTOMAKE_OPTIONS = filename-length-max=99
EXTRA_DIST = 12345678
END
-(cd $subdirname || Exit 1
+(cd $subdirname || exit 1
for i in 1 2 3 4 5 6 7 8; do
- mkdir -p 12345678 && cd 12345678 && touch x || Exit 1
+ mkdir -p 12345678 && cd 12345678 && touch x || exit 1
done) || skip_ "failed to create deep directory hierarchy"
# AIX 5.3 'cp -R' is too buggy for 'make dist'.
@@ -68,12 +68,12 @@ $AUTOMAKE
./configure
$MAKE distcheck
-(cd $subdirname || Exit 1
+(cd $subdirname || exit 1
for i in 1 2 3 4 5 6 7 8 9; do
- mkdir -p 12345678 && cd 12345678 && touch x || Exit 1
+ mkdir -p 12345678 && cd 12345678 && touch x || exit 1
done) || skip_ "failed to create deeper directory hierarchy"
-$MAKE dist 2>stderr && { cat stderr >&2; Exit 1; }
+$MAKE dist 2>stderr && { cat stderr >&2; exit 1; }
cat stderr >&2
grep 'filenames are too long' stderr
test 1 -eq $(grep -c 12345678 stderr)
diff --git a/t/fonly.sh b/t/fonly.sh
index c3ae614..9854187 100755
--- a/t/fonly.sh
+++ b/t/fonly.sh
@@ -17,7 +17,7 @@
# Make sure programs with only Fortran 77 source are handled properly.
# Matthew D. Langston <address@hidden>
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_F77
diff --git a/t/forcemiss.sh b/t/forcemiss.sh
index d7d0800..74da2d7 100755
--- a/t/forcemiss.sh
+++ b/t/forcemiss.sh
@@ -16,7 +16,7 @@
# Test to make sure that 'automake --force-missing' works.
-. ./defs || Exit 1
+. ./defs || exit 1
rm -f install-sh
@@ -29,6 +29,6 @@ $AUTOMAKE --add-missing --force-missing
ls -l install-sh
test -f install-sh
-grep zot install-sh && Exit 1
+grep zot install-sh && exit 1
:
diff --git a/t/forcemiss2.sh b/t/forcemiss2.sh
index 3c75722..8c6369a 100755
--- a/t/forcemiss2.sh
+++ b/t/forcemiss2.sh
@@ -17,7 +17,7 @@
# Test to make sure that 'automake --force-missing' works, even with
# symlinked files.
-. ./defs || Exit 1
+. ./defs || exit 1
rm -f install-sh
@@ -34,7 +34,7 @@ $AUTOMAKE --add-missing --force-missing
ls -l install-sh
test -f install-sh
-grep zot install-sh && Exit 1
+grep zot install-sh && exit 1
diff foo foo2
:
diff --git a/t/fort1.sh b/t/fort1.sh
index 6bf58fe..d118e9f 100755
--- a/t/fort1.sh
+++ b/t/fort1.sh
@@ -17,7 +17,7 @@
# Test that Automake suggests using AC_PROG_F77/FC if Fortran sources
# are used.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >Makefile.am <<END
bin_PROGRAMS = hello
diff --git a/t/fort2.sh b/t/fort2.sh
index d7348ed..4ec207c 100755
--- a/t/fort2.sh
+++ b/t/fort2.sh
@@ -20,7 +20,7 @@
# Cf. fort1.test and link_f90_only.test.
required=gfortran # Required only in order to run ./configure.
-. ./defs || Exit 1
+. ./defs || exit 1
mkdir sub
@@ -44,12 +44,12 @@ END
$ACLOCAL
$AUTOMAKE
-grep '.\$(LINK)' Makefile.in && Exit 1
+grep '.\$(LINK)' Makefile.in && exit 1
grep '.\$(FCLINK)' Makefile.in
grep '.\$(FCCOMPILE)' Makefile.in > stdout
cat 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
sed '/^AC_FC_SRCEXT.*blabla/d' configure.ac >t
mv -f t configure.ac
@@ -66,7 +66,7 @@ touch hello.f90 foo.f95 sub/bar.f95 hi.f03 sub/howdy.f03
greets.f08 \
$MAKE -n FC=fake-fc \
address@hidden address@hidden address@hidden address@hidden \
- > stdout || { cat stdout; Exit 1; }
+ > stdout || { cat stdout; exit 1; }
cat stdout
# To make it easier to have stricter grepping below.
sed -e 's/[ ][ ]*/ /g' -e 's/^/ /' -e 's/$/ /' stdout > out
@@ -82,11 +82,11 @@ grep ' fake-fc .* address@hidden .* sub/bonjour\.f08 ' out
grep ' fake-fc .* --gby .* address@hidden .* bye\.f95 ' out
grep ' fake-fc .* --gby .* address@hidden .* sub/baz\.f90 ' out
-test `grep -c '.*--gby.*\.f' out` -eq 2
+test $(grep -c '.*--gby.*\.f' out) -eq 2
-$EGREP 'fake-fc.*--@(95|03|08).*\.f90' out && Exit 1
-$EGREP 'fake-fc.*--@(90|03|08).*\.f95' out && Exit 1
-$EGREP 'fake-fc.*--@(90|95|08).*\.f03' out && Exit 1
-$EGREP 'fake-fc.*--@(95|95|03).*\.f08' out && Exit 1
+$EGREP 'fake-fc.*--@(95|03|08).*\.f90' out && exit 1
+$EGREP 'fake-fc.*--@(90|03|08).*\.f95' out && exit 1
+$EGREP 'fake-fc.*--@(90|95|08).*\.f03' out && exit 1
+$EGREP 'fake-fc.*--@(95|95|03).*\.f08' out && exit 1
:
diff --git a/t/fort4.sh b/t/fort4.sh
index eb85bda..06091e4 100755
--- a/t/fort4.sh
+++ b/t/fort4.sh
@@ -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
mkdir sub
@@ -89,7 +89,7 @@ END
$ACLOCAL
$AUTOMAKE -a
# The Fortran 77 linker should be preferred:
-grep '.\$(FCLINK)' Makefile.in && Exit 1
+grep '.\$(FCLINK)' Makefile.in && exit 1
$AUTOCONF
# ./configure may exit with status 77 if no compiler is found,
diff --git a/t/fort5.sh b/t/fort5.sh
index b9e5b80..517fb23 100755
--- a/t/fort5.sh
+++ b/t/fort5.sh
@@ -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
mkdir sub
@@ -91,13 +91,13 @@ grep " --tag=FC" Makefile.in
$MAKE
test -f sub/bar.lo
-test ! -f bar.lo
+test ! -e bar.lo
## The setting of FCFLAGS should only cause objects deriving from
## Fortran 90, not Fortran 77, to be renamed.
test -f sub/baz.lo
-test ! -f baz.lo
-test ! -f sub/libgoodbye_la-baz.lo
-test ! -f libgoodbye_la-baz.lo
+test ! -e baz.lo
+test ! -e sub/libgoodbye_la-baz.lo
+test ! -e libgoodbye_la-baz.lo
$MAKE distcheck
diff --git a/t/fortdep.sh b/t/fortdep.sh
index d10644d..8eff4e9 100755
--- a/t/fortdep.sh
+++ b/t/fortdep.sh
@@ -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.ac << 'END'
AC_CONFIG_SRCDIR([foo.f])
@@ -35,5 +35,5 @@ END
$ACLOCAL
$AUTOMAKE
-grep 'foo\.Po' Makefile.in && Exit 1
-Exit 0
+grep 'foo\.Po' Makefile.in && exit 1
+exit 0
diff --git a/t/gcj.sh b/t/gcj.sh
index cad90b7..8493024 100755
--- a/t/gcj.sh
+++ b/t/gcj.sh
@@ -17,7 +17,7 @@
# Test of compiled java.
required='gcc gcj'
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
# FIXME: AM_PROG_GCJ should cause OBJEXT and EXEEXT to be set, but
diff --git a/t/gcj2.sh b/t/gcj2.sh
index 2c4d60f..8da82a1 100755
--- a/t/gcj2.sh
+++ b/t/gcj2.sh
@@ -16,7 +16,7 @@
# Make sure '..' invalid in subdir .o's.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
_AM_DEPENDENCIES(GCJ)
diff --git a/t/gcj3.sh b/t/gcj3.sh
index 36692d9..c4b4574 100755
--- a/t/gcj3.sh
+++ b/t/gcj3.sh
@@ -16,7 +16,7 @@
# Make sure dependency tracking works for java.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
_AM_DEPENDENCIES([GCJ])
diff --git a/t/gcj4.sh b/t/gcj4.sh
index 78d3fe7..299e1c1 100755
--- a/t/gcj4.sh
+++ b/t/gcj4.sh
@@ -17,7 +17,7 @@
# Make sure dependency tracking works for Java.
required=gcj
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AM_PROG_GCJ
@@ -32,7 +32,7 @@ END
$ACLOCAL
$AUTOCONF
$AUTOMAKE
-./configure >stdout || { cat stdout; Exit 1; }
+./configure >stdout || { cat stdout; exit 1; }
cat stdout
# Configure must be checking the dependency style of gcj ...
diff --git a/t/gcj5.sh b/t/gcj5.sh
index f3c218f..4df1059 100755
--- a/t/gcj5.sh
+++ b/t/gcj5.sh
@@ -16,7 +16,7 @@
# Make sure Automake suggests AM_PROG_GCJ when GCJ is needed.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
_AM_DEPENDENCIES(GCJ)
diff --git a/t/gcj6.sh b/t/gcj6.sh
index 3fe4a31..60023c2 100755
--- a/t/gcj6.sh
+++ b/t/gcj6.sh
@@ -17,7 +17,7 @@
# AM_PROG_GCJ should cause OBJEXT and EXEEXT to be set.
required='gcj'
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AM_PROG_GCJ
diff --git a/t/get-sysconf.sh b/t/get-sysconf.sh
index ac09a63..60f62cd 100755
--- a/t/get-sysconf.sh
+++ b/t/get-sysconf.sh
@@ -20,7 +20,7 @@
# we won't have to ask him for more information to start analyzing the
# failure (that had happened too many times in the past!).
-. ./defs || Exit 1
+. ./defs || exit 1
st=0
if test -d "$am_top_srcdir"/.git; then
@@ -54,9 +54,9 @@ if test $st -eq 0; then
# This test SKIPs, so that all the information it has gathered and
# printed will get unconditionally copied into the 'test-suite.log'
# file.
- Exit 77
+ exit 77
fi
# Some unexpected error occurred; this must be reported as an hard
# error by the testsuite driver.
-Exit 99
+exit 99
diff --git a/t/gettext-macros.sh b/t/gettext-macros.sh
index b1349f6..1d94dad 100755
--- a/t/gettext-macros.sh
+++ b/t/gettext-macros.sh
@@ -18,7 +18,7 @@
# to the test cases requiring them.
# See also automake bug#9807.
-. ./defs || Exit 1
+. ./defs || exit 1
extract_program_version ()
{
diff --git a/t/gettext.sh b/t/gettext.sh
index a9181e4..a1925f1 100755
--- a/t/gettext.sh
+++ b/t/gettext.sh
@@ -17,7 +17,7 @@
# Check gettext support.
required='gettext'
-. ./defs || Exit 1
+. ./defs || exit 1
cat >>configure.ac <<END
AM_GNU_GETTEXT
diff --git a/t/gettext2.sh b/t/gettext2.sh
index 8b8a062..f3d91b0 100755
--- a/t/gettext2.sh
+++ b/t/gettext2.sh
@@ -18,7 +18,7 @@
# PR/338, reported by Charles Wilson.
required='gettext'
-. ./defs || Exit 1
+. ./defs || exit 1
cat >>configure.ac <<END
AM_GNU_GETTEXT([external])
@@ -49,7 +49,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/t/gettext3.sh b/t/gettext3.sh
index 9a39af2..bfeb922 100755
--- a/t/gettext3.sh
+++ b/t/gettext3.sh
@@ -17,7 +17,7 @@
# Check gettext 'AM_GNU_GETTEXT_INTL_SUBDIR' support.
required='gettext'
-. ./defs || Exit 1
+. ./defs || exit 1
cat >>configure.ac <<END
AM_GNU_GETTEXT([external])
diff --git a/t/gmake-vars.sh b/t/gmake-vars.sh
index 0c4012b..0691ae0 100755
--- a/t/gmake-vars.sh
+++ b/t/gmake-vars.sh
@@ -17,7 +17,7 @@
# Check that Automake does not warns about nested variables expansion,
# variables with non-POSIX names, or GNU make function calls.
-. ./defs || Exit 1
+. ./defs || exit 1
cat > Makefile.am <<'END'
define get-libname
diff --git a/t/gnits.sh b/t/gnits.sh
index badb8b0..f3de3b6 100755
--- a/t/gnits.sh
+++ b/t/gnits.sh
@@ -16,7 +16,7 @@
# Test to ensure --gnits version checking is correct.
-. ./defs || Exit 1
+. ./defs || exit 1
cat > configure.ac << END
AC_INIT([$me], [3.5.3.2])
diff --git a/t/gnits2.sh b/t/gnits2.sh
index e27a87e..6e4e1a4 100755
--- a/t/gnits2.sh
+++ b/t/gnits2.sh
@@ -17,7 +17,7 @@
# Test to ensure std-options checking is correct.
required='cc native'
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
@@ -98,7 +98,7 @@ $ACLOCAL
$AUTOCONF
$AUTOMAKE -a
-grep README-alpha Makefile.in && Exit 1
+grep README-alpha Makefile.in && exit 1
mkdir build
cd build
@@ -107,7 +107,7 @@ cd build
../configure "--prefix=$(pwd)/../inst-dir" --program-prefix=p
$MAKE all
$MAKE test-install
-$MAKE -k installcheck 2>stderr && { cat stderr >&2; Exit 1; }
+$MAKE -k installcheck 2>stderr && { cat stderr >&2; exit 1; }
cat stderr >&2
$MAKE grep-stderr
diff --git a/t/gnits3.sh b/t/gnits3.sh
index 544331d..b3a885e 100755
--- a/t/gnits3.sh
+++ b/t/gnits3.sh
@@ -17,7 +17,7 @@
# Check that AM_INSTALLCHECK_STD_OPTIONS_EXEMPT works.
required=cc
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
@@ -86,8 +86,8 @@ cd build
../configure "--prefix=$(pwd)/../inst-dir" --program-prefix=p
$MAKE
$MAKE install
-$MAKE installcheck && Exit 1
-$MAKE -k installcheck 2>stderr && { cat stderr >&2; Exit 1; }
+$MAKE installcheck && exit 1
+$MAKE -k installcheck 2>stderr && { cat stderr >&2; exit 1; }
cat stderr >&2
$MAKE grep-stderr
diff --git a/t/gnumake.sh b/t/gnumake.sh
index dd2fe37..7b1fbfe 100755
--- a/t/gnumake.sh
+++ b/t/gnumake.sh
@@ -17,7 +17,7 @@
# Automake should not assume that make files are called Makefile.
# Report from Braden McDaniel.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_CONFIG_FILES([sub/GNUmakefile])
diff --git a/t/gnuwarn.sh b/t/gnuwarn.sh
index 5aac432..1e468a0 100755
--- a/t/gnuwarn.sh
+++ b/t/gnuwarn.sh
@@ -16,7 +16,7 @@
# Check that Automake warns about user variables being overridden.
-. ./defs || Exit 1
+. ./defs || exit 1
# We need (almost) complete control over automake options.
AUTOMAKE="$am_original_AUTOMAKE -Werror"
@@ -47,7 +47,7 @@ AUTOMAKE_fails --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 --gnu -Wno-gnu
diff --git a/t/gnuwarn2.sh b/t/gnuwarn2.sh
index 6a68d65..0cdc710 100755
--- a/t/gnuwarn2.sh
+++ b/t/gnuwarn2.sh
@@ -16,7 +16,7 @@
# Check diagnostics about no-installman being disallowed in 'gnu'.
-. ./defs || Exit 1
+. ./defs || exit 1
cat > configure.ac << 'END'
AC_INIT([gnuwarn2], [1.0])
diff --git a/t/hdr-vars-defined-once.sh b/t/hdr-vars-defined-once.sh
index 58aca5a..a160c11 100755
--- a/t/hdr-vars-defined-once.sh
+++ b/t/hdr-vars-defined-once.sh
@@ -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
cat >> configure.ac <<END
AC_OUTPUT
diff --git a/t/header.sh b/t/header.sh
index dc93ac8..60d8ed1 100755
--- a/t/header.sh
+++ b/t/header.sh
@@ -23,7 +23,7 @@
# in the HEADERS variable for *all* generated Makefile.ins in the
# project.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_SUBST([MY_HEADERS])
@@ -41,5 +41,5 @@ END
$ACLOCAL
$AUTOMAKE
-grep 'address@hidden' Makefile.in && Exit 1
-Exit 0
+grep 'address@hidden' Makefile.in && exit 1
+exit 0
diff --git a/t/help-depend.sh b/t/help-depend.sh
index c69d564..1c2cb43 100755
--- a/t/help-depend.sh
+++ b/t/help-depend.sh
@@ -18,7 +18,7 @@
# the configure help screen.
# Keep this in sync with sister test 'help-depend2.test'
-. ./defs || Exit 1
+. ./defs || exit 1
cat > configure.ac <<END
AC_INIT([$me], [1.0])
diff --git a/t/help-depend2.sh b/t/help-depend2.sh
index 58a8342..b40b6f3 100755
--- a/t/help-depend2.sh
+++ b/t/help-depend2.sh
@@ -18,7 +18,7 @@
# dependency tracking, it adds proper text to the configure help screen.
# Keep this in sync with sister test 'help-depend.test'
-. ./defs || Exit 1
+. ./defs || exit 1
cat > configure.ac <<END
AC_INIT([$me], [1.0])
diff --git a/t/help-dmalloc.sh b/t/help-dmalloc.sh
index a9ab69f..7d2f10c 100755
--- a/t/help-dmalloc.sh
+++ b/t/help-dmalloc.sh
@@ -17,7 +17,7 @@
# Make sure that our macro 'AM_WITH_DMALLOC' adds proper text to
# the configure help screen.
-. ./defs || Exit 1
+. ./defs || exit 1
cat > configure.ac <<END
AC_INIT([$me], [1.0])
diff --git a/t/help-init.sh b/t/help-init.sh
index d1cff1c..0ae47dd 100755
--- a/t/help-init.sh
+++ b/t/help-init.sh
@@ -17,7 +17,7 @@
# Make sure that our grand macro 'AM_INIT_AUTOMAKE' add proper text
# to the configure help screen.
-. ./defs || Exit 1
+. ./defs || exit 1
cat > configure.ac <<END
AC_INIT([$me], [1.0])
@@ -27,7 +27,7 @@ END
$ACLOCAL
$AUTOCONF
-./configure --help >stdout || { cat stdout; Exit 1; }
+./configure --help >stdout || { cat stdout; exit 1; }
cat stdout
grep '^ --program-prefix[= ]' stdout
diff --git a/t/help-lispdir.sh b/t/help-lispdir.sh
index ca1ddfc..2dd9df3 100755
--- a/t/help-lispdir.sh
+++ b/t/help-lispdir.sh
@@ -17,7 +17,7 @@
# Make sure that our macro 'AM_PATH_LISPDIR' adds proper text to
# the configure help screen.
-. ./defs || Exit 1
+. ./defs || exit 1
cat > configure.ac <<END
AC_INIT([$me], [1.0])
@@ -27,7 +27,7 @@ END
$ACLOCAL
$AUTOCONF
-./configure --help >stdout || { cat stdout; Exit 1; }
+./configure --help >stdout || { cat stdout; exit 1; }
cat stdout
grep_configure_help --with-lispdir ' override.*lisp directory'
diff --git a/t/help-multilib.sh b/t/help-multilib.sh
index c2a8d3c..d4f6402 100755
--- a/t/help-multilib.sh
+++ b/t/help-multilib.sh
@@ -19,7 +19,7 @@
# FIXME: the features tested by this script has been moved in contrib.
# FIXME: We should move this script accordingly.
-. ./defs || Exit 1
+. ./defs || exit 1
cat > configure.ac <<END
AC_INIT([$me], [1.0])
diff --git a/t/help-python.sh b/t/help-python.sh
index 501b545..dcbcfe8 100755
--- a/t/help-python.sh
+++ b/t/help-python.sh
@@ -17,7 +17,7 @@
# Make sure that macro 'AM_PATH_PYTHON' adds proper text to the
# configure help screen.
-. ./defs || Exit 1
+. ./defs || exit 1
cat > configure.ac <<END
AC_INIT([$me], [1.0])
diff --git a/t/help-silent.sh b/t/help-silent.sh
index dbf45a0..601666c 100755
--- a/t/help-silent.sh
+++ b/t/help-silent.sh
@@ -17,7 +17,7 @@
# Make sure configure options relative to automake silent rules are
# added to the configure help screen.
-. ./defs || Exit 1
+. ./defs || exit 1
: > Makefile.am
$ACLOCAL
diff --git a/t/help-upc.sh b/t/help-upc.sh
index b81b387..822eadf 100755
--- a/t/help-upc.sh
+++ b/t/help-upc.sh
@@ -17,7 +17,7 @@
# Make sure that our macro 'AM_PROG_UPC' adds proper text to
# the configure help screen.
-. ./defs || Exit 1
+. ./defs || exit 1
cat > configure.ac <<END
AC_INIT([$me], [1.0])
diff --git a/t/help.sh b/t/help.sh
index ae91877..2c8175c 100755
--- a/t/help.sh
+++ b/t/help.sh
@@ -17,7 +17,7 @@
# Make sure --help and --version work, even when no configure.ac nor
# configure.in is in the current directory.
-. ./defs || Exit 1
+. ./defs || exit 1
# Ensure we run in an empty directory.
mkdir emptydir
@@ -35,7 +35,7 @@ $AUTOMAKE --help
# Sanity checks: aclocal and automake cannot work without configure.ac
# nor configure.in.
-$ACLOCAL 2>stderr && { cat stderr >&2; Exit 1; }
+$ACLOCAL 2>stderr && { cat stderr >&2; exit 1; }
cat stderr >&2
$FGREP configure.ac stderr
AUTOMAKE_fails
diff --git a/t/help2.sh b/t/help2.sh
index 0d433f4..fad2b29 100755
--- a/t/help2.sh
+++ b/t/help2.sh
@@ -16,7 +16,7 @@
# Make sure --help and --version work, even when the current directory
# contains a broken configure.ac and a broken acinclude.m4.
-. ./defs || Exit 1
+. ./defs || exit 1
# Ensure we run in a new, clean directory.
mkdir cleandir
@@ -36,14 +36,14 @@ $ACLOCAL --version
$ACLOCAL --help
# Sanity check: aclocal cannot work with broken acinclude.m4.
-$ACLOCAL 2>stderr && { cat stderr >&2; Exit 1; }
+$ACLOCAL 2>stderr && { cat stderr >&2; exit 1; }
cat stderr >&2
$FGREP acinclude.m4 stderr
rm -f acinclude.m4
# Sanity checks: aclocal and automake cannot work with broken configure.ac.
-$ACLOCAL 2>stderr && { cat stderr >&2; Exit 1; }
+$ACLOCAL 2>stderr && { cat stderr >&2; exit 1; }
cat stderr >&2
$FGREP configure.ac stderr
AUTOMAKE_fails
diff --git a/t/help3.sh b/t/help3.sh
index 54e06d5..368c456 100755
--- a/t/help3.sh
+++ b/t/help3.sh
@@ -16,7 +16,7 @@
# Make sure --help and --version takes precedence over other options.
-. ./defs || Exit 1
+. ./defs || exit 1
# We must have full control over the content of the current directory.
mkdir cleandir
@@ -40,9 +40,9 @@ pkgdata_DATA =
END
$ACLOCAL --force --help --output=foo.m4
-test ! -r foo.m4
+test ! -e foo.m4
$ACLOCAL --output=foo.m4 --version --force
-test ! -r foo.m4
+test ! -e foo.m4
# Sanity check.
$ACLOCAL --output=foo.m4 --force
test -f foo.m4
@@ -50,9 +50,9 @@ test -f foo.m4
mv -f foo.m4 aclocal.m4 # autoconf will need aclocal.m4
$AUTOMAKE --add-missing --help --copy
-test ! -r install-sh
+test ! -e install-sh
$AUTOMAKE --copy --version --add-mising
-test ! -r install-sh
+test ! -e install-sh
# Sanity check.
$AUTOMAKE --add-missing --copy
test -f install-sh
diff --git a/t/help4.sh b/t/help4.sh
index d51e0c4..775a3ab 100755
--- a/t/help4.sh
+++ b/t/help4.sh
@@ -17,7 +17,7 @@
# Check that the first among --help and --version to be specified on
# the command line takes precedence over the following one.
-. ./defs || Exit 1
+. ./defs || exit 1
# Ensure we run in an empty directory.
mkdir emptydir
@@ -31,24 +31,24 @@ AUTOMAKE=$am_original_AUTOMAKE
escape_dots () { sed 's/\./\\./g'; } # Avoid issues with "\" in backquotes.
apiversion_rx=$(echo "$APIVERSION" | escape_dots)
-$ACLOCAL --version --help >stdout || { cat stdout; Exit 1; }
+$ACLOCAL --version --help >stdout || { cat stdout; exit 1; }
cat stdout
grep "^aclocal.*$apiversion_rx" stdout
-grep "^Usage" stdout && Exit 1
+grep "^Usage" stdout && exit 1
-$ACLOCAL --help --version >stdout || { cat stdout; Exit 1; }
+$ACLOCAL --help --version >stdout || { cat stdout; exit 1; }
cat stdout
grep "^Usage" stdout
-grep "^aclocal.*$apiversion_rx" stdout && Exit 1
+grep "^aclocal.*$apiversion_rx" stdout && exit 1
-$AUTOMAKE --version --help >stdout || { cat stdout; Exit 1; }
+$AUTOMAKE --version --help >stdout || { cat stdout; exit 1; }
cat stdout
grep "^automake.*$apiversion_rx" stdout
-grep "^Usage" stdout && Exit 1
+grep "^Usage" stdout && exit 1
-$AUTOMAKE --help --version >stdout || { cat stdout; Exit 1; }
+$AUTOMAKE --help --version >stdout || { cat stdout; exit 1; }
cat stdout
grep "^Usage" stdout
-grep "^automake.*$apiversion_rx" stdout && Exit 1
+grep "^automake.*$apiversion_rx" stdout && exit 1
:
diff --git a/t/hfs.sh b/t/hfs.sh
index 6000040..fae069f 100755
--- a/t/hfs.sh
+++ b/t/hfs.sh
@@ -20,7 +20,7 @@
# Darwin).
# Report from Peter O'Gorman.
-. ./defs || Exit 1
+. ./defs || exit 1
echo AC_OUTPUT >>configure.ac
: >CHANGELOG
diff --git a/t/implicit.sh b/t/implicit.sh
index a9a068b..86d6032 100755
--- a/t/implicit.sh
+++ b/t/implicit.sh
@@ -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.ac << 'END'
AC_PROG_CC
diff --git a/t/info.sh b/t/info.sh
index b0b240f..e00e9e9 100755
--- a/t/info.sh
+++ b/t/info.sh
@@ -18,7 +18,7 @@
# FIXME: This test is probably obsoleted, or wrong. The generated
# Makefile.in seems not to define any 'INFOS' variable!
-. ./defs || Exit 1
+. ./defs || exit 1
cat > Makefile.am << 'END'
info_TEXINFOS = foo.texi
@@ -36,7 +36,7 @@ for i in $(grep '^INFOS =' Makefile.in | sed -e 's/^INFOS =
//'); do
foo*)
;;
*)
- Exit 1
+ exit 1
;;
esac
done
diff --git a/t/init.sh b/t/init.sh
index d576814..94cdd64 100755
--- a/t/init.sh
+++ b/t/init.sh
@@ -17,7 +17,7 @@
# Make sure we give a sensible error message when AC_INIT and
# AM_INIT_AUTOMAKE are both given less than two arguments.
-. ./defs || Exit 1
+. ./defs || exit 1
for ac_init_args in '' '([x])'; do
for am_init_args in '' '([1.10])'; do
@@ -28,9 +28,9 @@ for ac_init_args in '' '([x])'; do
END
cat configure.ac # For debugging.
# The error message should mention AC_INIT, not AC_PACKAGE_VERSION.
- ($ACLOCAL && $AUTOCONF) 2>stderr && { cat stderr >&2; Exit 1; }
+ ($ACLOCAL && $AUTOCONF) 2>stderr && { cat stderr >&2; exit 1; }
cat stderr >&2
- $FGREP AC_PACKAGE_VERSION stderr && Exit 1
+ $FGREP AC_PACKAGE_VERSION stderr && exit 1
grep 'configure\.ac:.* AC_INIT .*arguments' stderr
done
done
diff --git a/t/init2.sh b/t/init2.sh
index 44e79cb..fa2a065 100755
--- a/t/init2.sh
+++ b/t/init2.sh
@@ -17,7 +17,7 @@
# Make sure we give a sensible error message when AM_INIT_AUTOMAKE
# contains junk.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >configure.ac <<END
AC_INIT([init2], [1.0])
@@ -27,4 +27,4 @@ END
$ACLOCAL
AUTOMAKE_fails
grep 'nosuchoption.*recognized' stderr
-Exit 0
+exit 0
diff --git a/t/insh2.sh b/t/insh2.sh
index 8db2d57..9d1a3a1 100755
--- a/t/insh2.sh
+++ b/t/insh2.sh
@@ -16,7 +16,7 @@
# Test for bug where install-sh not included in distribution.
-. ./defs || Exit 1
+. ./defs || exit 1
echo AC_OUTPUT >> configure.ac
diff --git a/t/install-info-dir.sh b/t/install-info-dir.sh
index 0b0521b..39995fc 100755
--- a/t/install-info-dir.sh
+++ b/t/install-info-dir.sh
@@ -22,7 +22,7 @@
# FIXME: and could be merged with 'txinfo27.test'.
required=makeinfo
-. ./defs || Exit 1
+. ./defs || exit 1
cwd=$(pwd) || fatal_ "cannot get current working directory"
@@ -91,8 +91,8 @@ if test $have_installinfo = yes; then
$FGREP 'Does nothing at all, but has a nice name' $instdir/info/dir
$MAKE uninstall
- test ! -f $instdir/info/foo.info
- $FGREP 'but has a nice name' $instdir/info/dir && Exit 1
+ test ! -e $instdir/info/foo.info
+ $FGREP 'but has a nice name' $instdir/info/dir && exit 1
dir="$destdir/$cwd/$instdir/info"
@@ -101,8 +101,8 @@ if test $have_installinfo = yes; then
test -f "$dir"/dir
$FGREP 'Does nothing at all, but has a nice name' "$dir"/dir
$MAKE DESTDIR="$cwd/$destdir" uninstall
- test ! -f "$dir"/foo.info
- $FGREP 'but has a nice name' "$dir"/dir && Exit 1
+ test ! -e "$dir"/foo.info
+ $FGREP 'but has a nice name' "$dir"/dir && exit 1
unset dir
@@ -118,11 +118,11 @@ echo error from install-info >&2
exit 127
END
chmod a+x bin/install-info
-$MAKE install-info >output 2>&1 || { cat output; Exit 1; }
+$MAKE install-info >output 2>&1 || { cat output; exit 1; }
cat output
test -f $instdir/info/foo.info
-test ! -f $instdir/info/dir
-grep 'error from install-info' output && Exit 1
+test ! -e $instdir/info/dir
+grep 'error from install-info' output && exit 1
rm -rf $instdir output
@@ -144,9 +144,9 @@ END
test -f $instdir/info/foo.info
test -f $instdir/info/dir
$MAKE uninstall
- test ! -f $instdir/info/foo.info
+ test ! -e $instdir/info/foo.info
test -f $instdir/info/dir
- $FGREP 'but has a nice name' $instdir/info/dir && Exit 1
+ $FGREP 'but has a nice name' $instdir/info/dir && exit 1
: For shells with busted 'set -e'.
fi
@@ -159,7 +159,7 @@ for val in no NO n; do
rm -rf $instdir
env AM_UPDATE_INFO_DIR="$val" $MAKE install-info
test -f $instdir/info/foo.info
- test ! -f $instdir/info/dir
+ test ! -e $instdir/info/dir
done
$MAKE install-info
@@ -180,8 +180,8 @@ if test $have_installinfo = yes; then
test -f $instdir/info/foo.info
test -f $instdir/info/dir
env AM_UPDATE_INFO_DIR="$val" $MAKE uninstall
- test ! -f $instdir/info/foo.info
- $FGREP 'but has a nice name' $instdir/info/dir && Exit 1
+ test ! -e $instdir/info/foo.info
+ $FGREP 'but has a nice name' $instdir/info/dir && exit 1
: For shells with busted 'set -e'.
done
fi
diff --git a/t/install2.sh b/t/install2.sh
index bd400f4..96d1c56 100755
--- a/t/install2.sh
+++ b/t/install2.sh
@@ -18,7 +18,7 @@
# From Pavel Roskin.
am_create_testdir=empty
-. ./defs || Exit 1
+. ./defs || exit 1
cat > configure.ac << END
AC_INIT([$me], [1.0])
@@ -46,7 +46,7 @@ test ! -r Makefile.am || skip_ "cannot drop file read
permissions"
# '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/t/installdir.sh b/t/installdir.sh
index 9b2bc57..1cef2c1 100755
--- a/t/installdir.sh
+++ b/t/installdir.sh
@@ -22,7 +22,7 @@
# installdirs is missing this. Ideally this would be an automatic
# feature of any exported target.
-. ./defs || Exit 1
+. ./defs || exit 1
echo AC_OUTPUT >> configure.ac
diff --git a/t/instdat.sh b/t/instdat.sh
index 0754a09..b6fad9d 100755
--- a/t/instdat.sh
+++ b/t/instdat.sh
@@ -17,7 +17,7 @@
# Test to see if defining INSTALL_DATA causes problems. From EGCS
# list.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac <<END
AC_SUBST([INSTALL_DATA])
@@ -28,5 +28,5 @@ END
$ACLOCAL
$AUTOMAKE
-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/t/instdat2.sh b/t/instdat2.sh
index 8773fc3..54d26a9 100755
--- a/t/instdat2.sh
+++ b/t/instdat2.sh
@@ -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.
@@ -62,7 +62,7 @@ pkgdata_SCRIPTS = script
##pkginclude_SCRIPTS = script
EOF
-$ACLOCAL || Exit 1
+$ACLOCAL || exit 1
$AUTOMAKE
# install-SCRIPTS targets.
@@ -86,4 +86,4 @@ EOF
diff expected produced
-Exit 0
+exit 0
diff --git a/t/instdir-cond.sh b/t/instdir-cond.sh
index abab752..d0be1a3 100755
--- a/t/instdir-cond.sh
+++ b/t/instdir-cond.sh
@@ -17,7 +17,7 @@
# Check against automake bug#10997: directories holding only
# conditionally-installed files should not be created unconditionally.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AM_CONDITIONAL([ENABLE_FOO], [false])
@@ -42,7 +42,7 @@ $AUTOCONF
./configure --prefix="$(pwd)/inst"
$MAKE install
-test ! -d inst/share/instdir-cond
-test ! -d inst/libexec/instdir-cond
+test ! -e inst/share/instdir-cond
+test ! -e inst/libexec/instdir-cond
:
diff --git a/t/instdir-cond2.sh b/t/instdir-cond2.sh
index 6be0883..8f386cc 100755
--- a/t/instdir-cond2.sh
+++ b/t/instdir-cond2.sh
@@ -21,7 +21,7 @@
# FIXME: So this test is still xfailing.
# See sister test 'instdir-cond.test' for the succeeding part.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AM_CONDITIONAL([ENABLE_FOO], [false])
@@ -46,6 +46,6 @@ $AUTOCONF
./configure --prefix="$(pwd)/inst"
$MAKE installdirs
-test ! -d inst || { find inst; Exit 1; }
+test ! -e inst || { find inst; exit 1; }
:
diff --git a/t/instdir-java.sh b/t/instdir-java.sh
index f39b3c1..4a68b74 100755
--- a/t/instdir-java.sh
+++ b/t/instdir-java.sh
@@ -17,7 +17,7 @@
# If $(javadir) is the empty string, then nothing should be installed there.
required=javac
-. ./defs || Exit 1
+. ./defs || exit 1
cat >>configure.ac <<'END'
AC_OUTPUT
@@ -48,13 +48,13 @@ $MAKE
xMAKE() { $MAKE javadir= "$@"; }
xMAKE install
-test ! -d "$instdir"
+test ! -e "$instdir"
xMAKE install DESTDIR="$destdir"
-test ! -d "$instdir"
-test ! -d "$destdir"
-xMAKE uninstall > stdout || { cat stdout; Exit 1; }
+test ! -e "$instdir"
+test ! -e "$destdir"
+xMAKE uninstall > stdout || { cat stdout; exit 1; }
cat stdout
-grep 'rm -f' stdout && Exit 1
+grep 'rm -f' stdout && exit 1
xMAKE uninstall DESTDIR="$destdir"
:
diff --git a/t/instdir-lisp.sh b/t/instdir-lisp.sh
index b7f04bf..bbdcdb4 100755
--- a/t/instdir-lisp.sh
+++ b/t/instdir-lisp.sh
@@ -17,7 +17,7 @@
# If $(lispdir) is the empty string, then nothing should be installed there.
required=emacs
-. ./defs || Exit 1
+. ./defs || exit 1
cat >>configure.ac <<'END'
AM_PATH_LISPDIR
@@ -45,13 +45,13 @@ $MAKE
xMAKE () { $MAKE lispdir= "$@"; }
xMAKE install
-test ! -d "$instdir"
+test ! -e "$instdir"
xMAKE install DESTDIR="$destdir"
-test ! -d "$instdir"
-test ! -d "$destdir"
-xMAKE uninstall > stdout || { cat stdout; Exit 1; }
+test ! -e "$instdir"
+test ! -e "$destdir"
+xMAKE uninstall > stdout || { cat stdout; exit 1; }
cat stdout
-grep 'rm -f' stdout && Exit 1
+grep 'rm -f' stdout && exit 1
xMAKE uninstall DESTDIR="$destdir"
:
diff --git a/t/instdir-ltlib.sh b/t/instdir-ltlib.sh
index 1361590..136374b 100755
--- a/t/instdir-ltlib.sh
+++ b/t/instdir-ltlib.sh
@@ -19,7 +19,7 @@
# This test exercises the libtool code paths.
required='cc libtoolize'
-. ./defs || Exit 1
+. ./defs || exit 1
cat >>configure.ac <<'END'
AC_PROG_CC
@@ -71,17 +71,17 @@ $MAKE
xMAKE() { $MAKE bindir= libdir= pyexecdir= "$@"; }
xMAKE install
-test ! -d "$instdir"
+test ! -e "$instdir"
xMAKE install DESTDIR="$destdir"
-test ! -d "$instdir"
-test ! -d "$destdir"
-xMAKE uninstall > stdout || { cat stdout; Exit 1; }
+test ! -e "$instdir"
+test ! -e "$destdir"
+xMAKE uninstall > stdout || { cat stdout; exit 1; }
cat stdout
# Creative quoting below to please maintainer-check.
-grep 'rm'' ' stdout && Exit 1
-xMAKE uninstall DESTDIR="$destdir" > stdout || { cat stdout; Exit 1; }
+grep 'rm'' ' stdout && exit 1
+xMAKE uninstall DESTDIR="$destdir" > stdout || { cat stdout; exit 1; }
cat stdout
# Creative quoting below to please maintainer-check.
-grep 'rm'' ' stdout && Exit 1
+grep 'rm'' ' stdout && exit 1
:
diff --git a/t/instdir-no-empty.sh b/t/instdir-no-empty.sh
index 45b341c..5223cd5 100755
--- a/t/instdir-no-empty.sh
+++ b/t/instdir-no-empty.sh
@@ -17,7 +17,7 @@
# An empty "foo_PRIMARY" declaration should *not* cause "make install"
# to create directory $(foodir). See automake bug#10997 and bug#11030.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac <<'END'
AC_SUBST([CC], [whatever])
@@ -106,14 +106,14 @@ doinst ()
./configure --prefix="$cwd/inst"
doinst
-test ! -d inst || { find inst; Exit 1; }
+test ! -e inst || { find inst; exit 1; }
$MAKE uninstall
doinst bin_SCRIPTS=foo.sh
test -f inst/bin/foo.sh
./configure
doinst DESTDIR="$cwd/dest"
-test ! -d dest || { find dest; Exit 1; }
+test ! -e dest || { find dest; exit 1; }
$MAKE uninstall
doinst DESTDIR="$cwd/dest" bin_SCRIPTS=foo.sh
test -f dest/usr/local/bin/foo.sh
diff --git a/t/instdir-prog.sh b/t/instdir-prog.sh
index 6523c34..957f6ef 100755
--- a/t/instdir-prog.sh
+++ b/t/instdir-prog.sh
@@ -19,7 +19,7 @@
# This test exercises the prog and libs code paths.
required=cc
-. ./defs || Exit 1
+. ./defs || exit 1
cat >>configure.ac <<'END'
AC_PROG_CC
@@ -71,17 +71,17 @@ xMAKE () { $MAKE bindir= libdir= pyexecdir= "$@"; }
export bindir libdir pyexecdir
xMAKE install
-test ! -d "$instdir"
+test ! -e "$instdir"
xMAKE install DESTDIR="$destdir"
-test ! -d "$instdir"
-test ! -d "$destdir"
-xMAKE uninstall > stdout || { cat stdout; Exit 1; }
+test ! -e "$instdir"
+test ! -e "$destdir"
+xMAKE uninstall > stdout || { cat stdout; exit 1; }
cat stdout
# Creative quoting below to please maintainer-check.
-grep 'rm'' ' stdout && Exit 1
-xMAKE uninstall DESTDIR="$destdir" > stdout || { cat stdout; Exit 1; }
+grep 'rm'' ' stdout && exit 1
+xMAKE uninstall DESTDIR="$destdir" > stdout || { cat stdout; exit 1; }
cat stdout
# Creative quoting below to please maintainer-check.
-grep 'rm'' ' stdout && Exit 1
+grep 'rm'' ' stdout && exit 1
:
diff --git a/t/instdir-python.sh b/t/instdir-python.sh
index 55e23c2..384b3b0 100755
--- a/t/instdir-python.sh
+++ b/t/instdir-python.sh
@@ -17,7 +17,7 @@
# If $(pythondir) is the empty string, then nothing should be installed there.
required=python
-. ./defs || Exit 1
+. ./defs || exit 1
cat >>configure.ac <<'END'
AM_PATH_PYTHON
@@ -49,13 +49,13 @@ $MAKE
xMAKE () { $MAKE pythondir= "$@"; }
xMAKE install
-test ! -d "$instdir"
+test ! -e "$instdir"
xMAKE install DESTDIR="$destdir"
-test ! -d "$instdir"
-test ! -d "$destdir"
-xMAKE uninstall > stdout || { cat stdout; Exit 1; }
+test ! -e "$instdir"
+test ! -e "$destdir"
+xMAKE uninstall > stdout || { cat stdout; exit 1; }
cat stdout
-grep 'rm -f' stdout && Exit 1
+grep 'rm -f' stdout && exit 1
xMAKE uninstall DESTDIR="$destdir"
:
diff --git a/t/instdir-texi.sh b/t/instdir-texi.sh
index 214e330..1defda4 100755
--- a/t/instdir-texi.sh
+++ b/t/instdir-texi.sh
@@ -18,7 +18,7 @@
# Likewise for the other install-* targets used for texinfo files.
required='makeinfo tex texi2dvi'
-. ./defs || Exit 1
+. ./defs || exit 1
dvips --help \
|| skip_ "dvips is missing"
@@ -59,13 +59,13 @@ ls -l
xMAKE () { $MAKE infodir= htmldir= dvidir= psdir= pdfdir= "$@"; }
xMAKE install install-html install-dvi install-ps install-pdf
-test ! -d "$instdir"
+test ! -e "$instdir"
xMAKE install install-html install-dvi install-ps install-pdf
DESTDIR="$destdir"
-test ! -d "$instdir"
-test ! -d "$destdir"
-xMAKE uninstall > stdout || { cat stdout; Exit 1; }
+test ! -e "$instdir"
+test ! -e "$destdir"
+xMAKE uninstall > stdout || { cat stdout; exit 1; }
cat stdout
-grep 'rm -f' stdout && Exit 1
+grep 'rm -f' stdout && exit 1
xMAKE uninstall DESTDIR="$destdir"
:
diff --git a/t/instdir.sh b/t/instdir.sh
index c30ce92..a8338a9 100755
--- a/t/instdir.sh
+++ b/t/instdir.sh
@@ -18,7 +18,7 @@
# This test only ensures this if $(foo_PRIMARY) is also empty, see
# instdir2.test and siblings instdir-*.test for nonempty contents.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >>configure.ac <<'END'
AC_SUBST([foodir], ['${datadir}'/foo])
@@ -61,13 +61,13 @@ xMAKE ()
}
xMAKE install
-test ! -d "$instdir"
+test ! -e "$instdir"
xMAKE install DESTDIR="$destdir"
-test ! -d "$instdir"
-test ! -d "$destdir"
-xMAKE uninstall > stdout || { cat stdout; Exit 1; }
+test ! -e "$instdir"
+test ! -e "$destdir"
+xMAKE uninstall > stdout || { cat stdout; exit 1; }
cat stdout
-grep 'rm -f' stdout && Exit 1
+grep 'rm -f' stdout && exit 1
xMAKE uninstall DESTDIR="$destdir"
:
diff --git a/t/instdir2.sh b/t/instdir2.sh
index c84d256..e791aa0 100755
--- a/t/instdir2.sh
+++ b/t/instdir2.sh
@@ -18,7 +18,7 @@
# This test ensures this also if $(foo_PRIMARY) is nonempty, see
# instdir.test.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >>configure.ac <<'END'
AC_SUBST([foodir], ['${datadir}'/foo])
@@ -83,13 +83,13 @@ xMAKE ()
}
xMAKE install
-test ! -d "$instdir"
+test ! -e "$instdir"
xMAKE install DESTDIR="$destdir"
-test ! -d "$instdir"
-test ! -d "$destdir"
-xMAKE uninstall > stdout || { cat stdout; Exit 1; }
+test ! -e "$instdir"
+test ! -e "$destdir"
+xMAKE uninstall > stdout || { cat stdout; exit 1; }
cat stdout
-grep 'rm -f' stdout && Exit 1
+grep 'rm -f' stdout && exit 1
xMAKE uninstall DESTDIR="$destdir"
:
diff --git a/t/instexec.sh b/t/instexec.sh
index c033ecd..f394d84 100755
--- a/t/instexec.sh
+++ b/t/instexec.sh
@@ -17,7 +17,7 @@
# Test for this bug: when a Makefile.am builds nothing, no
# install-exec target is generated.
-. ./defs || Exit 1
+. ./defs || exit 1
: > Makefile.am
diff --git a/t/instfail-info.sh b/t/instfail-info.sh
index 257f9a0..ee994df 100755
--- a/t/instfail-info.sh
+++ b/t/instfail-info.sh
@@ -20,7 +20,7 @@
# This test has a few sister tests, for java, info, libtool.
required='makeinfo'
-. ./defs || Exit 1
+. ./defs || exit 1
cat >>configure.ac <<END
AC_OUTPUT
@@ -56,7 +56,7 @@ for file in info1.info
do
chmod a-r $file
test ! -r $file || skip_ "cannot drop file read permissions"
- $MAKE install-data && Exit 1
+ $MAKE install-data && exit 1
chmod u+r $file
done
diff --git a/t/instfail-java.sh b/t/instfail-java.sh
index b602517..18525a4 100755
--- a/t/instfail-java.sh
+++ b/t/instfail-java.sh
@@ -20,7 +20,7 @@
# This is the java sister test of instfail.test.
required=javac
-. ./defs || Exit 1
+. ./defs || exit 1
cat >>configure.ac <<'END'
AC_OUTPUT
@@ -50,7 +50,7 @@ for file in java1.class
do
chmod a-r $file
test ! -r $file || skip_ "cannot drop file read permissions"
- $MAKE install-data && Exit 1
+ $MAKE install-data && exit 1
chmod u+r $file
done
diff --git a/t/instfail-libtool.sh b/t/instfail-libtool.sh
index b5a0d16..2b3bf2f 100755
--- a/t/instfail-libtool.sh
+++ b/t/instfail-libtool.sh
@@ -20,7 +20,7 @@
# This is the libtool sister test of instfail.test
required='cc libtool libtoolize'
-. ./defs || Exit 1
+. ./defs || exit 1
cat >>configure.ac <<END
AM_PROG_AR
@@ -66,16 +66,16 @@ for file in liblt1.la libltn1.la
do
chmod a-r $file
test ! -r $file || skip_ "cannot drop file read permissions"
- $MAKE install-exec && Exit 1
+ $MAKE install-exec && exit 1
chmod u+r $file
done
$MAKE unreadable-prog
-$MAKE install-exec && Exit 1
+$MAKE install-exec && exit 1
$MAKE readable-prog
$MAKE unreadable-progn
-$MAKE install-exec && Exit 1
+$MAKE install-exec && exit 1
$MAKE readable-progn
:
diff --git a/t/instfail.sh b/t/instfail.sh
index eb4c269..5f29c83 100755
--- a/t/instfail.sh
+++ b/t/instfail.sh
@@ -20,7 +20,7 @@
# This test has a few sister tests, for java, info, libtool.
required=cc
-. ./defs || Exit 1
+. ./defs || exit 1
cat >>configure.ac <<END
AC_PROG_CC
@@ -71,22 +71,22 @@ for file in lib1.a libn1.a
do
chmod a-r $file
test ! -r $file || skip_ "cannot drop file read permissions"
- $MAKE install-exec && Exit 1
+ $MAKE install-exec && exit 1
chmod u+r $file
done
$MAKE unreadable-prog
-$MAKE install-exec && Exit 1
+$MAKE install-exec && exit 1
$MAKE readable-prog
$MAKE unreadable-progn
-$MAKE install-exec && Exit 1
+$MAKE install-exec && exit 1
$MAKE readable-progn
if ! grep "^EMACS = no" Makefile; then
for file in lisp1.el lisp1.elc; do
chmod a-r $file
- $MAKE install-data && Exit 1
+ $MAKE install-data && exit 1
chmod u+r $file
done
fi
diff --git a/t/insthook.sh b/t/insthook.sh
index 6c18d24..117255e 100755
--- a/t/insthook.sh
+++ b/t/insthook.sh
@@ -16,7 +16,7 @@
# Make sure the install-exec-hook example we give in the manual works.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >>configure.ac <<'EOF'
AC_PROG_LN_S
diff --git a/t/instman.sh b/t/instman.sh
index 114dc71..612f9a8 100755
--- a/t/instman.sh
+++ b/t/instman.sh
@@ -17,7 +17,7 @@
# Make sure the MKDIR_P invocation is correct in install-man
# target. Bug reported by Gordon Irlam <address@hidden>.
-. ./defs || Exit 1
+. ./defs || exit 1
echo AC_OUTPUT >> configure.ac
diff --git a/t/instmany-mans.sh b/t/instmany-mans.sh
index b9e250a..0f4c7a2 100755
--- a/t/instmany-mans.sh
+++ b/t/instmany-mans.sh
@@ -18,7 +18,7 @@
# This is the mans sister test of instmany.test, see there for details.
-. ./defs || Exit 1
+. ./defs || exit 1
# In order to have a useful test on modern systems (which have a high
# limit, if any), use a fake install program that errors out for more
@@ -128,13 +128,13 @@ srcdir=../../$subdir
for file in page3.1 page$nfiles.1 npage3.1 npage$nfiles.1; do
chmod a-r $srcdir/$file
test ! -r $srcdir/$file || skip_ "cannot drop file read permissions"
- $MAKE install-man1 && Exit 1
+ $MAKE install-man1 && exit 1
chmod u+r $srcdir/$file
done
for file in page3.man page$nfiles.man npage3.man npage$nfiles.man; do
chmod a-r $srcdir/$file
- $MAKE install-man3 && Exit 1
+ $MAKE install-man3 && exit 1
chmod u+r $srcdir/$file
done
diff --git a/t/instmany-python.sh b/t/instmany-python.sh
index 458e62b..c11a367 100755
--- a/t/instmany-python.sh
+++ b/t/instmany-python.sh
@@ -19,7 +19,7 @@
# This is the python sister test of instmany.test, see there for details.
required='python'
-. ./defs || Exit 1
+. ./defs || exit 1
limit=2500
subdir=long_subdir_name_with_many_characters
@@ -116,14 +116,14 @@ for file in python3.py python$nfiles.py
do
chmod a-r $srcdir/$file
test ! -r $srcdir/$file || skip_ "cannot drop file read permissions"
- $MAKE install && Exit 1
+ $MAKE install && exit 1
chmod u+r $srcdir/$file
done
for file in npython3.py npython$nfiles.py
do
chmod a-r $srcdir/$file
- $MAKE install && Exit 1
+ $MAKE install && exit 1
chmod u+r $srcdir/$file
done
diff --git a/t/instmany.sh b/t/instmany.sh
index b911492..f91a5f1 100755
--- a/t/instmany.sh
+++ b/t/instmany.sh
@@ -26,7 +26,7 @@
# For texinfos, we expand names using $(srcdir) in the first place.
# Let's hope nobody uses many texinfos.
-. ./defs || Exit 1
+. ./defs || exit 1
# In order to have a useful test on modern systems (which have a high
# limit, if any), use a fake install program that errors out for more
@@ -143,42 +143,42 @@ for file in script3 script$nfiles
do
chmod a-r $srcdir/$file
test ! -r $srcdir/$file || skip_ "cannot drop file read permissions"
- $MAKE install-binSCRIPTS && Exit 1
+ $MAKE install-binSCRIPTS && exit 1
chmod u+r $srcdir/$file
done
for file in nscript3 nscript$nfiles
do
chmod a-r $srcdir/$file
- $MAKE install-nobase_binSCRIPTS && Exit 1
+ $MAKE install-nobase_binSCRIPTS && exit 1
chmod u+r $srcdir/$file
done
for file in data3 data$nfiles
do
chmod a-r $srcdir/$file
- $MAKE install-dataDATA && Exit 1
+ $MAKE install-dataDATA && exit 1
chmod u+r $srcdir/$file
done
for file in ndata3 ndata$nfiles
do
chmod a-r $srcdir/$file
- $MAKE install-nobase_dataDATA && Exit 1
+ $MAKE install-nobase_dataDATA && exit 1
chmod u+r $srcdir/$file
done
for file in header3.h header$nfiles.h
do
chmod a-r $srcdir/$file
- $MAKE install-includeHEADERS && Exit 1
+ $MAKE install-includeHEADERS && exit 1
chmod u+r $srcdir/$file
done
for file in nheader3.h nheader$nfiles.h
do
chmod a-r $srcdir/$file
- $MAKE install-nobase_includeHEADERS && Exit 1
+ $MAKE install-nobase_includeHEADERS && exit 1
chmod u+r $srcdir/$file
done
diff --git a/t/instsh.sh b/t/instsh.sh
index 1fd1b3b..e7924b2 100755
--- a/t/instsh.sh
+++ b/t/instsh.sh
@@ -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
: > Makefile.am
rm -f install-sh
@@ -34,6 +34,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/t/instsh2.sh b/t/instsh2.sh
index 054beb9..9e6182c 100755
--- a/t/instsh2.sh
+++ b/t/instsh2.sh
@@ -17,13 +17,13 @@
# Various install-sh checks.
am_create_testdir=empty
-. ./defs || Exit 1
+. ./defs || exit 1
get_shell_script install-sh
# 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.
@@ -76,8 +76,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'
@@ -88,9 +88,9 @@ test -f 'a b'
# Ensure we do not run into 'test' operator precedence bugs with Tru64 sh.
for c in = '(' ')' '!'; do
- ./install-sh $c 2>stderr && { cat stderr >&2; Exit 1; }
+ ./install-sh $c 2>stderr && { cat stderr >&2; exit 1; }
cat stderr >&2
- grep 'test: ' stderr && Exit 1
+ grep 'test: ' stderr && exit 1
# Skip tests if the file system is not capable.
mkdir ./$c || continue
rmdir ./$c
diff --git a/t/instsh3.sh b/t/instsh3.sh
index 3a527cb..f823893 100755
--- a/t/instsh3.sh
+++ b/t/instsh3.sh
@@ -18,7 +18,7 @@
am_create_testdir=empty
required=non-root
-. ./defs || Exit 1
+. ./defs || exit 1
# Solaris /usr/ucb/touch does not accept -t.
touch -t $old_timestamp foo \
diff --git a/t/instspc.tap b/t/instspc.tap
index 410e1ca..b0b4e0d 100755
--- a/t/instspc.tap
+++ b/t/instspc.tap
@@ -19,7 +19,7 @@
# Original report from James Amundson about file names with spaces.
# Other characters added by Paul Eggert.
-. ./defs || Exit 99
+. ./defs || exit 99
# Usage: is_in_list ITEM [LIST...]
is_in_list ()
diff --git a/t/internals.tap b/t/internals.tap
index 2c2fccd..aaf6b93 100755
--- a/t/internals.tap
+++ b/t/internals.tap
@@ -17,7 +17,7 @@
# Test some generic Automake-provided internal macros and make functions.
am_create_testdir=empty
-. ./defs || Exit 1
+. ./defs || exit 1
plan_ 8
diff --git a/t/interp.sh b/t/interp.sh
index b45d449..766e878 100755
--- a/t/interp.sh
+++ b/t/interp.sh
@@ -16,7 +16,7 @@
# Test to make sure variable interpolation works.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
diff --git a/t/interp2.sh b/t/interp2.sh
index 3ce33e2..5da8a61 100755
--- a/t/interp2.sh
+++ b/t/interp2.sh
@@ -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.ac << 'END'
AC_PROG_CC
diff --git a/t/interp3.sh b/t/interp3.sh
index 1394c6d..b0ed1c7 100755
--- a/t/interp3.sh
+++ b/t/interp3.sh
@@ -21,7 +21,7 @@
# test case).
required=cc
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
diff --git a/t/java-check.sh b/t/java-check.sh
index 15c0e45..c9ae66c 100755
--- a/t/java-check.sh
+++ b/t/java-check.sh
@@ -19,7 +19,7 @@
# See automake bug#8234.
required=javac
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_OUTPUT
@@ -46,7 +46,7 @@ inst=$(pwd)/_inst
./configure --prefix="$inst"
$MAKE
-ls | $EGREP '\.(class|stamp)$' && Exit 1
+ls | $EGREP '\.(class|stamp)$' && exit 1
# Make Two.java compilable.
echo '}' >> Two.java
@@ -57,8 +57,8 @@ ls -l # For debugging.
test -f One.class
test -f Two.class
# ... but should *not* install them.
-$FGREP checkdir Makefile && Exit 1
+$FGREP checkdir Makefile && exit 1
$MAKE install
-test -d _inst && Exit 1
+test -d _inst && exit 1
:
diff --git a/t/java-clean.sh b/t/java-clean.sh
index 2399201..5457f19 100755
--- a/t/java-clean.sh
+++ b/t/java-clean.sh
@@ -17,7 +17,7 @@
# Test cleaning of Java class files and timestamps.
required=javac
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac <<'END'
AC_OUTPUT
@@ -55,7 +55,7 @@ for base in '' Nobase; do
done
done
$MAKE clean
-find . -name '*.class' -o -name '*.stamp' | grep . && Exit 1
+find . -name '*.class' -o -name '*.stamp' | grep . && exit 1
# We should not remove unrelated stamp files.
echo timestamp > classjava2.stamp
echo timestamp > classdist_java.stamp
diff --git a/t/java-compile-install.sh b/t/java-compile-install.sh
index 5c19905..70d3e5a 100755
--- a/t/java-compile-install.sh
+++ b/t/java-compile-install.sh
@@ -17,7 +17,7 @@
# Test on compilation and installation of Java class files.
required=javac
-. ./defs || Exit 1
+. ./defs || exit 1
cat >>configure.ac <<'EOF'
AC_OUTPUT
diff --git a/t/java-compile-run-flat.sh b/t/java-compile-run-flat.sh
index 9d0aa04..b85104c 100755
--- a/t/java-compile-run-flat.sh
+++ b/t/java-compile-run-flat.sh
@@ -25,7 +25,7 @@
required='java javac'
am_serial_tests=yes
-. ./defs || Exit 1
+. ./defs || exit 1
echo "AC_SUBST([PATH_SEPARATOR], ['$PATH_SEPARATOR'])" >> configure.ac
diff --git a/t/java-compile-run-nested.sh b/t/java-compile-run-nested.sh
index a217b6f..dd39df9 100755
--- a/t/java-compile-run-nested.sh
+++ b/t/java-compile-run-nested.sh
@@ -25,7 +25,7 @@
# the use of the older 'serial-tests' driver.
required='java javac'
-. ./defs || Exit 1
+. ./defs || exit 1
echo "AC_SUBST([PATH_SEPARATOR], ['$PATH_SEPARATOR'])" >> configure.ac
diff --git a/t/java-empty-classpath.sh b/t/java-empty-classpath.sh
index 9ec48b2..c54da0b 100755
--- a/t/java-empty-classpath.sh
+++ b/t/java-empty-classpath.sh
@@ -18,7 +18,7 @@
# compilation time. See automake bug#9306.
required=javac
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac <<'END'
AC_CONFIG_SRCDIR([org/gnu/bug/Library.java])
diff --git a/t/java-extra.sh b/t/java-extra.sh
index f2fc76d..7b3a759 100755
--- a/t/java-extra.sh
+++ b/t/java-extra.sh
@@ -20,7 +20,7 @@
# conditionals).
required=javac
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AM_CONDITIONAL([COND], [test x"$cond" = x"yes"])
@@ -57,8 +57,8 @@ $MAKE
ls -l
test -f Class1.class
test -f Class2.class
-test ! -f Class3.class
-test ! -f Class3.java
+test ! -e Class3.class
+test ! -e Class3.java
$MAKE distclean
@@ -66,7 +66,7 @@ $MAKE distclean
$MAKE
ls -l
test -f Class1.class
-test ! -f Class2.class
+test ! -e Class2.class
test -f Class3.class
test -f Class3.java
diff --git a/t/java-mix.sh b/t/java-mix.sh
index 6ec9185..25e8511 100755
--- a/t/java-mix.sh
+++ b/t/java-mix.sh
@@ -19,7 +19,7 @@
# modifiers. Also check that '.java' files are not distributed by
# default.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_OUTPUT
@@ -50,7 +50,7 @@ $AUTOCONF
# Automake used to display non-fatal warnings with this test, but
# they were unexpected, so we want to consider them as failures in
# this test.
-$AUTOMAKE 2>stderr || { cat stderr >&2; Exit 1; }
+$AUTOMAKE 2>stderr || { cat stderr >&2; exit 1; }
cat stderr >&2
test ! -s stderr
@@ -58,11 +58,11 @@ test ! -s stderr
$MAKE distdir
ls -l $distdir # For debugging.
-test ! -f $distdir/Class.java
+test ! -e $distdir/Class.java
test -f $distdir/ClassDist.java
-test ! -f $distdir/ClassNobase.java
+test ! -e $distdir/ClassNobase.java
test -f $distdir/ClassNobaseDist.java
-test ! -f $distdir/ClassNodist.java
-test ! -f $distdir/ClassNobaseNodist.java
+test ! -e $distdir/ClassNodist.java
+test ! -e $distdir/ClassNobaseNodist.java
:
diff --git a/t/java-no-duplicate.sh b/t/java-no-duplicate.sh
index d7ea5f2..b5ad9fc 100755
--- a/t/java-no-duplicate.sh
+++ b/t/java-no-duplicate.sh
@@ -17,7 +17,7 @@
# Test that some Java-related variables and rules are not repeatedly
# defined.
-. ./defs || Exit 1
+. ./defs || exit 1
cat > Makefile.am << 'END'
javadir = $(datadir)/java
diff --git a/t/java-nobase.sh b/t/java-nobase.sh
index f5137cb..12eeaaa 100755
--- a/t/java-nobase.sh
+++ b/t/java-nobase.sh
@@ -17,7 +17,7 @@
# Test support of 'nobase_' with the 'JAVA' primary.
required=javac
-. ./defs || Exit 1
+. ./defs || exit 1
cat >>configure.ac <<'END'
AC_OUTPUT
diff --git a/t/java-noinst.sh b/t/java-noinst.sh
index cf0c600..8bb3832 100755
--- a/t/java-noinst.sh
+++ b/t/java-noinst.sh
@@ -18,7 +18,7 @@
# be installed.
required=javac
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_OUTPUT
@@ -50,6 +50,6 @@ for i in 1 2 3 4 5 6; do
done
$MAKE install
-test -d _inst && { ls -l _inst; Exit 1; }
+test -d _inst && { ls -l _inst; exit 1; }
:
diff --git a/t/java-rebuild.sh b/t/java-rebuild.sh
index 7672943..5b5f296 100755
--- a/t/java-rebuild.sh
+++ b/t/java-rebuild.sh
@@ -17,7 +17,7 @@
# Test rebuild rules for Java class files.
required='javac'
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac <<'END'
AC_OUTPUT
diff --git a/t/java-sources.sh b/t/java-sources.sh
index 2de9683..532cb1f 100755
--- a/t/java-sources.sh
+++ b/t/java-sources.sh
@@ -17,7 +17,7 @@
# Test definition of automake-generated private Makefile variable
# '$(am__java_sources)'.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_OUTPUT
diff --git a/t/java-uninstall.sh b/t/java-uninstall.sh
index e637f6a..a128406 100755
--- a/t/java-uninstall.sh
+++ b/t/java-uninstall.sh
@@ -17,7 +17,7 @@
# Check uninstallation of Java class files.
required=javac
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_OUTPUT
@@ -61,11 +61,11 @@ javadir=_inst/java
check_uninstallation()
{
- test ! -r $javadir/aClass.class
- test ! -r $javadir/bClass.class
- test ! -r $javadir/Zardoz.class
- test ! -r $javadir/Baz.class
- test ! -r $javadir/Baz2.class
+ test ! -e $javadir/aClass.class
+ test ! -e $javadir/bClass.class
+ test ! -e $javadir/Zardoz.class
+ test ! -e $javadir/Baz.class
+ test ! -e $javadir/Baz2.class
test -f $javadir/Foo.class
test -f $javadir/Bar.class
test -f $javadir/xClass.class
diff --git a/t/java.sh b/t/java.sh
index 8ba2dc1..0103eea 100755
--- a/t/java.sh
+++ b/t/java.sh
@@ -17,7 +17,7 @@
# Minimal test of Java functionality.
required=javac
-. ./defs || Exit 1
+. ./defs || exit 1
cat >>configure.ac <<'EOF'
AC_OUTPUT
diff --git a/t/java2.sh b/t/java2.sh
index c0b9f95..286fdd6 100755
--- a/t/java2.sh
+++ b/t/java2.sh
@@ -18,7 +18,7 @@
# no classes to compile.
# Report from Braden McDaniel.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AM_CONDITIONAL(WITH_JDK, false)
diff --git a/t/java3.sh b/t/java3.sh
index 356d0c2..eab7203 100755
--- a/t/java3.sh
+++ b/t/java3.sh
@@ -18,7 +18,7 @@
# *.java files when there are none.
# Report from Johannes Nicolai (PR/441).
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AM_CONDITIONAL([WHO_CARES], [false])
@@ -46,10 +46,10 @@ $AUTOMAKE
$MAKE
$MAKE install
ls -l .
-find . -name '*.class' | grep . && Exit 1
+find . -name '*.class' | grep . && exit 1
# If we have nothing to install, we shouldn't create any installation
# directory. Related to automake bug#11030.
-test ! -d _inst
+test ! -e _inst
$MAKE uninstall
$MAKE distcheck
diff --git a/t/javadir-undefined.sh b/t/javadir-undefined.sh
index e2ed7f6..fb0872e 100755
--- a/t/javadir-undefined.sh
+++ b/t/javadir-undefined.sh
@@ -20,14 +20,14 @@
# the *.class files).
# See automake bug#8461.
-. ./defs || Exit 1
+. ./defs || exit 1
$ACLOCAL
echo java_JAVA = a.java > Makefile.am
AUTOMAKE_fails
grep '^Makefile\.am:1:.*java_JAVA.*javadir.* undefined' stderr
-$EGREP '(uninitialized|line) ' stderr && Exit 1
+$EGREP '(uninitialized|line) ' stderr && exit 1
echo javadir = a-dummy-value >> Makefile.am
$AUTOMAKE
diff --git a/t/javaflags.sh b/t/javaflags.sh
index f42e3c2..bbd8334 100755
--- a/t/javaflags.sh
+++ b/t/javaflags.sh
@@ -16,7 +16,7 @@
# Check support for $(JAVACFLAGS) and $(AM_JAVACFLAGS).
-. ./defs || Exit 1
+. ./defs || exit 1
cat > fake-javac <<'END'
#!/bin/sh
@@ -40,7 +40,7 @@ END
$ACLOCAL
$AUTOMAKE
-grep '\$(JAVACFLAGS).*\$(AM_JAVACFLAGS)' Makefile.in && Exit 1
+grep '\$(JAVACFLAGS).*\$(AM_JAVACFLAGS)' Makefile.in && exit 1
: > bar.java
diff --git a/t/javaprim.sh b/t/javaprim.sh
index fe55535..a5c4a62 100755
--- a/t/javaprim.sh
+++ b/t/javaprim.sh
@@ -16,7 +16,7 @@
# Test to make sure JAVA variable can be defined by AC_SUBST.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_SUBST([JAVA])
diff --git a/t/javasubst.sh b/t/javasubst.sh
index 455b8c6..b6929b8 100755
--- a/t/javasubst.sh
+++ b/t/javasubst.sh
@@ -16,7 +16,7 @@
# Test to make sure redefining JAVAC with AC_SUBST works.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_SUBST([JAVAC])
diff --git a/t/ldadd.sh b/t/ldadd.sh
index 8e16fb3..9487459 100755
--- a/t/ldadd.sh
+++ b/t/ldadd.sh
@@ -17,7 +17,7 @@
# Check to make sure incorrect LDADD usage is diagnosed.
required=libtool
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
@@ -38,7 +38,7 @@ END
: > config.sub
: > q.c
-$ACLOCAL || Exit 1
+$ACLOCAL || exit 1
AUTOMAKE_fails -Wno-extra-portability
grep "libtu_la_LDADD" stderr
grep " use 'libtu_la_LIBADD'" stderr
diff --git a/t/ldflags.sh b/t/ldflags.sh
index 269af34..7eb9be3 100755
--- a/t/ldflags.sh
+++ b/t/ldflags.sh
@@ -18,7 +18,7 @@
# PR 77.
required=libtool
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
diff --git a/t/lex-clean-cxx.sh b/t/lex-clean-cxx.sh
index 8834a74..a61dd98 100755
--- a/t/lex-clean-cxx.sh
+++ b/t/lex-clean-cxx.sh
@@ -20,7 +20,7 @@
# See also sister test 'lex-clean.test'.
required='c++ lex'
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CXX
@@ -103,10 +103,10 @@ for target in clean distclean; do
ls -l
test -f parsefoo.cxx
test -f bar-parsebar.cc
- test ! -r parsebaz.l++
- test ! -r parsebaz.c++
- test ! -r parsequx.lpp
- test ! -r qux-parsequx.cpp
+ test ! -e parsebaz.l++
+ test ! -e parsebaz.c++
+ test ! -e parsequx.lpp
+ test ! -e qux-parsequx.cpp
done
cp config.sav config.status
@@ -116,11 +116,11 @@ $MAKE maintainer-clean
ls -l
test -f parsefoo.lxx
test -f parsebar.ll
-test ! -r parsefoo.cxx
-test ! -r bar-parsebar.cc
+test ! -e parsefoo.cxx
+test ! -e bar-parsebar.cc
test -f parsefoo.lxx
test -f parsebar.ll
-test ! -r parsefoo.cxx
-test ! -r bar-parsebar.cc
+test ! -e parsefoo.cxx
+test ! -e bar-parsebar.cc
:
diff --git a/t/lex-clean.sh b/t/lex-clean.sh
index 18cf32e..91742bf 100755
--- a/t/lex-clean.sh
+++ b/t/lex-clean.sh
@@ -20,7 +20,7 @@
# See also sister test 'lex-clean-cxx.test'.
required='cc lex'
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
@@ -97,9 +97,9 @@ for target in clean distclean; do
test -f lexer.l
test -f lexer.c
test -f bar-lexer.c
- test ! -r baz.l
- test ! -r baz.c
- test ! -r qux-baz.c
+ test ! -e baz.l
+ test ! -e baz.c
+ test ! -e qux-baz.c
done
cp config.sav config.status
@@ -108,7 +108,7 @@ cp config.sav config.status
$MAKE maintainer-clean
ls -l
test -f lexer.l
-test ! -r lexer.c
-test ! -r bar-lexer.c
+test ! -e lexer.c
+test ! -e bar-lexer.c
:
diff --git a/t/lex-depend-cxx.sh b/t/lex-depend-cxx.sh
index c713d2e..ad2b0a6 100755
--- a/t/lex-depend-cxx.sh
+++ b/t/lex-depend-cxx.sh
@@ -18,7 +18,7 @@
# Test synthesized from PR automake/6.
required='c++ lex'
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CXX
diff --git a/t/lex-depend-grep.sh b/t/lex-depend-grep.sh
index 0fe32ed..4011b80 100755
--- a/t/lex-depend-grep.sh
+++ b/t/lex-depend-grep.sh
@@ -18,7 +18,7 @@
# in obvious ways. See PR automake/6, and related semantic tests
# 'lex-depend.test' and 'lex-depend-cxx.test'.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
diff --git a/t/lex-depend.sh b/t/lex-depend.sh
index 653ae8d..9d4f960 100755
--- a/t/lex-depend.sh
+++ b/t/lex-depend.sh
@@ -18,7 +18,7 @@
# Test suggested by PR automake/6.
required='cc lex'
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
@@ -79,7 +79,7 @@ $AUTOCONF
$MAKE
$MAKE test-deps-exist
-cross_compiling || test "$(./zoo)" = 'Hello, World!' || Exit 1
+cross_compiling || test "$(./zoo)" = 'Hello, World!' || exit 1
$sleep
cat >> my-hdr.h << 'END'
@@ -88,6 +88,6 @@ cat >> my-hdr.h << 'END'
END
$MAKE test-obj-updated
$MAKE
-cross_compiling || test "$(./zoo)" = 'Howdy, Earth!' || Exit 1
+cross_compiling || test "$(./zoo)" = 'Howdy, Earth!' || exit 1
:
diff --git a/t/lex-lib-external.sh b/t/lex-lib-external.sh
index 238a126..28f254b 100755
--- a/t/lex-lib-external.sh
+++ b/t/lex-lib-external.sh
@@ -18,7 +18,7 @@
# library, if that's available.
required='cc lex'
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
@@ -71,7 +71,7 @@ $MAKE have-lexlib || skip_ "no system-wide lex library found"
$MAKE all
if ! cross_compiling; then
echo GOOD | ./lexer
- echo BAD | ./lexer && Exit 1
+ echo BAD | ./lexer && exit 1
: For shells with busted 'set -e'.
fi
$MAKE distcheck
diff --git a/t/lex-lib.sh b/t/lex-lib.sh
index 0320f75..29e2ed8 100755
--- a/t/lex-lib.sh
+++ b/t/lex-lib.sh
@@ -19,7 +19,7 @@
# See also test 'lex-lib-external.test'.
required='cc lex'
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
diff --git a/t/lex-libobj.sh b/t/lex-libobj.sh
index 3e583cc..17bfc5d 100755
--- a/t/lex-libobj.sh
+++ b/t/lex-libobj.sh
@@ -18,7 +18,7 @@
# LIBOBJ machinery.
required='cc lex'
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
diff --git a/t/lex-line.sh b/t/lex-line.sh
index 3db979f..fc7ce17 100755
--- a/t/lex-line.sh
+++ b/t/lex-line.sh
@@ -20,7 +20,7 @@
# See also sister test 'yacc-line.test'.
required='cc lex'
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
@@ -86,15 +86,15 @@ for vpath in : false; do
ls -l . dir
$EGREP 'line|\.l' $c_outputs
- grep '#.*line.*build.*\.l' $c_outputs && Exit 1
+ grep '#.*line.*build.*\.l' $c_outputs && exit 1
# Adjusted "#line" should not contain reference to the absolute
# srcdir.
- $EGREP '#.*line *"?/.*\.l' $c_outputs && Exit 1
+ $EGREP '#.*line *"?/.*\.l' $c_outputs && exit 1
# Adjusted "#line" should not contain reference to the default
# output file names, e.g., 'lex.yy.c'.
- grep '#.*line.*lex\.yy' $c_outputs && Exit 1
+ grep '#.*line.*lex\.yy' $c_outputs && exit 1
# Look out for a silly regression.
- grep "#.*\.l.*\.l" $c_outputs && Exit 1
+ grep "#.*\.l.*\.l" $c_outputs && exit 1
if $vpath; then
grep '#.*line.*"\.\./zardoz\.l"' zardoz.c
grep '#.*line.*"\.\./dir/quux\.l"' dir/bar-quux.c
diff --git a/t/lex-nodist.sh b/t/lex-nodist.sh
index 2e90032..b2f7b29 100755
--- a/t/lex-nodist.sh
+++ b/t/lex-nodist.sh
@@ -21,7 +21,7 @@
# for yacc-generated .c and .h files.
required='cc lex'
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
diff --git a/t/lex-noyywrap.sh b/t/lex-noyywrap.sh
index 8b5feb9..335ed00 100755
--- a/t/lex-noyywrap.sh
+++ b/t/lex-noyywrap.sh
@@ -17,7 +17,7 @@
# Check Lex support with flex using the '%noyywrap' option.
required='cc flex'
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
@@ -65,7 +65,7 @@ $AUTOMAKE -a
$MAKE
if ! cross_compiling; then
echo GOOD | ./foo
- echo BAD | ./foo && Exit 1
+ echo BAD | ./foo && exit 1
: For shells with busted 'set -e'.
fi
diff --git a/t/lex-pr204.sh b/t/lex-pr204.sh
index 1fc64ad..535b482 100755
--- a/t/lex-pr204.sh
+++ b/t/lex-pr204.sh
@@ -21,7 +21,7 @@
# for yacc-generated .c and .h files.
required='cc lex'
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac <<'EOF'
AM_MAINTAINER_MODE
diff --git a/t/lex-subobj-nodep.sh b/t/lex-subobj-nodep.sh
index f2c9626..526e01b 100755
--- a/t/lex-subobj-nodep.sh
+++ b/t/lex-subobj-nodep.sh
@@ -18,7 +18,7 @@
# tracking is disabled.
required='cc lex'
-. ./defs || Exit 1
+. ./defs || exit 1
cat >>configure.ac <<\END
AC_PROG_CC
diff --git a/t/lex.sh b/t/lex.sh
index d3d256a..34a1493 100755
--- a/t/lex.sh
+++ b/t/lex.sh
@@ -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
cat >> configure.ac << 'END'
AC_PROG_CC
@@ -35,6 +35,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/t/lex2.sh b/t/lex2.sh
index 4b20d14..bfdde02 100755
--- a/t/lex2.sh
+++ b/t/lex2.sh
@@ -16,7 +16,7 @@
# Make sure that Automake suggest using AM_PROG_LEX when a lexer is used.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
diff --git a/t/lex3.sh b/t/lex3.sh
index 70ccbdc..b8a0c36 100755
--- a/t/lex3.sh
+++ b/t/lex3.sh
@@ -19,7 +19,7 @@
# From Matthew D. Langston.
required='cc lex'
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
@@ -68,7 +68,7 @@ $AUTOMAKE -a
$MAKE
if ! cross_compiling; then
echo GOOD | ./foo
- echo BAD | ./foo && Exit 1
+ echo BAD | ./foo && exit 1
: For shells with busted 'set -e'.
fi
@@ -86,6 +86,6 @@ $MAKE distclean
test -f foo.c
./configure # Re-create 'Makefile'.
$MAKE maintainer-clean
-test ! -f foo.c
+test ! -e foo.c
:
diff --git a/t/lex5.sh b/t/lex5.sh
index 350ac3b..fda26dd 100755
--- a/t/lex5.sh
+++ b/t/lex5.sh
@@ -17,7 +17,7 @@
# Test for subdir lexers.
required='cc lex'
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
diff --git a/t/lexcpp.sh b/t/lexcpp.sh
index 717be0e..683f7ea 100755
--- a/t/lexcpp.sh
+++ b/t/lexcpp.sh
@@ -17,7 +17,7 @@
# Test to make sure Lex + C++ is supported.
# Please keep this is sync with sister test yaccpp.test.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CXX
diff --git a/t/lexvpath.sh b/t/lexvpath.sh
index c731692..2c13c96 100755
--- a/t/lexvpath.sh
+++ b/t/lexvpath.sh
@@ -23,7 +23,7 @@
# Please keep this in sync with sister test 'yaccvapth.test'.
required='cc lex'
-. ./defs || Exit 1
+. ./defs || exit 1
cat > lexoutroot.in << 'END'
LEX_OUTPUT_ROOT='@LEX_OUTPUT_ROOT@'
diff --git a/t/lflags.sh b/t/lflags.sh
index 98e03fc..3bf3ddf 100755
--- a/t/lflags.sh
+++ b/t/lflags.sh
@@ -20,7 +20,7 @@
# and yflags2.test.
required=cc
-. ./defs || Exit 1
+. ./defs || exit 1
cat >fake-lex <<'END'
#!/bin/sh
@@ -50,8 +50,8 @@ END
$ACLOCAL
$AUTOMAKE -a
-grep '\$(LFLAGS).*\$(bar_LFLAGS)' Makefile.in && Exit 1
-grep '\$(LFLAGS).*\$(AM_LFLAGS)' Makefile.in && Exit 1
+grep '\$(LFLAGS).*\$(bar_LFLAGS)' Makefile.in && exit 1
+grep '\$(LFLAGS).*\$(AM_LFLAGS)' Makefile.in && exit 1
: > foo.l
: > bar.l
diff --git a/t/lflags2.sh b/t/lflags2.sh
index c5b65ad..35b6e43 100755
--- a/t/lflags2.sh
+++ b/t/lflags2.sh
@@ -19,7 +19,7 @@
# Please keep this in sync with the sister tests lflags.test, yflags.test
# and yflags2.test.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >fake-lex <<'END'
#!/bin/sh
@@ -49,8 +49,8 @@ END
$ACLOCAL
$AUTOMAKE -a
-grep '\$(LFLAGS).*\$(bar_LFLAGS)' Makefile.in && Exit 1
-grep '\$(LFLAGS).*\$(AM_LFLAGS)' Makefile.in && Exit 1
+grep '\$(LFLAGS).*\$(bar_LFLAGS)' Makefile.in && exit 1
+grep '\$(LFLAGS).*\$(AM_LFLAGS)' Makefile.in && exit 1
: > foo.ll
: > bar.l++
diff --git a/t/libexec.sh b/t/libexec.sh
index 24a934d..e4255e0 100755
--- a/t/libexec.sh
+++ b/t/libexec.sh
@@ -16,7 +16,7 @@
# PROGRAMS and LIBRARIES can be installed in (pkg)libexecdir.
-. ./defs || Exit 1
+. ./defs || exit 1
cat > Makefile.am << 'END'
libexec_PROGRAMS = foo
diff --git a/t/libobj-basic.sh b/t/libobj-basic.sh
index 1165f1e..c730c52 100755
--- a/t/libobj-basic.sh
+++ b/t/libobj-basic.sh
@@ -17,7 +17,7 @@
# Make sure AC_LIBSOURCE and AC_LIBSOURCES work.
required=cc
-. ./defs || Exit 1
+. ./defs || exit 1
mv configure.ac configure.proto
cat >> configure.proto << 'END'
diff --git a/t/libobj10.sh b/t/libobj10.sh
index f19de74..1c0736b 100755
--- a/t/libobj10.sh
+++ b/t/libobj10.sh
@@ -18,7 +18,7 @@
# it's in BUILT_SOURCES. Reported by Erez Zadok.
required=cc
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
diff --git a/t/libobj12.sh b/t/libobj12.sh
index c3c0057..4c2b74d 100755
--- a/t/libobj12.sh
+++ b/t/libobj12.sh
@@ -17,7 +17,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
cat >> configure.ac << 'END'
AC_PROG_CC
diff --git a/t/libobj13.sh b/t/libobj13.sh
index ef63d8b..360ff5d 100755
--- a/t/libobj13.sh
+++ b/t/libobj13.sh
@@ -18,7 +18,7 @@
# (Like libobj12.test, but for Libtool libraries.)
required='libtoolize'
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
diff --git a/t/libobj14.sh b/t/libobj14.sh
index 50554de..266aaad 100755
--- a/t/libobj14.sh
+++ b/t/libobj14.sh
@@ -19,7 +19,7 @@
# that uses it.
# Report from Bill Davidson.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >>configure.ac <<'EOF'
AC_PROG_CC
diff --git a/t/libobj15a.sh b/t/libobj15a.sh
index d306b71..c7c30e8 100755
--- a/t/libobj15a.sh
+++ b/t/libobj15a.sh
@@ -16,7 +16,7 @@
# Nonexistent sources for AC_LIBOBJ should cause an Automake failure.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
diff --git a/t/libobj15b.sh b/t/libobj15b.sh
index f0466fd..71ace12 100755
--- a/t/libobj15b.sh
+++ b/t/libobj15b.sh
@@ -16,7 +16,7 @@
# Nonexistent source for AC_LIBSOURCE should cause Automake to fail.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
diff --git a/t/libobj15c.sh b/t/libobj15c.sh
index 8fe521d..ccaa6bd 100755
--- a/t/libobj15c.sh
+++ b/t/libobj15c.sh
@@ -16,7 +16,7 @@
# Nonexistent sources for AC_LIBSOURCES should cause Automake to fail.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
@@ -45,6 +45,6 @@ grep 'configure\.ac:.*required file.*bazquux\.c.*' stderr
: > foobar.c
AUTOMAKE_fails
grep 'configure\.ac:.*required file.*bazquux\.c.*' stderr
-grep 'foobar\.c' stderr && Exit 1
+grep 'foobar\.c' stderr && exit 1
:
diff --git a/t/libobj16a.sh b/t/libobj16a.sh
index 2e1da26..9826446 100755
--- a/t/libobj16a.sh
+++ b/t/libobj16a.sh
@@ -18,7 +18,7 @@
# Please keep this in sync with sister test 'libobj16b.test'.
required=cc
-. ./defs || Exit 1
+. ./defs || exit 1
mv configure.ac configure.proto
cat >> configure.proto << 'END'
diff --git a/t/libobj16b.sh b/t/libobj16b.sh
index 110ba19..1b8da08 100755
--- a/t/libobj16b.sh
+++ b/t/libobj16b.sh
@@ -18,7 +18,7 @@
# Please keep this in sync with sister test 'libobj16a.test'.
required=cc
-. ./defs || Exit 1
+. ./defs || exit 1
mv configure.ac configure.proto
cat >> configure.proto << 'END'
diff --git a/t/libobj17.sh b/t/libobj17.sh
index 6c54a28..e4277f9 100755
--- a/t/libobj17.sh
+++ b/t/libobj17.sh
@@ -17,7 +17,7 @@
# Make sure AC_LIBOBJ accept non-literal arguments.
required=cc
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
diff --git a/t/libobj18.sh b/t/libobj18.sh
index 0ac7438..77d7d54 100755
--- a/t/libobj18.sh
+++ b/t/libobj18.sh
@@ -16,7 +16,7 @@
# Make sure AC_LIBSOURCE and AC_LIBSOURCES use arguments literally.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
diff --git a/t/libobj19.sh b/t/libobj19.sh
index 5301e37..0209168 100755
--- a/t/libobj19.sh
+++ b/t/libobj19.sh
@@ -17,7 +17,7 @@
# Test support for AC_CONFIG_LIBOBJ_DIR.
required=cc
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_CONFIG_LIBOBJ_DIR([libobj-dir])
diff --git a/t/libobj2.sh b/t/libobj2.sh
index ce655c2..778dbd3 100755
--- a/t/libobj2.sh
+++ b/t/libobj2.sh
@@ -18,7 +18,7 @@
# Bug from Josh MacDonald.
required=cc
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_CONFIG_FILES([subdir/Makefile])
diff --git a/t/libobj20b.sh b/t/libobj20b.sh
index 395bd7b..fce4ab3 100755
--- a/t/libobj20b.sh
+++ b/t/libobj20b.sh
@@ -17,7 +17,7 @@
# Test error reporting for AC_CONFIG_LIBOBJ_DIR.
# See also sister test 'libobj20c.sh'.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_CONFIG_LIBOBJ_DIR([libobj-dir])
diff --git a/t/libobj20c.sh b/t/libobj20c.sh
index e764e97..533f195 100755
--- a/t/libobj20c.sh
+++ b/t/libobj20c.sh
@@ -17,7 +17,7 @@
# Test error reporting for AC_CONFIG_LIBOBJ_DIR.
# See also sister test 'libobj20b.sh'.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_CONFIG_LIBOBJ_DIR([libobj-dir])
diff --git a/t/libobj3.sh b/t/libobj3.sh
index 37ec6bf..1c78cba 100755
--- a/t/libobj3.sh
+++ b/t/libobj3.sh
@@ -17,7 +17,7 @@
# Make sure we complain if @LIBOBJS@ is used without being set in
# configure.ac.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_RANLIB
diff --git a/t/libobj4.sh b/t/libobj4.sh
index 68711af..c7a199e 100755
--- a/t/libobj4.sh
+++ b/t/libobj4.sh
@@ -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
diff --git a/t/libobj5.sh b/t/libobj5.sh
index 036ae56..d8b7e2d 100755
--- a/t/libobj5.sh
+++ b/t/libobj5.sh
@@ -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
diff --git a/t/libobj7.sh b/t/libobj7.sh
index 1e25229..b5e6742 100755
--- a/t/libobj7.sh
+++ b/t/libobj7.sh
@@ -17,7 +17,7 @@
# Test for multiple replacement functions.
required=cc
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
diff --git a/t/library.sh b/t/library.sh
index 1bf34de..e95fecb 100755
--- a/t/library.sh
+++ b/t/library.sh
@@ -16,7 +16,7 @@
# Test for _DEPENDENCIES with libraries.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_RANLIB
diff --git a/t/library2.sh b/t/library2.sh
index 42a7c62..ede4dce 100755
--- a/t/library2.sh
+++ b/t/library2.sh
@@ -16,7 +16,7 @@
# Make sure Automake suggest using AC_PROG_RANLIB when *_LIBRARIES is used.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
diff --git a/t/library3.sh b/t/library3.sh
index daf96b9..308e748 100755
--- a/t/library3.sh
+++ b/t/library3.sh
@@ -16,7 +16,7 @@
# Make sure Automake simplify conditions in diagnostics.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >>configure.ac <<EOF
AC_PROG_CC
diff --git a/t/libtoo10.sh b/t/libtoo10.sh
index 07efaea..3fd8444 100755
--- a/t/libtoo10.sh
+++ b/t/libtoo10.sh
@@ -22,7 +22,7 @@
# *.lo files are removed when they should.
required='cc libtoolize'
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AM_PROG_AR
@@ -59,14 +59,14 @@ $MAKE all check
: > lib/so_locations
: > src/so_locations
$MAKE clean
-ls *.lo && Exit 1
+ls *.lo && exit 1
test -f libtool
-test ! -d src/.libs
-test ! -d src/_libs
-test ! -d check/.libs
-test ! -d check/_libs
+test ! -e src/.libs
+test ! -e src/_libs
+test ! -e check/.libs
+test ! -e check/_libs
test -f src/so_locations
-test ! -f lib/so_locations
+test ! -e lib/so_locations
# No libtool libraries created in this directory, our rules
# shouldn't bother about possible linker files in it.
test -f src/so_locations
diff --git a/t/libtoo11.sh b/t/libtoo11.sh
index cd55cc0..1f91f19 100755
--- a/t/libtoo11.sh
+++ b/t/libtoo11.sh
@@ -18,7 +18,7 @@
# Report by Charles Wilson.
required='cc libtoolize'
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_LIBTOOL
diff --git a/t/libtool-macros.sh b/t/libtool-macros.sh
index f2f8811..17fea06 100755
--- a/t/libtool-macros.sh
+++ b/t/libtool-macros.sh
@@ -18,7 +18,7 @@
# to the test cases requiring them.
# See also automake bug#9807.
-. ./defs || Exit 1
+. ./defs || exit 1
echo "# Automatically generated by $me." > get.sh
echo : >> get.sh
diff --git a/t/libtool3.sh b/t/libtool3.sh
index 711581a..456cf62 100755
--- a/t/libtool3.sh
+++ b/t/libtool3.sh
@@ -18,7 +18,7 @@
# Also make sure we do not bloat the Makefile with unneeded rules.
required='cc libtoolize'
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
@@ -77,7 +77,7 @@ $AUTOCONF
$AUTOMAKE --add-missing --copy
# We shouldn't need explicit rules.
-$EGREP '[^%]\.(o|obj|lo|\$\(OBJEXT\)) *:' Makefile.in && Exit 1
+$EGREP '[^%]\.(o|obj|lo|\$\(OBJEXT\)) *:' Makefile.in && exit 1
./configure
diff --git a/t/libtool4.sh b/t/libtool4.sh
index 2ce92dd..e8704b7 100755
--- a/t/libtool4.sh
+++ b/t/libtool4.sh
@@ -16,7 +16,7 @@
# Make sure Automake suggests AC_PROG_LIBTOOL when *_LTLIBRARIES is used.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac <<'END'
AC_PROG_CC
diff --git a/t/libtool5.sh b/t/libtool5.sh
index b9e778b..7605098 100755
--- a/t/libtool5.sh
+++ b/t/libtool5.sh
@@ -19,7 +19,7 @@
# Report from Harlan Stenn.
required='libtoolize'
-. ./defs || Exit 1
+. ./defs || exit 1
cat >>configure.ac <<'END'
AM_CONDITIONAL([COND1], [true])
diff --git a/t/libtool6.sh b/t/libtool6.sh
index 7655569..19f30e7 100755
--- a/t/libtool6.sh
+++ b/t/libtool6.sh
@@ -18,7 +18,7 @@
# in different directories. PR/285.
required='libtoolize'
-. ./defs || Exit 1
+. ./defs || exit 1
cat >>configure.ac <<'END'
AM_CONDITIONAL([COND1], [true])
diff --git a/t/libtool7.sh b/t/libtool7.sh
index 11e4343..e6b1025 100755
--- a/t/libtool7.sh
+++ b/t/libtool7.sh
@@ -18,7 +18,7 @@
# Also check basic support for AM_LIBTOOLFLAGS/LIBTOOLFLAGS
required='cc libtoolize'
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
@@ -80,7 +80,7 @@ $AUTOMAKE --add-missing --copy
./configure "--prefix=$(pwd)/_inst"
env LIBTOOLFLAGS=--silent $MAKE print >output 2>&1 || {
cat output
- Exit 1
+ exit 1
}
cat output
grep '1BEG: libmod1.la mod2.la :END1' output
@@ -91,7 +91,7 @@ $MAKE
env LIBTOOLFLAGS=--silent $MAKE install >output 2>&1 || {
cat output
- Exit 1
+ exit 1
}
cat output
grep 'silent.*silent.*prg' output
@@ -99,7 +99,7 @@ grep 'silent.*silent.*libmod1' output
env LIBTOOLFLAGS=--silent $MAKE uninstall >output 2>&1 || {
cat output
- Exit 1
+ exit 1
}
cat output
grep 'silent.*silent.*libmod1' output
diff --git a/t/libtool8.sh b/t/libtool8.sh
index 9182c27..8cfb8e3 100755
--- a/t/libtool8.sh
+++ b/t/libtool8.sh
@@ -17,7 +17,7 @@
# Make sure Automake diagnoses conflicting installations.
required='libtoolize'
-. ./defs || Exit 1
+. ./defs || exit 1
cat >>configure.ac <<'END'
AM_CONDITIONAL([COND1], [true])
@@ -46,7 +46,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/t/libtool9.sh b/t/libtool9.sh
index ac3a6b0..4d82ddf 100755
--- a/t/libtool9.sh
+++ b/t/libtool9.sh
@@ -20,7 +20,7 @@
# xxx_LDFLAGS.
required='cc libtoolize'
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
@@ -89,16 +89,16 @@ $MAKE LDFLAGS=ldflags AM_LDFLAGS=am_ldflags \
CFLAGS=cflags AM_CFLAGS=am_cflags \
libmod1_la_LDFLAGS=lm1_la_ldflags \
prg2_CFLAGS=prg2_cflags \
- print >output 2>&1 || { cat output; Exit 1; }
+ print >output 2>&1 || { cat output; exit 1; }
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/t/license.sh b/t/license.sh
index c3dad69..cad4307 100755
--- a/t/license.sh
+++ b/t/license.sh
@@ -16,7 +16,7 @@
# Make sure COPYING is not overwritten, even with -a -f.
-. ./defs || Exit 1
+. ./defs || exit 1
echo AC_OUTPUT >>configure.ac
@@ -35,7 +35,7 @@ EOF
:> ChangeLog
:> README
-test ! -f COPYING
+test ! -e COPYING
$ACLOCAL
$AUTOCONF
diff --git a/t/license2.sh b/t/license2.sh
index d447eba..736e96f 100755
--- a/t/license2.sh
+++ b/t/license2.sh
@@ -16,7 +16,7 @@
# Check that installing 'COPYING' outputs a warning.
-. ./defs || Exit 1
+. ./defs || exit 1
cat > Makefile.am << 'END'
AUTOMAKE_OPTIONS = gnu
diff --git a/t/link_c_cxx.sh b/t/link_c_cxx.sh
index a3dac1b..27dcb24 100755
--- a/t/link_c_cxx.sh
+++ b/t/link_c_cxx.sh
@@ -17,7 +17,7 @@
# Test to make sure the C++ linker is used when appropriate.
# Matthew D. Langston <address@hidden>
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
@@ -39,7 +39,7 @@ $AUTOMAKE
grep '.\$(CXXLINK)' Makefile.in
# 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/t/link_cond.sh b/t/link_cond.sh
index 9c120af..459453c 100755
--- a/t/link_cond.sh
+++ b/t/link_cond.sh
@@ -21,7 +21,7 @@
# See automake bug#11089.
required='cc c++'
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
@@ -64,7 +64,7 @@ $MAKE CXX=false
# Sanity check.
rm -f foo foo.exe
-$MAKE CC=false && Exit 99
+$MAKE CC=false && exit 99
$MAKE distclean
@@ -83,6 +83,6 @@ $MAKE CC=false
# Sanity check.
rm -f foo foo.exe
-$MAKE CXX=false && Exit 99
+$MAKE CXX=false && exit 99
:
diff --git a/t/link_dist.sh b/t/link_dist.sh
index 8ba05df..9ad4319 100755
--- a/t/link_dist.sh
+++ b/t/link_dist.sh
@@ -18,7 +18,7 @@
# *_SOURCES
# Richard Boulton <address@hidden>
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
@@ -41,7 +41,7 @@ $AUTOMAKE
grep '.\$(CXXLINK)' Makefile.in
# 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/t/link_f90_only.sh b/t/link_f90_only.sh
index a34d6c6..252d46a 100755
--- a/t/link_f90_only.sh
+++ b/t/link_f90_only.sh
@@ -17,7 +17,7 @@
# Test to make sure the Fortran 90 linker is used when appropriate.
# (copied from link_f_only.test) Mike Nolta <address@hidden>
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_FC
@@ -38,7 +38,7 @@ $AUTOMAKE
grep '.\$(FCLINK)' Makefile.in
# 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/t/link_f_only.sh b/t/link_f_only.sh
index 25f3ef9..5d27025 100755
--- a/t/link_f_only.sh
+++ b/t/link_f_only.sh
@@ -17,7 +17,7 @@
# Test to make sure the Fortran 77 linker is used when appropriate.
# Matthew D. Langston <address@hidden>
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_F77
@@ -38,7 +38,7 @@ $AUTOMAKE
grep '.\$(F77LINK)' Makefile.in
# 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/t/link_fc.sh b/t/link_fc.sh
index 6cf8b8b..f334ad8 100755
--- a/t/link_fc.sh
+++ b/t/link_fc.sh
@@ -17,7 +17,7 @@
# Test to make sure the Fortran 77 linker is used when appropriate.
# Matthew D. Langston <address@hidden>
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
@@ -40,7 +40,7 @@ $AUTOMAKE
grep '.\$(F77LINK)' Makefile.in
# 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/t/link_fccxx.sh b/t/link_fccxx.sh
index ede7b5a..03b71f5 100755
--- a/t/link_fccxx.sh
+++ b/t/link_fccxx.sh
@@ -17,7 +17,7 @@
# Test to make sure the C++ linker is used when appropriate.
# Matthew D. Langston <address@hidden>
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
@@ -40,7 +40,7 @@ $AUTOMAKE
grep '.\$(CXXLINK)' Makefile.in
# 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/t/link_fcxx.sh b/t/link_fcxx.sh
index 545f6a6..29893d8 100755
--- a/t/link_fcxx.sh
+++ b/t/link_fcxx.sh
@@ -17,7 +17,7 @@
# Test to make sure the C++ linker is used when appropriate.
# Matthew D. Langston <address@hidden>
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CXX
@@ -39,7 +39,7 @@ $AUTOMAKE
grep '.\$(CXXLINK)' Makefile.in
# 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/t/link_override.sh b/t/link_override.sh
index 48d32a2..1bf1085 100755
--- a/t/link_override.sh
+++ b/t/link_override.sh
@@ -16,7 +16,7 @@
# Test to make sure _LINK variables are detected and used as documented.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
@@ -34,11 +34,11 @@ $AUTOMAKE -a
# We should use foo_LINK not LINK.
grep '.\$(foo_LINK)' Makefile.in
-grep '.\$(LINK).*foo' Makefile.in && Exit 1
+grep '.\$(LINK).*foo' Makefile.in && exit 1
# We should not override the user definition of bar_LINK.
# IOW, bar_LDFLAGS is useless unless bar_LINK refers to it.
-grep '^ *bar_LINK *=.*bar_LDFLAGS' Makefile.in && Exit 1
+grep '^ *bar_LINK *=.*bar_LDFLAGS' Makefile.in && exit 1
grep '.\$(bar_LINK).*bar' Makefile.in
-Exit 0
+exit 0
diff --git a/t/lisp2.sh b/t/lisp2.sh
index 25d174f..4f07911 100755
--- a/t/lisp2.sh
+++ b/t/lisp2.sh
@@ -16,7 +16,7 @@
# Make sure that Automake suggest using AM_PATH_LISPDIR to define lispdir.
-. ./defs || Exit 1
+. ./defs || exit 1
: TRY 1 -- We lack both EMACS and lispdir.
@@ -42,7 +42,7 @@ END
$ACLOCAL
AUTOMAKE_fails
-grep 'lispdir.*undefined' stderr && Exit 1
+grep 'lispdir.*undefined' stderr && exit 1
grep '[Ll]isp source.*EMACS.* undefined' stderr
grep 'define .*EMACS.* add .*AM_PATH_LISPDIR' stderr
@@ -56,7 +56,7 @@ END
$ACLOCAL
AUTOMAKE_fails
-grep 'EMACS.*undefined' stderr && Exit 1
+grep 'EMACS.*undefined' stderr && exit 1
grep '[Ll]isp source.*lispdir.* undefined' stderr
grep 'define .*lispdir.* add .*AM_PATH_LISPDIR' stderr
diff --git a/t/lisp3.sh b/t/lisp3.sh
index ea18e00..9425d9c 100755
--- a/t/lisp3.sh
+++ b/t/lisp3.sh
@@ -17,7 +17,7 @@
# Test that compiling interdependent elisp files works.
required=emacs
-. ./defs || Exit 1
+. ./defs || exit 1
cat > Makefile.am << 'EOF'
lisp_LISP = am-one.el am-two.el am-three.el
@@ -63,7 +63,7 @@ find _inst # For debugging.
# Keep thin in sync with m4/lispdir.m4.
for dir in lib/emacs lib/xemacs share/emacs share/xemacs :; do
if test $dir = :; then
- Exit 1
+ exit 1
elif test -d _inst/$dir/site-lisp; then
break
fi
@@ -77,14 +77,14 @@ test -f _inst/$dir/site-lisp/am-three.el
test -f _inst/$dir/site-lisp/am-three.elc
$MAKE uninstall
-find _inst | $EGREP '\.elc?$' && Exit 1
+find _inst | $EGREP '\.elc?$' && exit 1
# Make sure we build all files when any of them change.
# (We grep a message to make sure the compilation happens.)
unique=0a3346e2af8a689b85002b53df09142a
$sleep
echo "(message \"$unique\")(provide 'am-three)" > am-three.el
-$MAKE 2>stderr || { cat stderr >&2; Exit 1; }
+$MAKE 2>stderr || { cat stderr >&2; exit 1; }
cat stderr >&2
grep $unique stderr
diff --git a/t/lisp4.sh b/t/lisp4.sh
index 82109f5..b8cb796 100755
--- a/t/lisp4.sh
+++ b/t/lisp4.sh
@@ -18,7 +18,7 @@
# Report from Simon Josefsson.
required=emacs
-. ./defs || Exit 1
+. ./defs || exit 1
cat > Makefile.am << 'EOF'
lisp_LISP = am-one.el am-two.el am-three.el
diff --git a/t/lisp5.sh b/t/lisp5.sh
index 34edf3b..4d0499c 100755
--- a/t/lisp5.sh
+++ b/t/lisp5.sh
@@ -18,7 +18,7 @@
# non-bytecompiled *.el files.
required=emacs
-. ./defs || Exit 1
+. ./defs || exit 1
cat > Makefile.am << 'EOF'
lisp_DATA = am-one.el am-two.el am-three.el
diff --git a/t/lisp6.sh b/t/lisp6.sh
index 1e3bc41..e877d5a 100755
--- a/t/lisp6.sh
+++ b/t/lisp6.sh
@@ -17,7 +17,7 @@
# Test for conditional _LISP.
required=emacs
-. ./defs || Exit 1
+. ./defs || exit 1
cat > Makefile.am << 'EOF'
dist_lisp_LISP = am-one.el
@@ -55,25 +55,25 @@ cwd=$(pwd) || fatal_ "getting current working directory"
$MAKE
test -f am-one.elc
-test ! -f am-two.elc
+test ! -e am-two.elc
test -f am-three.elc
test -f elc-stamp
$MAKE install
test -f lisp/am-one.el
test -f lisp/am-one.elc
-test ! -f lisp/am-two.el
-test ! -f lisp/am-two.elc
-test ! -f lisp/am-three.el
-test ! -f lisp/am-three.elc
+test ! -e lisp/am-two.el
+test ! -e lisp/am-two.elc
+test ! -e lisp/am-three.el
+test ! -e lisp/am-three.elc
$MAKE dist-test
$MAKE distclean
-test ! -f am-one.elc
-test ! -f am-two.elc
-test ! -f am-three.elc
-test ! -f elc-stamp
+test ! -e am-one.elc
+test ! -e am-two.elc
+test ! -e am-three.elc
+test ! -e elc-stamp
./configure --with-lispdir="$cwd/lisp" want_two=1
@@ -96,15 +96,15 @@ test -f lisp/am-one.el
test -f lisp/am-one.elc
test -f lisp/am-two.el
test -f lisp/am-two.elc
-test ! -f lisp/am-three.el
-test ! -f lisp/am-three.elc
+test ! -e lisp/am-three.el
+test ! -e lisp/am-three.elc
$MAKE dist-test
$MAKE distclean
-test ! -f am-one.elc
-test ! -f am-two.elc
-test ! -f am-three.elc
-test ! -f elc-stamp
+test ! -e am-one.elc
+test ! -e am-two.elc
+test ! -e am-three.elc
+test ! -e elc-stamp
:
diff --git a/t/lisp7.sh b/t/lisp7.sh
index 6022334..4553298 100755
--- a/t/lisp7.sh
+++ b/t/lisp7.sh
@@ -16,7 +16,7 @@
# Make sure that lisp_LISP also works when emacs is not installed.
-. ./defs || Exit 1
+. ./defs || exit 1
cat > Makefile.am << 'EOF'
dist_lisp_LISP = am-one.el am-two.el am-three.el
@@ -37,13 +37,13 @@ $AUTOCONF
$AUTOMAKE --add-missing
./configure
-$MAKE >stdout || { cat stdout; Exit 1; }
+$MAKE >stdout || { cat stdout; exit 1; }
cat stdout
test 1 -eq $(grep -c 'Warnings can be ignored' stdout)
-test ! -f am-one.elc
-test ! -f am-two.elc
-test ! -f am-three.elc
+test ! -e am-one.elc
+test ! -e am-two.elc
+test ! -e am-three.elc
test -f elc-stamp
$MAKE distcheck
diff --git a/t/lisp8.sh b/t/lisp8.sh
index d686bfb..c542cf7 100755
--- a/t/lisp8.sh
+++ b/t/lisp8.sh
@@ -17,7 +17,7 @@
# Check the recover rule of lisp_LISP with parallel make.
required=emacs
-. ./defs || Exit 1
+. ./defs || exit 1
cat > Makefile.am << 'EOF'
dist_lisp_LISP = am-one.el am-two.el am-three.el
@@ -39,7 +39,7 @@ $AUTOMAKE --add-missing
# Use append mode here to avoid dropping output. See automake bug#11413.
: >stdout
-$MAKE -j >>stdout || { cat stdout; Exit 1; }
+$MAKE -j >>stdout || { cat stdout; exit 1; }
cat stdout
test 1 -eq $(grep -c 'Warnings can be ignored' stdout)
@@ -53,7 +53,7 @@ rm -f am-*.elc
# Use append mode here to avoid dropping output. See automake bug#11413.
: >stdout
-$MAKE -j >>stdout || { cat stdout; Exit 1; }
+$MAKE -j >>stdout || { cat stdout; exit 1; }
cat stdout
test 1 -eq $(grep -c 'Warnings can be ignored' stdout)
diff --git a/t/lispdry.sh b/t/lispdry.sh
index a89ffe1..f7de071 100755
--- a/t/lispdry.sh
+++ b/t/lispdry.sh
@@ -17,7 +17,7 @@
# Check that 'make -n' works with the lisp_LISP recover rule.
required='emacs non-root'
-. ./defs || Exit 1
+. ./defs || exit 1
cat > Makefile.am << 'EOF'
dist_lisp_LISP = am-one.el am-two.el am-three.el
@@ -50,9 +50,9 @@ chmod a-w .
$MAKE -n
-test ! -f am-one.elc
-test ! -f am-two.elc
-test ! -f am-three.elc
-test ! -f elc-stamp
+test ! -e am-one.elc
+test ! -e am-two.elc
+test ! -e am-three.elc
+test ! -e elc-stamp
:
diff --git a/t/listval.sh b/t/listval.sh
index 5e2f9a6..8bd6b79 100755
--- a/t/listval.sh
+++ b/t/listval.sh
@@ -18,7 +18,7 @@
# From Adam J. Richter.
required=libtool
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_SUBST([LTLIBOBJS])
diff --git a/t/local-targets.sh b/t/local-targets.sh
index 003a7e3..d15bc80 100755
--- a/t/local-targets.sh
+++ b/t/local-targets.sh
@@ -19,7 +19,7 @@
# sees, as well as through GNU make constructs that Automake does not
# parse.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_SUBST([SafeInclude], [include])
diff --git a/t/location.sh b/t/location.sh
index f9dd289..dab1e33 100755
--- a/t/location.sh
+++ b/t/location.sh
@@ -16,7 +16,7 @@
# Test for locations in error messages.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AM_CONDITIONAL([COND1], [true])
@@ -84,7 +84,7 @@ END
cat expected
cat observed
-diff expected observed || Exit 1
+diff expected observed || exit 1
AUTOMAKE_fails -Werror
smash_useless_diffs stderr >observed
@@ -94,6 +94,6 @@ mv -f t expected
cat expected
cat observed
-diff expected observed || Exit 1
+diff expected observed || exit 1
:
diff --git a/t/longlin2.sh b/t/longlin2.sh
index ab3d5d4..1174a14 100755
--- a/t/longlin2.sh
+++ b/t/longlin2.sh
@@ -17,7 +17,7 @@
# Long lines should be wrapped.
# Report from Albert Chin.
-. ./defs || Exit 1
+. ./defs || exit 1
n=1 files= match=
while test $n -le 100
@@ -42,7 +42,7 @@ EOF
$ACLOCAL
$AUTOMAKE
-grep $match Makefile.in && Exit 1
+grep $match Makefile.in && exit 1
grep 'filenameb100 grepme' Makefile.in
:
diff --git a/t/longline.sh b/t/longline.sh
index e246e30..2536846 100755
--- a/t/longline.sh
+++ b/t/longline.sh
@@ -17,7 +17,7 @@
# Long lines of = and += should be wrapped.
# Report from Simon Josefsson.
-. ./defs || Exit 1
+. ./defs || exit 1
i=0
while test $i -lt 30; do
diff --git a/t/ltcond.sh b/t/ltcond.sh
index 7562d92..ae5415c 100755
--- a/t/ltcond.sh
+++ b/t/ltcond.sh
@@ -18,7 +18,7 @@
# This combines two examples from the manual.
required='cc libtoolize'
-. ./defs || Exit 1
+. ./defs || exit 1
cat >>configure.ac <<'END'
AM_CONDITIONAL([WANT_LIBFOO], [true])
@@ -72,35 +72,35 @@ $MAKE
test -f lib1foo.la
test -f lib1bar.la
test -f lib2foo.la
-test ! -f lib2bar.la
-test ! -f lib3foo.la
-test ! -f lib3bar.la
+test ! -e lib2bar.la
+test ! -e lib3foo.la
+test ! -e lib3bar.la
$MAKE check
-test ! -f lib2bar.la
+test ! -e lib2bar.la
test -f lib3foo.la
-test ! -f lib3bar.la
+test ! -e lib3bar.la
$MAKE install
test -f lib/lib1foo.la
test -f lib/lib1bar.la
test -f lib/lib2foo.la
-test ! -f lib/lib3foo.la
+test ! -e lib/lib3foo.la
find empty -type f -print > empty.lst
-test -s empty.lst && { cat empty.lst; Exit 1; }
+test -s empty.lst && { cat empty.lst; exit 1; }
$MAKE uninstall
find lib -type f -print > lib.lst
-test -s lib.lst && { cat lib.lst; Exit 1; }
+test -s lib.lst && { cat lib.lst; exit 1; }
test -f lib1foo.la
test -f lib1bar.la
test -f lib2foo.la
test -f lib3foo.la
$MAKE clean
-test ! -f lib1foo.la
-test ! -f lib1bar.la
-test ! -f lib2foo.la
-test ! -f lib3foo.la
+test ! -e lib1foo.la
+test ! -e lib1bar.la
+test ! -e lib2foo.la
+test ! -e lib3foo.la
:
diff --git a/t/ltcond2.sh b/t/ltcond2.sh
index 4a72394..49b14d8 100755
--- a/t/ltcond2.sh
+++ b/t/ltcond2.sh
@@ -17,7 +17,7 @@
# Test for bug in conditionals.
required='cc native libtoolize'
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
diff --git a/t/ltconv.sh b/t/ltconv.sh
index 7a62585..cf06271 100755
--- a/t/ltconv.sh
+++ b/t/ltconv.sh
@@ -18,7 +18,7 @@
# This example is taken from the manual.
required='cc native libtoolize'
-. ./defs || Exit 1
+. ./defs || exit 1
cat >>configure.ac <<'END'
AC_PROG_CC
@@ -134,15 +134,15 @@ test -f installcheck-ok
rm -f installcheck-ok
find empty -type f -print > empty.lst
-test -s empty.lst && { cat empty.lst; Exit 1; }
+test -s empty.lst && { cat empty.lst; exit 1; }
$MAKE clean
-test ! -f libtop.la
-test ! -f sub1/libsub1.la
-test ! -f sub2/libsub2.la
-test ! -f sub2/sub21/libsub21.la
-test ! -f sub2/sub22/libsub22.la
-test ! -f ltconvtest
+test ! -e libtop.la
+test ! -e sub1/libsub1.la
+test ! -e sub2/libsub2.la
+test ! -e sub2/sub21/libsub21.la
+test ! -e sub2/sub22/libsub22.la
+test ! -e ltconvtest
$MAKE installcheck
test -f installcheck-ok
@@ -151,7 +151,7 @@ rm -f installcheck-ok
$MAKE uninstall
for d in lib bin; do
find $d -type f -print > $d.lst
- test -s $d.lst && { cat $d.lst; Exit 1; }
+ test -s $d.lst && { cat $d.lst; exit 1; }
: For shells with busted 'set -e'.
done
diff --git a/t/ltdeps.sh b/t/ltdeps.sh
index 100d045..a13ae03 100755
--- a/t/ltdeps.sh
+++ b/t/ltdeps.sh
@@ -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.ac << 'END'
AM_PROG_AR
@@ -57,5 +57,5 @@ END
$ACLOCAL
$AUTOMAKE
-grep 'OBJECTS =$' Makefile.in && Exit 1
-Exit 0
+grep 'OBJECTS =$' Makefile.in && exit 1
+exit 0
diff --git a/t/ltinit.sh b/t/ltinit.sh
index e0f9b02..69e8d55 100755
--- a/t/ltinit.sh
+++ b/t/ltinit.sh
@@ -19,7 +19,7 @@
# present since libtool 1.9b, circa 2004).
required='cc libtoolize'
-. ./defs || Exit 1
+. ./defs || exit 1
cat >>configure.ac <<'END'
AC_PROG_CC
@@ -49,13 +49,13 @@ libtoolize
if test $? -eq 63; then
skip_ "libtool is too old (probably < 2.0)"
else
- Exit 1
+ exit 1
fi
}
-$EGREP 'LT_(INIT|PREREQ)' configure && Exit 1 # Sanity check.
+$EGREP 'LT_(INIT|PREREQ)' configure && exit 1 # Sanity check.
$AUTOMAKE -a
-./configure --prefix="$(pwd)/inst" >stdout || { cat stdout; Exit 1; }
+./configure --prefix="$(pwd)/inst" >stdout || { cat stdout; exit 1; }
cat stdout
grep '^checking.*dlfcn\.h.* no$' stdout || grep '^checking.*dlopen' stdout
diff --git a/t/ltinstloc.sh b/t/ltinstloc.sh
index 6906994..f12da77 100755
--- a/t/ltinstloc.sh
+++ b/t/ltinstloc.sh
@@ -18,7 +18,7 @@
required='libtoolize'
-. ./defs || Exit 1
+. ./defs || exit 1
cat >>configure.ac <<'END'
AC_PROG_CC
diff --git a/t/ltlibobjs.sh b/t/ltlibobjs.sh
index 5cdccf0..ed0d2ed 100755
--- a/t/ltlibobjs.sh
+++ b/t/ltlibobjs.sh
@@ -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.ac << 'END'
AC_SUBST([LTLIBOBJS])
diff --git a/t/ltorder.sh b/t/ltorder.sh
index 59047a0..c8f60ed 100755
--- a/t/ltorder.sh
+++ b/t/ltorder.sh
@@ -17,7 +17,7 @@
# Test for correct installation order of nobase libtool libraries.
required='cc libtoolize'
-. ./defs || Exit 1
+. ./defs || exit 1
cat >>configure.ac <<'END'
AC_PROG_CC
@@ -52,9 +52,9 @@ $AUTOMAKE --add-missing
./configure --prefix="$(pwd)/inst"
$MAKE
-$MAKE install 2>stderr || { cat stderr >&2; Exit 1; }
+$MAKE install 2>stderr || { cat stderr >&2; exit 1; }
cat stderr >&2
-grep 'has not been installed' stderr && Exit 1
+grep 'has not been installed' stderr && exit 1
$MAKE uninstall
test $(find inst -type f -print | wc -l) -eq 0
diff --git a/t/lzma.sh b/t/lzma.sh
index 8e78f86..da38c31 100755
--- a/t/lzma.sh
+++ b/t/lzma.sh
@@ -16,7 +16,7 @@
# Check support for no-dist-gzip with lzma.
-. ./defs || Exit 1
+. ./defs || exit 1
errmsg='support for lzma.*removed'
diff --git a/t/m4-inclusion.sh b/t/m4-inclusion.sh
index 52dae22..3da20ee 100755
--- a/t/m4-inclusion.sh
+++ b/t/m4-inclusion.sh
@@ -16,7 +16,7 @@
# Test to see if 'm4_sinclude' and 'm4_include' works.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac <<'EOF'
sinclude([doesntexist.m4])
@@ -48,7 +48,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/t/maintclean-vpath.sh b/t/maintclean-vpath.sh
index 11e97a6..77f6267 100755
--- a/t/maintclean-vpath.sh
+++ b/t/maintclean-vpath.sh
@@ -18,7 +18,7 @@
# This test is for VPATH builds; see sister test 'maintclean.test'
# for in-tree builds.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_CONFIG_FILES([bar sub/Makefile])
@@ -70,10 +70,10 @@ test -f sub/zap
$test_cache
$MAKE distclean
-test ! -f bar
-test ! -f Makefile
-test ! -f sub/Makefile
-test ! -f config.status
+test ! -e bar
+test ! -e Makefile
+test ! -e sub/Makefile
+test ! -e config.status
test -f foo.c
test -f sub/zap
test -f ../sub/zap.sh
@@ -93,12 +93,12 @@ chmod u+w ..
$MAKE maintainer-clean
test -f ../sub/zap.sh
-test ! -f bar
-test ! -f foo.c
-test ! -f sub/zap
-test ! -f Makefile
-test ! -f sub/Makefile
-test ! -f config.status
-test ! -d ../autom4te.cache
+test ! -e bar
+test ! -e foo.c
+test ! -e sub/zap
+test ! -e Makefile
+test ! -e sub/Makefile
+test ! -e config.status
+test ! -e ../autom4te.cache
:
diff --git a/t/maintclean.sh b/t/maintclean.sh
index c5d3d0e..a2c0e6b 100755
--- a/t/maintclean.sh
+++ b/t/maintclean.sh
@@ -18,7 +18,7 @@
# This test is for in-tree builds; see sister test 'maintclean-vpath.test'
# for VPATH builds.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_CONFIG_FILES([bar sub/Makefile])
@@ -64,10 +64,10 @@ test -f sub/zap
$test_cache
$MAKE distclean
-test ! -f bar
-test ! -f Makefile
-test ! -f sub/Makefile
-test ! -f config.status
+test ! -e bar
+test ! -e Makefile
+test ! -e sub/Makefile
+test ! -e config.status
test -f foo.c
test -f sub/zap
test -f sub/zap.sh
@@ -85,12 +85,12 @@ cd ..
$MAKE maintainer-clean
test -f sub/zap.sh
-test ! -f bar
-test ! -f foo.c
-test ! -f sub/zap
-test ! -f Makefile
-test ! -f sub/Makefile
-test ! -f config.status
-test ! -d autom4te.cache
+test ! -e bar
+test ! -e foo.c
+test ! -e sub/zap
+test ! -e Makefile
+test ! -e sub/Makefile
+test ! -e config.status
+test ! -e autom4te.cache
:
diff --git a/t/maintmode-configure-msg.sh b/t/maintmode-configure-msg.sh
index 5396cbf..ebdf4d7 100755
--- a/t/maintmode-configure-msg.sh
+++ b/t/maintmode-configure-msg.sh
@@ -19,7 +19,7 @@
# related to the enabling/disabling of maintainer mode are correct (see
# automake bug#9890).
-. ./defs || Exit 1
+. ./defs || exit 1
set_maintmode ()
{
@@ -34,7 +34,7 @@ set_maintmode ()
check_configure_message_with ()
{
answer=$1; shift
- ./configure ${1+"$@"} >stdout || { cat stdout; Exit 1; }
+ ./configure ${1+"$@"} >stdout || { cat stdout; exit 1; }
cat stdout
grep "^checking whether to enable maintainer-specific.*\\.\\.\\. $answer$"
stdout
test $(grep -c 'checking.*maint' stdout) -eq 1
@@ -62,7 +62,7 @@ check_configure_message_with "yes" --enable-maintainer-mode
set_maintmode "enable"
$AUTOCONF --force
-./configure --help >stdout || { cat stdout; Exit 1; }
+./configure --help >stdout || { cat stdout; exit 1; }
cat stdout
grep_configure_help --disable-maintainer-mode 'disable make rules'
diff --git a/t/make-dryrun.tap b/t/make-dryrun.tap
index 8dec862..42fd3df 100755
--- a/t/make-dryrun.tap
+++ b/t/make-dryrun.tap
@@ -16,7 +16,7 @@
# Check that $(am__make_dryrun) works as expected.
-. ./defs || Exit 1
+. ./defs || exit 1
plan_ 14
diff --git a/t/makefile-deps.sh b/t/makefile-deps.sh
index 83f3cae..192e56b 100755
--- a/t/makefile-deps.sh
+++ b/t/makefile-deps.sh
@@ -17,13 +17,13 @@
# Make sure we don't emit a rule with empty target if list of
# automatically-computed dependencies for Makefile.in is empty.
-. ./defs || Exit 1
+. ./defs || exit 1
: > Makefile.am
$ACLOCAL
$AUTOMAKE
-grep "^ *:" Makefile.in && Exit 1
+grep "^ *:" Makefile.in && exit 1
:
diff --git a/t/makej.sh b/t/makej.sh
index 617b45f..3b236bf 100755
--- a/t/makej.sh
+++ b/t/makej.sh
@@ -21,7 +21,7 @@
# depend on the time at which autoconf and automake update the cache
# via autom4te.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >configure.ac <<END
m4_include([version.m4])
diff --git a/t/makej2.sh b/t/makej2.sh
index 317d3ff..b7ec43a 100755
--- a/t/makej2.sh
+++ b/t/makej2.sh
@@ -20,7 +20,7 @@
# Problems like this shouldn't happen with GNU make, but we keep the
# test anyway for the moment, for extra safety.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >>configure.ac <<'END'
AC_OUTPUT
diff --git a/t/maken.sh b/t/maken.sh
index ffd5ef0..0caa12c 100755
--- a/t/maken.sh
+++ b/t/maken.sh
@@ -19,7 +19,7 @@
# Also, ensure that "make -n dist" and "make -n distcheck" show what
# would happen.
-. ./defs || Exit 1
+. ./defs || exit 1
mkdir sub
diff --git a/t/maken3.sh b/t/maken3.sh
index 5f9981e..b1875cb 100755
--- a/t/maken3.sh
+++ b/t/maken3.sh
@@ -23,7 +23,7 @@
# as well as tags, TAGS.
# For gen-testsuite-part: ==> try-with-serial-tests <==
-. ./defs || Exit 1
+. ./defs || exit 1
mkdir sub sub2
@@ -127,27 +127,27 @@ check_targets ()
install-info install-html install-dvi install-pdf install-ps \
installcheck installdirs tags TAGS mostlyclean maintainer-clean
do
- $MAKE -n $target >stdout || { cat stdout; Exit 1; }
+ $MAKE -n $target >stdout || { cat stdout; exit 1; }
cat stdout
case $target in
install-* | installdirs | tags | TAGS ) ;;
*)
- grep "stamp-$target$" stdout || Exit 1
- test ! -f "stamp-$target$" || Exit 1
+ grep "stamp-$target$" stdout || exit 1
+ test ! -e "stamp-$target" || exit 1
;;
esac
case $target in
install-* | installdirs ) ;;
*)
- grep "stamp-$target-sub" stdout || Exit 1
- test ! -f "sub/stamp-$target-sub" || Exit 1
+ grep "stamp-$target-sub" stdout || exit 1
+ test ! -e "sub/stamp-$target-sub" || exit 1
;;
esac
case $target in
distclean | maintainer-clean ) ;;
*)
- grep "should-not-be-executed" stdout || Exit 1
- test ! -f "sub2/sub2-$target-should-not-be-executed" || Exit 1
+ grep "should-not-be-executed" stdout || exit 1
+ test ! -e "sub2/sub2-$target-should-not-be-executed" || exit 1
;;
esac
done
@@ -155,7 +155,7 @@ check_targets ()
$AUTOMAKE -a -Wno-override
./configure
-check_targets || Exit 1
+check_targets || exit 1
# Now, introduce BUILT_SOURCES into the toplevel Makefile
# TODO: add BUILT_SOURCES to sub2, fix fallout.
@@ -163,6 +163,6 @@ sed 's/##//' < Makefile.am > t
mv -f t Makefile.am
$AUTOMAKE -Wno-override --force Makefile
./configure
-check_targets || Exit 1
+check_targets || exit 1
-Exit 0
+exit 0
diff --git a/t/makevars.sh b/t/makevars.sh
index ad18830..3654196 100755
--- a/t/makevars.sh
+++ b/t/makevars.sh
@@ -17,7 +17,7 @@
# 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
@@ -28,6 +28,6 @@ $ACLOCAL
$AUTOMAKE
# 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
:
diff --git a/t/man.sh b/t/man.sh
index d2e5dd6..3feb3fa 100755
--- a/t/man.sh
+++ b/t/man.sh
@@ -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
diff --git a/t/man2.sh b/t/man2.sh
index 7a1c5d7..a7b7646 100755
--- a/t/man2.sh
+++ b/t/man2.sh
@@ -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
cat >> configure.ac <<'END'
AC_OUTPUT
@@ -42,14 +42,14 @@ cwd=$(pwd) || fatal_ "getting current working directory"
./configure --prefix='' --mandir=/man
$MAKE DESTDIR="$cwd/_inst" install
-test -f ./_inst/man/man2/foo.2
-test -f ./_inst/man/man4/foo.4
-test -f ./_inst/man/man4/bar.4
+test -f _inst/man/man2/foo.2
+test -f _inst/man/man4/foo.4
+test -f _inst/man/man4/bar.4
$MAKE DESTDIR="$cwd/_inst" uninstall
-test ! -f ./_inst/man/man2/foo.2
-test ! -f ./_inst/man/man4/foo.4
-test ! -f ./_inst/man/man4/bar.4
+test ! -e _inst/man/man2/foo.2
+test ! -e _inst/man/man4/foo.4
+test ! -e _inst/man/man4/bar.4
:
diff --git a/t/man3.sh b/t/man3.sh
index baa05fe..9c2b68a 100755
--- a/t/man3.sh
+++ b/t/man3.sh
@@ -16,7 +16,7 @@
# PR 516: Prefer generated manpages to distributed ones.
-. ./defs || Exit 1
+. ./defs || exit 1
cat > Makefile.am << 'END'
dist_man_MANS = foo.1
diff --git a/t/man5.sh b/t/man5.sh
index 89f2545..d3c2270 100755
--- a/t/man5.sh
+++ b/t/man5.sh
@@ -16,7 +16,7 @@
# Make sure to extract the correct mansection from files in man_MANS.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac <<'END'
AC_OUTPUT
@@ -53,17 +53,17 @@ test -f _inst/man/man2/nbaz-1.4.2
test -f _inst/man/man3/bar.3
test -f _inst/man/man3/nbar.3
-test ! -d _inst/man/man1
-test ! -d _inst/man/man4
-test ! -d _inst/man/man5
+test ! -e _inst/man/man1
+test ! -e _inst/man/man4
+test ! -e _inst/man/man5
$MAKE DESTDIR="$cwd/_inst" uninstall
-test ! -f _inst/man/man2/foo.2
-test ! -f _inst/man/man2/nfoo.2
-test ! -f _inst/man/man2/baz-1.4.2
-test ! -f _inst/man/man2/nbaz-1.4.2
-test ! -f _inst/man/man3/bar.3
-test ! -f _inst/man/man3/nbar.3
+test ! -e _inst/man/man2/foo.2
+test ! -e _inst/man/man2/nfoo.2
+test ! -e _inst/man/man2/baz-1.4.2
+test ! -e _inst/man/man2/nbaz-1.4.2
+test ! -e _inst/man/man3/bar.3
+test ! -e _inst/man/man3/nbar.3
:
diff --git a/t/man6.sh b/t/man6.sh
index dfaeb12..c2f21a9 100755
--- a/t/man6.sh
+++ b/t/man6.sh
@@ -18,7 +18,7 @@
# even if the 'missing' script is involved.
required=help2man
-. ./defs || Exit 1
+. ./defs || exit 1
cat > Makefile.am << 'END'
dist_man_MANS = $(srcdir)/foobar.1 bazquux.1 zardoz.1
diff --git a/t/man7.sh b/t/man7.sh
index 37bec90..5791b72 100755
--- a/t/man7.sh
+++ b/t/man7.sh
@@ -16,7 +16,7 @@
# Check for a bug in maintainer-clean w.r.t. generated manpages.
-. ./defs || Exit 1
+. ./defs || exit 1
cat > Makefile.am << 'END'
dist_man_MANS = $(srcdir)/foo.1 bar.1
@@ -42,8 +42,8 @@ test -f bar.1
test -f ../foo.1
$MAKE maintainer-clean
-test ! -f bar.1
-test ! -f ../foo.1
+test ! -e bar.1
+test ! -e ../foo.1
cd ..
./configure
@@ -53,7 +53,7 @@ test -f bar.1
test -f foo.1
$MAKE maintainer-clean
-test ! -f bar.1
-test ! -f foo.1
+test ! -e bar.1
+test ! -e foo.1
:
diff --git a/t/man8.sh b/t/man8.sh
index 4293fde..597093f 100755
--- a/t/man8.sh
+++ b/t/man8.sh
@@ -16,7 +16,7 @@
# Check for a bug in distcheck w.r.t. generated manpages.
-. ./defs || Exit 1
+. ./defs || exit 1
cat > Makefile.am << 'END'
dist_man_MANS = foo.1
diff --git a/t/mdate.sh b/t/mdate.sh
index b33bf63..e44144a 100755
--- a/t/mdate.sh
+++ b/t/mdate.sh
@@ -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
diff --git a/t/mdate2.sh b/t/mdate2.sh
index ef08121..f984959 100755
--- a/t/mdate2.sh
+++ b/t/mdate2.sh
@@ -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
diff --git a/t/mdate3.sh b/t/mdate3.sh
index a37e60b..aa2755e 100755
--- a/t/mdate3.sh
+++ b/t/mdate3.sh
@@ -16,7 +16,7 @@
# Test to make sure mdate-sh run correctly.
-. ./defs || Exit 1
+. ./defs || exit 1
cat > configure.ac << END
AC_INIT([$me], [1.0])
@@ -45,5 +45,5 @@ mv missing foo
$ACLOCAL
$AUTOMAKE
-grep '[^/]mdate-sh' Makefile.in && Exit 1
-Exit 0
+grep '[^/]mdate-sh' Makefile.in && exit 1
+exit 0
diff --git a/t/mdate5.sh b/t/mdate5.sh
index 66afac1..0cbc198 100755
--- a/t/mdate5.sh
+++ b/t/mdate5.sh
@@ -17,7 +17,7 @@
# Test to make sure mdate-sh works correctly.
am_create_testdir=empty
-. ./defs || Exit 1
+. ./defs || exit 1
get_shell_script mdate-sh
@@ -27,19 +27,19 @@ echo "$*" # For debugging.
# 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
# Hopefully automake will be obsolete in 80 years ;-)
-case $3 in 20[0-9][0-9]) :;; *) Exit 1;; esac
+case $3 in 20[0-9][0-9]) :;; *) exit 1;; esac
case $2 in
January|February|March|April|May|June|July|August) ;;
September|October|November|December) ;;
- *) Exit 1
+ *) exit 1
esac
# Stricter checks on the year required a POSIX date(1) command.
if year=$(date +%Y) && test $year -gt 2010; then
- test $year = $3 || Exit 1
+ test $year = $3 || exit 1
fi
:
diff --git a/t/mdate6.sh b/t/mdate6.sh
index ca3ca21..110bb2d 100755
--- a/t/mdate6.sh
+++ b/t/mdate6.sh
@@ -17,7 +17,7 @@
# mdate-sh can work with weird file names, doesn't eval too much.
am_create_testdir=empty
-. ./defs || Exit 1
+. ./defs || exit 1
a=
file='file name $a'
@@ -27,7 +27,7 @@ file='file name $a'
get_shell_script mdate-sh
./mdate-sh "$file" >stdout 2>stderr ||
- { cat stdout; cat stderr >&2; Exit 1; }
+ { cat stdout; cat stderr >&2; exit 1; }
cat stdout
cat stderr >&2
grep '[12][0-9]\{3\}' stdout
diff --git a/t/memoize.tap b/t/memoize.tap
index b9188bf..a89515b 100755
--- a/t/memoize.tap
+++ b/t/memoize.tap
@@ -17,11 +17,11 @@
# Test Automake-provided memoization for make variables.
am_create_testdir=empty
-. ./defs || Exit 1
+. ./defs || exit 1
plan_ 17
-ocwd=`pwd` || fatal_ "couldn't get current working directory"
+ocwd=$(pwd) || fatal_ "couldn't get current working directory"
cp "$am_amdir"/header-vars.am . \
|| fatal_ "fetching makefile fragment headers-vars.am"
@@ -33,7 +33,7 @@ rm -f header-vars.am
T ()
{
- tcount=`expr $tcount + 1`
+ tcount=$(($tcount + 1))
mkdir $tcount.d
cd $tcount.d
echo include ../defn.mk > Makefile
diff --git a/t/missing-auxfile-stops-makefiles-creation.sh
b/t/missing-auxfile-stops-makefiles-creation.sh
index d708081..d1c0cd4 100755
--- a/t/missing-auxfile-stops-makefiles-creation.sh
+++ b/t/missing-auxfile-stops-makefiles-creation.sh
@@ -17,7 +17,7 @@
# Automake should stop the creation of Makefile.in files at the first
# encountered error due to a required auxiliary file not found.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac <<END
AM_PATH_PYTHON
@@ -44,10 +44,10 @@ ls -l Makefile.in */Makefile.in || : # For debugging.
# too strict semantics here, so don't check for it. But the later
# files shouldn't exist.
test -f sub1/Makefile.in
-test ! -f sub2/Makefile.in
-test ! -f sub3/Makefile.in
-test ! -f sub4/Makefile.in
-test ! -f sub5/Makefile.in
+test ! -e sub2/Makefile.in
+test ! -e sub3/Makefile.in
+test ! -e sub4/Makefile.in
+test ! -e sub5/Makefile.in
rm -f Makefile.in */Makefile.in
@@ -59,7 +59,7 @@ ls -l Makefile.in */Makefile.in || : # For debugging.
test -f sub1/Makefile.in
test -f sub2/Makefile.in
test -f sub3/Makefile.in
-test ! -f sub4/Makefile.in
-test ! -f sub5/Makefile.in
+test ! -e sub4/Makefile.in
+test ! -e sub5/Makefile.in
:
diff --git a/t/missing-version-mismatch.sh b/t/missing-version-mismatch.sh
index 4a2910a..e4a1033 100755
--- a/t/missing-version-mismatch.sh
+++ b/t/missing-version-mismatch.sh
@@ -17,14 +17,14 @@
# Test missing with version mismatches.
am_create_testdir=empty
-. ./defs || Exit 1
+. ./defs || exit 1
get_shell_script missing
do_check ()
{
progname=$1; shift;
- ./missing "$@" 2>stderr && { cat stderr >&2; Exit 1; }
+ ./missing "$@" 2>stderr && { cat stderr >&2; exit 1; }
cat stderr >&2
$FGREP "WARNING: '$progname' is probably too old." stderr
}
diff --git a/t/missing3.sh b/t/missing3.sh
index e8641da..3a9ba01 100755
--- a/t/missing3.sh
+++ b/t/missing3.sh
@@ -17,7 +17,7 @@
# Test missing when running a tool's --version.
am_create_testdir=empty
-. ./defs || Exit 1
+. ./defs || exit 1
get_shell_script missing
@@ -31,18 +31,18 @@ run_cmd ()
return $st
}
-./missing b7cb8259 --version && Exit 1
-grep WARNING stderr && Exit 1
-run_cmd ./missing b7cb8259 --grep && Exit 1
+./missing b7cb8259 --version && exit 1
+grep WARNING stderr && exit 1
+run_cmd ./missing b7cb8259 --grep && exit 1
grep 'WARNING:.*missing on your system' stderr
# missing itself it known to exist :)
-run_cmd ./missing ./missing --version || Exit 1
+run_cmd ./missing ./missing --version || exit 1
grep 'missing .*(GNU [aA]utomake)' stdout
-test -s stderr && Exit 1
-run_cmd ./missing ./missing --grep && Exit 1
-grep WARNING stderr && Exit 1
+test -s stderr && exit 1
+run_cmd ./missing ./missing --grep && exit 1
+grep WARNING stderr && exit 1
grep "missing:.* unknown '--grep'" stderr
:
diff --git a/t/mkinst2.sh b/t/mkinst2.sh
index 2a4fb0b..daf8760 100755
--- a/t/mkinst2.sh
+++ b/t/mkinst2.sh
@@ -16,7 +16,7 @@
# Test to make sure no-installman suppresses man dir creation.
-. ./defs || Exit 1
+. ./defs || exit 1
echo AC_OUTPUT >> configure.ac
@@ -33,8 +33,8 @@ $AUTOMAKE
./configure --prefix "$(pwd)/sub"
$MAKE installdirs
-test ! -d sub/man
+test ! -e sub/man
$MAKE install
-test ! -d sub/man
+test ! -e sub/man
:
diff --git a/t/mkinst3.sh b/t/mkinst3.sh
index 79a8dd5..880d417 100755
--- a/t/mkinst3.sh
+++ b/t/mkinst3.sh
@@ -17,7 +17,7 @@
# Test "install-sh -d" with spaces in directory names.
am_create_testdir=empty
-. ./defs || Exit 1
+. ./defs || exit 1
cwd=$(pwd) || fatal_ "getting current working directory"
diff --git a/t/mmode.sh b/t/mmode.sh
index 6c80399..23cb646 100755
--- a/t/mmode.sh
+++ b/t/mmode.sh
@@ -16,7 +16,7 @@
# Check for AM_MAINTAINER_MODE defaults.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AM_MAINTAINER_MODE
@@ -36,7 +36,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.ac > configure.int
mv -f configure.int configure.ac
@@ -49,16 +49,16 @@ mv -f configure.int configure.ac
$AUTOCONF --force
./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.ac > configure.int
mv -f configure.int configure.ac
-$AUTOCONF --force -Werror && Exit 1
+$AUTOCONF --force -Werror && exit 1
:
diff --git a/t/mmodely.sh b/t/mmodely.sh
index 2cf1be0..0ece11f 100755
--- a/t/mmodely.sh
+++ b/t/mmodely.sh
@@ -19,7 +19,7 @@
# From Derek R. Price.
required=cc
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AM_MAINTAINER_MODE
diff --git a/t/multlib.sh b/t/multlib.sh
index 1744b36..a5b1c94 100755
--- a/t/multlib.sh
+++ b/t/multlib.sh
@@ -20,7 +20,7 @@
# FIXME: We should move this script accordingly.
required=gcc
-. ./defs || Exit 1
+. ./defs || exit 1
mldir=$am_top_srcdir/contrib/multilib
mkdir m4
diff --git a/t/no-c.tap b/t/no-c.tap
index 5adb056..90a767e 100755
--- a/t/no-c.tap
+++ b/t/no-c.tap
@@ -17,7 +17,7 @@
# Projects using only Fortran or C++ shouldn't need C-related stuff.
am_create_testdir=empty
-. ./defs || Exit 1
+. ./defs || exit 1
plan_ 6
diff --git a/t/no-extra-makefile-code.sh b/t/no-extra-makefile-code.sh
index 1c91452..cfe1249 100755
--- a/t/no-extra-makefile-code.sh
+++ b/t/no-extra-makefile-code.sh
@@ -19,7 +19,7 @@
# by a regression caused by removal of automatic de-ANSI-fication support:
# <http://lists.gnu.org/archive/html/automake-patches/2011-08/msg00200.html>
-. ./defs || Exit 1
+. ./defs || exit 1
echo AC_OUTPUT >> configure.ac
@@ -30,6 +30,6 @@ rm -f depcomp compile
$ACLOCAL
$AUTOMAKE
-$EGREP 'INCLUDE|-compile|\$\(OBJEXT\)|tab\.[ch]' Makefile.in && Exit 1
+$EGREP 'INCLUDE|-compile|\$\(OBJEXT\)|tab\.[ch]' Makefile.in && exit 1
:
diff --git a/t/nobase-libtool.sh b/t/nobase-libtool.sh
index 163ffd3..2a6bc2a 100755
--- a/t/nobase-libtool.sh
+++ b/t/nobase-libtool.sh
@@ -19,7 +19,7 @@
# up for greater exposure of nobase.test.
required='cc libtoolize'
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac <<'EOF'
AC_PROG_CC
diff --git a/t/nobase-nodist.sh b/t/nobase-nodist.sh
index 54b940b..1ec466f 100755
--- a/t/nobase-nodist.sh
+++ b/t/nobase-nodist.sh
@@ -16,7 +16,7 @@
# Interaction of 'nobase_' and 'nodist_' prefixes.
-. ./defs || Exit 1
+. ./defs || exit 1
# Simulate no emacs and no python (it shouldn't be needed in this test).
EMACS="no" PYTHON=":"; export EMCAS PYTHON
@@ -46,15 +46,15 @@ $AUTOMAKE -a
$MAKE distdir
ls -l $distdir $distdir/* # For debugging.
-test ! -f $distdir/foo1.el
-test ! -f $distdir/sub/foo2.el
-test ! -f $distdir/foo3.el
-test ! -f $distdir/sub/foo4.el
-test ! -f $distdir/bar1.java
-test ! -f $distdir/sub/bar2.java
-test ! -f $distdir/bar3.java
-test ! -f $distdir/sub/bar4.java
-test ! -f $distdir/baz1.py
-test ! -f $distdir/sub/baz2.py
+test ! -e $distdir/foo1.el
+test ! -e $distdir/sub/foo2.el
+test ! -e $distdir/foo3.el
+test ! -e $distdir/sub/foo4.el
+test ! -e $distdir/bar1.java
+test ! -e $distdir/sub/bar2.java
+test ! -e $distdir/bar3.java
+test ! -e $distdir/sub/bar4.java
+test ! -e $distdir/baz1.py
+test ! -e $distdir/sub/baz2.py
:
diff --git a/t/nobase-python.sh b/t/nobase-python.sh
index 2f8ee7e..33114df 100755
--- a/t/nobase-python.sh
+++ b/t/nobase-python.sh
@@ -17,7 +17,7 @@
# Make sure nobase_* works for python files.
required=python
-. ./defs || Exit 1
+. ./defs || exit 1
cat >>configure.ac <<EOF
AM_PATH_PYTHON
@@ -59,7 +59,7 @@ $MAKE
$MAKE test-install-data
$MAKE uninstall
-find inst/my -type f -print | grep . && Exit 1
+find inst/my -type f -print | grep . && exit 1
$MAKE install-strip
@@ -73,6 +73,6 @@ cd build
$MAKE
$MAKE test-install-data
$MAKE uninstall
-find inst/my -type f -print | grep . && Exit 1
+find inst/my -type f -print | grep . && exit 1
:
diff --git a/t/nobase.sh b/t/nobase.sh
index a7219ed..1432d8d 100755
--- a/t/nobase.sh
+++ b/t/nobase.sh
@@ -17,7 +17,7 @@
# Make sure nobase_* works.
required=cc
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac <<'EOF'
AC_PROG_CC
diff --git a/t/nodef2.sh b/t/nodef2.sh
index 1af7b0d..2f7bb77 100755
--- a/t/nodef2.sh
+++ b/t/nodef2.sh
@@ -16,7 +16,7 @@
# Make sure that PACKAGE and VERSION are AC_DEFINEd when requested.
-. ./defs || Exit 1
+. ./defs || exit 1
# First, check that PACKAGE and VERSION are output by default.
@@ -49,6 +49,6 @@ $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/t/nodep2.sh b/t/nodep2.sh
index 45e7d5c..13d1174 100755
--- a/t/nodep2.sh
+++ b/t/nodep2.sh
@@ -16,7 +16,7 @@
# Another test to make sure no-dependencies option does the right thing.
-. ./defs || Exit 1
+. ./defs || exit 1
cat > Makefile.am << 'END'
bin_PROGRAMS = foo
@@ -40,6 +40,6 @@ END
$ACLOCAL
$AUTOMAKE
-grep DEPMODE Makefile.in && Exit 1
+grep DEPMODE Makefile.in && exit 1
:
diff --git a/t/nodepcomp.sh b/t/nodepcomp.sh
index 4691efa..25c66b5 100755
--- a/t/nodepcomp.sh
+++ b/t/nodepcomp.sh
@@ -16,7 +16,7 @@
# Test to make sure depcomp isn't always required.
-. ./defs || Exit 1
+. ./defs || exit 1
rm -f depcomp
diff --git a/t/nodist.sh b/t/nodist.sh
index 931b5c8..41083c3 100755
--- a/t/nodist.sh
+++ b/t/nodist.sh
@@ -16,7 +16,7 @@
# Test to make sure dist_*_SOURCES and nodist_*_SOURCES work.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
@@ -35,6 +35,6 @@ $AUTOMAKE
grep '^am_eyeball_OBJECTS' Makefile.in
grep '^am__dist_sources =' Makefile.in
-grep '^am__dist_sources =.*nodist' Makefile.in && Exit 1
+grep '^am__dist_sources =.*nodist' Makefile.in && exit 1
:
diff --git a/t/nodist2.sh b/t/nodist2.sh
index 9c7ec30..9db9dce 100755
--- a/t/nodist2.sh
+++ b/t/nodist2.sh
@@ -17,7 +17,7 @@
# Test to make sure nodist_noinst_HEADERS work.
# For PR 249.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac <<'EOF'
AC_OUTPUT
diff --git a/t/nodist3.sh b/t/nodist3.sh
index 07e9047..33a2d5c 100755
--- a/t/nodist3.sh
+++ b/t/nodist3.sh
@@ -16,7 +16,7 @@
# Test to make sure no-dist option works.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
@@ -31,7 +31,7 @@ END
$ACLOCAL
$AUTOMAKE
-grep '^dist:' Makefile.in && Exit 1
-grep 'am__dist_sources' Makefile.in && Exit 1
+grep '^dist:' Makefile.in && exit 1
+grep 'am__dist_sources' Makefile.in && exit 1
:
diff --git a/t/noinst.sh b/t/noinst.sh
index 887c7a7..ca4440f 100755
--- a/t/noinst.sh
+++ b/t/noinst.sh
@@ -17,7 +17,7 @@
# 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:
diff --git a/t/noinstdir.sh b/t/noinstdir.sh
index 39abdc7..be07970 100755
--- a/t/noinstdir.sh
+++ b/t/noinstdir.sh
@@ -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
@@ -43,7 +43,7 @@ END
$ACLOCAL
$AUTOMAKE
-grep 'noinstdir' Makefile.in && Exit 1
-grep 'checkdir' Makefile.in && Exit 1
+grep 'noinstdir' Makefile.in && exit 1
+grep 'checkdir' Makefile.in && exit 1
:
diff --git a/t/nolink.sh b/t/nolink.sh
index dea6271..34219b2 100755
--- a/t/nolink.sh
+++ b/t/nolink.sh
@@ -16,7 +16,7 @@
# Make sure Automake does not emit a link rule for unknown languages.
-. ./defs || Exit 1
+. ./defs || exit 1
cat > Makefile.am << 'END'
AUTOMAKE_OPTIONS = no-exeext
@@ -31,6 +31,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/t/nostdinc.sh b/t/nostdinc.sh
index 62e752e..2ec2b82 100755
--- a/t/nostdinc.sh
+++ b/t/nostdinc.sh
@@ -17,7 +17,7 @@
# Test to make sure nostdinc option works correctly.
required=cc
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
@@ -51,9 +51,9 @@ $AUTOMAKE --add-missing
mkdir build
cd build
../configure
-$MAKE V=1 > output || { cat output; Exit 1; }
+$MAKE V=1 > output || { cat output; exit 1; }
cat output
-grep '.*-I *\.' stdout && Exit 1
+grep '.*-I *\.' stdout && exit 1
$MAKE clean
# Shouldn't be picked up from builddir either.
cp ../stdlib.h .
@@ -62,8 +62,8 @@ cd ..
# Test with $builddir = $srcdir
./configure
-$MAKE V=1 > output || { cat output; Exit 1; }
+$MAKE V=1 > output || { cat output; exit 1; }
cat output
-grep '.*-I *\.' output && Exit 1
+grep '.*-I *\.' output && exit 1
:
diff --git a/t/notrans.sh b/t/notrans.sh
index 81ed4d8..d997e97 100755
--- a/t/notrans.sh
+++ b/t/notrans.sh
@@ -17,7 +17,7 @@
# Check all notrans_, dist_, nodist_ prefix combinations for MANS
# primary and install-man dependencies.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >>configure.ac <<'END'
AC_OUTPUT
@@ -106,8 +106,8 @@ grep '^install-man3:' Makefile.in | grep
'\$(nodist_man_MANS)'
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)'
-grep '^install-man8:' Makefile.in && Exit 1
-grep '^install-man9:' Makefile.in && Exit 1
+grep '^install-man8:' Makefile.in && exit 1
+grep '^install-man9:' Makefile.in && exit 1
cwd=$(pwd) || fatal_ "getting current working directory"
@@ -129,7 +129,7 @@ test -d inst/man/man4
test -d inst/man/man5
test -d inst/man/man6
test -d inst/man/man7
-test -d inst/man/man8 && Exit 1
-test -d inst/man/man9 && Exit 1
+test -d inst/man/man8 && exit 1
+test -d inst/man/man9 && exit 1
:
diff --git a/t/number.sh b/t/number.sh
index d5c3acf..e0ccd24 100755
--- a/t/number.sh
+++ b/t/number.sh
@@ -17,7 +17,7 @@
# Test to make sure _OBJECTS is only generated once. Bug reported by
# Joerg-Martin Schwarz.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
diff --git a/t/objc-basic.sh b/t/objc-basic.sh
index 464887b..5268bd5 100755
--- a/t/objc-basic.sh
+++ b/t/objc-basic.sh
@@ -15,7 +15,7 @@
# require an Objective-C compiler.
# See also sister test 'objcxx-basic.sh'.
-. ./defs || Exit 1
+. ./defs || exit 1
cat > Makefile.am <<'END'
bin_PROGRAMS = hello
diff --git a/t/objc-deps.sh b/t/objc-deps.sh
index a2e4212..31bc30d 100755
--- a/t/objc-deps.sh
+++ b/t/objc-deps.sh
@@ -17,7 +17,7 @@
# Automatic dependency tracking for Objective C.
# See also sister test 'objcxx-deps.sh'.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_OBJC
@@ -55,7 +55,7 @@ $AUTOMAKE --add-missing
./configure --enable-dependency-tracking
$MAKE
-cross_compiling || (./foo | $FGREP 'Hello, World') || Exit 1
+cross_compiling || (./foo | $FGREP 'Hello, World') || exit 1
$sleep
: > old
echo '#define MSG "Howdy, Earth"' > baz2.h
@@ -65,7 +65,7 @@ if test -f foo; then
else
is_newest foo.exe old
fi
-cross_compiling || (./foo | $FGREP 'Howdy, Earth') || Exit 1
+cross_compiling || (./foo | $FGREP 'Howdy, Earth') || exit 1
$MAKE distcheck
diff --git a/t/objc-flags.sh b/t/objc-flags.sh
index 25f805b..2f65d46 100755
--- a/t/objc-flags.sh
+++ b/t/objc-flags.sh
@@ -16,7 +16,7 @@
# Test Objective C compilation flags.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_OBJC
@@ -52,9 +52,9 @@ $AUTOCONF
$AUTOMAKE -a
$FGREP OBJCFLAGS Makefile.in # For debugging.
-grep '\$(OBJCFLAGS).*\$(AM_OBJCFLAGS)' Makefile.in && Exit 1
-grep '\$(OBJCFLAGS).*\$(foo.*_OBJCFLAGS)' Makefile.in && Exit 1
-grep '\$(foo.*_OBJCFLAGS).*\$(AM_OBJCFLAGS)' Makefile.in && Exit 1
+grep '\$(OBJCFLAGS).*\$(AM_OBJCFLAGS)' Makefile.in && exit 1
+grep '\$(OBJCFLAGS).*\$(foo.*_OBJCFLAGS)' Makefile.in && exit 1
+grep '\$(foo.*_OBJCFLAGS).*\$(AM_OBJCFLAGS)' Makefile.in && exit 1
./configure OBJCFLAGS=-UERROR
$MAKE
diff --git a/t/objc-megademo.sh b/t/objc-megademo.sh
index 459fb0d..4329029 100755
--- a/t/objc-megademo.sh
+++ b/t/objc-megademo.sh
@@ -18,7 +18,7 @@
required=libtoolize
am_create_testdir=empty
-. ./defs || Exit 1
+. ./defs || exit 1
## Autotools Input Files.
@@ -329,7 +329,7 @@ if ! cross_compiling; then
[Hello ObjC, world ObjC]
[Hello ObjC++, world ObjC++]
END
- ./play > got || { cat got; Exit 1; }
+ ./play > got || { cat got; exit 1; }
cat exp
cat got
diff exp got
diff --git a/t/objc-minidemo.sh b/t/objc-minidemo.sh
index acd7e19..e20a036 100755
--- a/t/objc-minidemo.sh
+++ b/t/objc-minidemo.sh
@@ -18,7 +18,7 @@
# See also sister test 'objcxx-minidemo.sh'.
required=native
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_OBJC
@@ -60,7 +60,7 @@ if $ACLOCAL; then
elif test $? -eq 63; then
skip_ "Object C++ support requires Autoconf 2.65 or later"
else
- Exit 1 # Some other aclocal failure.
+ exit 1 # Some other aclocal failure.
fi
$ACLOCAL
diff --git a/t/objcxx-basic.sh b/t/objcxx-basic.sh
index 1c807dc..3f8c211 100755
--- a/t/objcxx-basic.sh
+++ b/t/objcxx-basic.sh
@@ -15,7 +15,7 @@
# require an Objective-C++ compiler.
# See also sister test 'objc-basic.sh'.
-. ./defs || Exit 1
+. ./defs || exit 1
cat > Makefile.am <<'END'
bin_PROGRAMS = hello
diff --git a/t/objcxx-deps.sh b/t/objcxx-deps.sh
index c072da2..950663b 100755
--- a/t/objcxx-deps.sh
+++ b/t/objcxx-deps.sh
@@ -17,7 +17,7 @@
# Automatic dependency tracking for Objective C++.
# See also sister test 'objc-deps.sh'.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_OBJCXX
@@ -54,7 +54,7 @@ $AUTOMAKE --add-missing
./configure --enable-dependency-tracking
$MAKE
-cross_compiling || (./foo | $FGREP 'Hello, World') || Exit 1
+cross_compiling || (./foo | $FGREP 'Hello, World') || exit 1
$sleep
: > old
@@ -65,7 +65,7 @@ if test -f foo; then
else
is_newest foo.exe old
fi
-cross_compiling || (./foo | $FGREP 'Howdy, Earth') || Exit 1
+cross_compiling || (./foo | $FGREP 'Howdy, Earth') || exit 1
$MAKE distcheck
diff --git a/t/objcxx-flags.sh b/t/objcxx-flags.sh
index 082f7fb..6e79fc5 100755
--- a/t/objcxx-flags.sh
+++ b/t/objcxx-flags.sh
@@ -17,7 +17,7 @@
# Test Objective C++ compilation flags.
# See also sister test 'objc-flags.sh'.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_OBJCXX
@@ -53,9 +53,9 @@ $AUTOCONF
$AUTOMAKE -a
$FGREP OBJCXXFLAGS Makefile.in # For debugging.
-grep '\$(OBJCXXFLAGS).*\$(AM_OBJCXXFLAGS)' Makefile.in && Exit 1
-grep '\$(OBJCXXFLAGS).*\$(foo.*_OBJCXXFLAGS)' Makefile.in && Exit 1
-grep '\$(foo.*_OBJCXXFLAGS).*\$(AM_OBJCXXFLAGS)' Makefile.in && Exit 1
+grep '\$(OBJCXXFLAGS).*\$(AM_OBJCXXFLAGS)' Makefile.in && exit 1
+grep '\$(OBJCXXFLAGS).*\$(foo.*_OBJCXXFLAGS)' Makefile.in && exit 1
+grep '\$(foo.*_OBJCXXFLAGS).*\$(AM_OBJCXXFLAGS)' Makefile.in && exit 1
./configure OBJCXXFLAGS=-UERROR
$MAKE
diff --git a/t/objcxx-minidemo.sh b/t/objcxx-minidemo.sh
index e1eabca..cf62e31 100755
--- a/t/objcxx-minidemo.sh
+++ b/t/objcxx-minidemo.sh
@@ -18,7 +18,7 @@
# See also sister test 'objc-minidemo.sh'.
required=native
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_OBJCXX
diff --git a/t/objdir.sh b/t/objdir.sh
index 0f1f844..5d2a599 100755
--- a/t/objdir.sh
+++ b/t/objdir.sh
@@ -20,7 +20,7 @@
# - such a directory truly causes no problems with GNU make.
am_create_testdir=empty
-. ./defs || Exit 1
+. ./defs || exit 1
cat > configure.ac <<END
AC_INIT([$me], [1.0])
diff --git a/t/objext-pr10128.sh b/t/objext-pr10128.sh
index 440fc1d..e773b72 100755
--- a/t/objext-pr10128.sh
+++ b/t/objext-pr10128.sh
@@ -17,7 +17,7 @@
# Test for automake bug#10128: $(OBJEXT) redefinition causes
# $(foo_OBJECTS) to be defined as empty.
-. ./defs || Exit 1
+. ./defs || exit 1
echo AC_OUTPUT >> configure.ac
diff --git a/t/oldvars.sh b/t/oldvars.sh
index dd162ff..26f6001 100755
--- a/t/oldvars.sh
+++ b/t/oldvars.sh
@@ -17,7 +17,7 @@
# Use of these variables is deprecated:
# LISP, HEADERS, DATA, SCRIPTS, LTLIBRARIES, LIBRARIES, PROGRAMS, MANS.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >Makefile.am <<\EOF
DATA =
diff --git a/t/option-ng.sh b/t/option-ng.sh
index 3ad9fa7..1104427 100755
--- a/t/option-ng.sh
+++ b/t/option-ng.sh
@@ -16,7 +16,7 @@
# Automake-NG should recognize the (no-op) 'ng' option.
-. ./defs || Exit 1
+. ./defs || exit 1
cat > configure.ac <<END
AC_INIT([$me], [1.0])
diff --git a/t/order.sh b/t/order.sh
index 2383403..cd0beac 100755
--- a/t/order.sh
+++ b/t/order.sh
@@ -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
cat >> configure.ac << 'END'
jm_TEST
diff --git a/t/output-order.sh b/t/output-order.sh
index 879b678..02b26df 100755
--- a/t/output-order.sh
+++ b/t/output-order.sh
@@ -17,7 +17,7 @@
# Test that 'automake -a' output order is stable.
# From report by Bruno Haible.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >>configure.ac <<'END'
AC_OUTPUT
@@ -41,7 +41,7 @@ END
$ACLOCAL
$AUTOCONF
rm -f missing install-sh
-$AUTOMAKE --add-missing --copy 2>stderr || { cat stderr >&2; Exit 1; }
+$AUTOMAKE --add-missing --copy 2>stderr || { cat stderr >&2; exit 1; }
cat stderr >&2
for i in 1 2 3 4 5 6; do
diff --git a/t/output.sh b/t/output.sh
index faf877b..a21fe89 100755
--- a/t/output.sh
+++ b/t/output.sh
@@ -16,7 +16,7 @@
# Test to make sure files listed in AC_OUTPUT are found.
-. ./defs || Exit 1
+. ./defs || exit 1
cat > configure.ac <<END
AC_INIT([$me], [1.0])
diff --git a/t/output10.sh b/t/output10.sh
index 92492f6..f0060fd 100755
--- a/t/output10.sh
+++ b/t/output10.sh
@@ -18,7 +18,7 @@
# This is comparable to output9.test, but testing Makefile rules.
# PR/411
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << END
AC_SUBST([FOO], [top])
diff --git a/t/output11.sh b/t/output11.sh
index 4413f97..7dbd835 100755
--- a/t/output11.sh
+++ b/t/output11.sh
@@ -16,7 +16,7 @@
# Make sure an AC_CONFIG_FILES ignore filenames with shell variables.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << \END
AC_SUBST([FOO], [foo])
@@ -53,7 +53,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/t/output12.sh b/t/output12.sh
index a3693cc..80e0f20 100755
--- a/t/output12.sh
+++ b/t/output12.sh
@@ -16,7 +16,7 @@
# Make sure an AC_CONFIG_FILES process filenames with AC_SUBST variables.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << \END
AC_SUBST([FOO], [foo])
diff --git a/t/output13.sh b/t/output13.sh
index 065bdb5..16bc0f9 100755
--- a/t/output13.sh
+++ b/t/output13.sh
@@ -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
cat >> configure.ac << \END
AC_SUBST([FOO], [foo])
@@ -40,9 +40,9 @@ $AUTOMAKE
./configure create=false
$MAKE
-test ! -f file
-test ! -f link
-test ! -f stamp
+test ! -e file
+test ! -e link
+test ! -e stamp
./configure create=:
test -f file
diff --git a/t/output2.sh b/t/output2.sh
index 41c81bf..615f6cf 100755
--- a/t/output2.sh
+++ b/t/output2.sh
@@ -16,7 +16,7 @@
# Another AC_OUTPUT test. From report by Ulrich Drepper.
-. ./defs || Exit 1
+. ./defs || exit 1
cat > configure.ac <<END
AC_INIT([$me], [1.0])
@@ -34,5 +34,5 @@ mkdir intl po misc
$ACLOCAL
$AUTOMAKE
-grep '^gettextize' Makefile.in && Exit 1
-Exit 0
+grep '^gettextize' Makefile.in && exit 1
+exit 0
diff --git a/t/output3.sh b/t/output3.sh
index dd7aaef..2e4f38a 100755
--- a/t/output3.sh
+++ b/t/output3.sh
@@ -16,7 +16,7 @@
# Yet another AC_OUTPUT test.
-. ./defs || Exit 1
+. ./defs || exit 1
cat > configure.ac <<END
AC_INIT([$me], [1.0])
diff --git a/t/output4.sh b/t/output4.sh
index fa6a95e..54d49e2 100755
--- a/t/output4.sh
+++ b/t/output4.sh
@@ -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.ac <<END
AC_INIT([$me], [1.0])
@@ -31,5 +31,5 @@ mkdir tests
$ACLOCAL
$AUTOMAKE
-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/t/output5.sh b/t/output5.sh
index 8bf9403..8222ea7 100755
--- a/t/output5.sh
+++ b/t/output5.sh
@@ -16,7 +16,7 @@
# Make sure Automake complains when there is no Makefile specified.
-. ./defs || Exit 1
+. ./defs || exit 1
cat > configure.ac << 'END'
AC_INIT([foo], [bar], [baz])
diff --git a/t/output6.sh b/t/output6.sh
index 80ae4ff..bcba3a7 100755
--- a/t/output6.sh
+++ b/t/output6.sh
@@ -16,7 +16,7 @@
# Check for support for colon-separated input files in AC_CONFIG_FILES.
-. ./defs || Exit 1
+. ./defs || exit 1
cat > configure.ac << END
AC_INIT([$me], [1.0])
diff --git a/t/output7.sh b/t/output7.sh
index 0f4725f..d5aca29 100755
--- a/t/output7.sh
+++ b/t/output7.sh
@@ -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
cat > configure.ac << END
AC_INIT([$me], [1.0])
diff --git a/t/output8.sh b/t/output8.sh
index 943e758..62cade5 100755
--- a/t/output8.sh
+++ b/t/output8.sh
@@ -17,7 +17,7 @@
# Check AC_CONFIG_FILES support for files starting with '../'.
# Report from Bruno Haible.
-. ./defs || Exit 1
+. ./defs || exit 1
mkdir testdir
cd testdir
diff --git a/t/output9.sh b/t/output9.sh
index f075910..54dc8c1 100755
--- a/t/output9.sh
+++ b/t/output9.sh
@@ -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
cat >> configure.ac << END
AC_CONFIG_FILES([a/mid.in:a/input.in.in])
diff --git a/t/override-conditional-1.sh b/t/override-conditional-1.sh
index 020a6e3..42e0350 100755
--- a/t/override-conditional-1.sh
+++ b/t/override-conditional-1.sh
@@ -16,7 +16,7 @@
# Test for conditionally-defined overrides.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AM_CONDITIONAL([COND], [test x"$cond" = x"yes"])
@@ -44,7 +44,7 @@ $AUTOCONF
./configure cond=no
$MAKE ps
-test ! -r foobar
+test ! -e foobar
./configure cond=yes
$MAKE ps
diff --git a/t/override-conditional-2.sh b/t/override-conditional-2.sh
index 4f06888..58ab1fd 100755
--- a/t/override-conditional-2.sh
+++ b/t/override-conditional-2.sh
@@ -18,7 +18,7 @@
# This test is still xfailing; see the FIXME in Automake::Rule::define.
# Once that is fixed, the test should succeed.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AM_CONDITIONAL([COND], [:])
diff --git a/t/override-html.sh b/t/override-html.sh
index cf57880..777d946 100755
--- a/t/override-html.sh
+++ b/t/override-html.sh
@@ -17,7 +17,7 @@
# Test that overriding 'html' target causes only one "html:" rule to
# be output.
-. ./defs || Exit 1
+. ./defs || exit 1
cat > Makefile.am << 'END'
html:
diff --git a/t/override-suggest-local.sh b/t/override-suggest-local.sh
index 286c888..11b7fb9 100755
--- a/t/override-suggest-local.sh
+++ b/t/override-suggest-local.sh
@@ -17,7 +17,7 @@
# Make sure automake -Woverride suggests using TARGET-local instead
# of TARGET when possible.
-. ./defs || Exit 1
+. ./defs || exit 1
cat > Makefile.am << 'END'
install:
@@ -34,11 +34,11 @@ $ACLOCAL
$AUTOMAKE -Wno-override
AUTOMAKE_fails
# There is no such thing as 'install-local'.
-grep ':.*install-local' stderr && Exit 1
+grep ':.*install-local' stderr && exit 1
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
:
diff --git a/t/parallel-am.sh b/t/parallel-am.sh
index a27c663..bd50af9 100755
--- a/t/parallel-am.sh
+++ b/t/parallel-am.sh
@@ -36,7 +36,7 @@
# This test checks (0), (1), and (2). See sister tests for further coverage.
required=perl-threads
-. ./defs || Exit 1
+. ./defs || exit 1
cat > configure.ac << 'END'
AC_INIT([parallel-am], [1.0])
diff --git a/t/parallel-am2.sh b/t/parallel-am2.sh
index 2636756..4fc2eed 100755
--- a/t/parallel-am2.sh
+++ b/t/parallel-am2.sh
@@ -21,7 +21,7 @@
# warnings should be omitted in the same way as without threads.
required=perl-threads
-. ./defs || Exit 1
+. ./defs || exit 1
mkdir sub
diff --git a/t/parallel-am3.sh b/t/parallel-am3.sh
index d630290..1bc12bb 100755
--- a/t/parallel-am3.sh
+++ b/t/parallel-am3.sh
@@ -22,7 +22,7 @@
# installation of aux files should be race-free.
required=perl-threads
-. ./defs || Exit 1
+. ./defs || exit 1
cat > configure.ac << 'END'
AC_INIT([parallel-am], [1.0])
diff --git a/t/parallel-tests-concatenated-suffix.sh
b/t/parallel-tests-concatenated-suffix.sh
index 11e3f02..0c87cfa 100755
--- a/t/parallel-tests-concatenated-suffix.sh
+++ b/t/parallel-tests-concatenated-suffix.sh
@@ -17,7 +17,7 @@
# The parallel-tests driver should be able to cope with test scripts
# whose names end with several concatenated suffixes.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_OUTPUT
@@ -48,7 +48,7 @@ for j in '' -j4; do
# since Solaris 10 /bin/sh would try to optimize a ':' away after the
# first iteration, even if it is redirected.
echo " " >stdout
- $MAKE $j check >>stdout || { cat stdout; Exit 1; }
+ $MAKE $j check >>stdout || { cat stdout; exit 1; }
cat stdout
count_test_results total=7 pass=7 fail=0 skip=0 xfail=0 xpass=0 error=0
for t in $tests; do grep "^PASS: $t *$" stdout; done
diff --git a/t/parallel-tests-console-output.sh
b/t/parallel-tests-console-output.sh
index 5a78efd..2265008 100755
--- a/t/parallel-tests-console-output.sh
+++ b/t/parallel-tests-console-output.sh
@@ -17,7 +17,7 @@
# parallel-tests: some checks on console output about testsuite
# progress.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_OUTPUT
@@ -92,7 +92,7 @@ for vpath in : false; do
srcdir=.
fi
$srcdir/configure
- $MAKE check >stdout && { cat stdout; Exit 1; }
+ $MAKE check >stdout && { cat stdout; exit 1; }
cat stdout
LC_ALL=C grep '^[A-Z][A-Z]*:' stdout > got
cat got
diff --git a/t/parallel-tests-driver-install.sh
b/t/parallel-tests-driver-install.sh
index a04e9b1..e1a2248 100755
--- a/t/parallel-tests-driver-install.sh
+++ b/t/parallel-tests-driver-install.sh
@@ -18,7 +18,7 @@
# in the correct directory.
am_create_testdir=empty
-. ./defs || Exit 1
+. ./defs || exit 1
cat > configure.ac <<END
AC_INIT([$me], [1.0])
@@ -40,13 +40,13 @@ TESTS = bar.test
END
$ACLOCAL
-$AUTOMAKE -a 2>stderr || { cat stderr >&2; Exit 1; }
+$AUTOMAKE -a 2>stderr || { cat stderr >&2; exit 1; }
cat stderr >&2
ls -l . sub my_aux_dir # For debugging.
test -f my_aux_dir/test-driver
-test ! -r test-driver
-test ! -r sub/test-driver
+test ! -e test-driver
+test ! -e sub/test-driver
grep '^parallel-tests:.*installing.*my_aux_dir/test-driver' stderr
diff --git a/t/parallel-tests-dry-run-1.sh b/t/parallel-tests-dry-run-1.sh
index f5496e3..382ae20 100755
--- a/t/parallel-tests-dry-run-1.sh
+++ b/t/parallel-tests-dry-run-1.sh
@@ -17,7 +17,7 @@
# Check interactions between the parallel test harness and "make -n".
# See also sister test 'parallel-tests-dry-run-2.test'.
-. ./defs || Exit 1
+. ./defs || exit 1
echo AC_OUTPUT >> configure.ac
@@ -82,7 +82,7 @@ END
chmod a+x foo.test bar.test
-$MAKE check && Exit 1
+$MAKE check && exit 1
for targ in recheck clean mostlyclean distclean; do
$MAKE -n "$targ"
diff --git a/t/parallel-tests-dry-run-2.sh b/t/parallel-tests-dry-run-2.sh
index f3ce42e..11a0f45 100755
--- a/t/parallel-tests-dry-run-2.sh
+++ b/t/parallel-tests-dry-run-2.sh
@@ -17,7 +17,7 @@
# Check interactions between the parallel test harness and "make -n".
# See also sister test 'parallel-tests-dry-run-1.test'.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_OUTPUT
@@ -37,11 +37,11 @@ $AUTOCONF
make_n_ ()
{
st=0
- $MAKE -n "$@" >output 2>&1 || { cat output; ls -l; Exit 1; }
+ $MAKE -n "$@" >output 2>&1 || { cat output; ls -l; exit 1; }
cat output
# Look out for possible errors from common tools used by recipes.
- $EGREP -i ' (exist|permission|denied|no .*(such|file))' output && Exit 1
- $EGREP '(mv|cp|rm|cat|grep|sed|awk): ' output && Exit 1
+ $EGREP -i ' (exist|permission|denied|no .*(such|file))' output && exit 1
+ $EGREP '(mv|cp|rm|cat|grep|sed|awk): ' output && exit 1
:
}
@@ -49,19 +49,19 @@ make_n_ ()
files='foo.log bar.log foo.trs bar.trs'
+echo 'exit 0' > foo.test
+echo 'exit 1' > bar.test
+
for target in check recheck test-suite.log; do
- test ! -f foo.log
- test ! -f foo.trs
- test ! -f bar.log
- test ! -f bar.trs
- test ! -f test-suite.log
+ make_n_ $target
+ test ! -e foo.log
+ test ! -e foo.trs
+ test ! -e bar.log
+ test ! -e bar.trs
+ test ! -e test-suite.log
done
-# Creative quoting below to please maintainer-check.
-echo exit '0' > foo.test
-echo exit '1' > bar.test
-
-$MAKE check && Exit 1
+$MAKE check && exit 1
chmod a-w .
@@ -71,17 +71,16 @@ test -f foo.trs
test -f foo.log
test -f bar.trs
-# Creative quoting below to please maintainer-check.
cat > foo.test <<END
echo this is bad
exit 1
END
-echo exit '0' > bar.test
+echo 'exit 0' > bar.test
for target in check recheck test-suite.log; do
make_n_ $target
grep '^:test-result: *FAIL' bar.trs
- grep 'this is bad' foo.log test-suite.log && Exit 1
+ grep 'this is bad' foo.log test-suite.log && exit 1
: For shells with busted 'set -e'.
done
@@ -92,7 +91,7 @@ else
for target in check recheck test-suite.log; do
make_n_ $target
for f in $files; do
- test -f $f && test ! -r $f || Exit 1
+ test -f $f && test ! -r $f || exit 1
done
done
fi
@@ -103,9 +102,9 @@ rm -f foo.log bar.trs
chmod a-w .
for target in check recheck test-suite.log $files; do
make_n_ $target
- test ! -f foo.log
+ test ! -e foo.log
test -f foo.trs
- test ! -f bar.trs
+ test ! -e bar.trs
test -f bar.log
done
diff --git a/t/parallel-tests-dynamic.sh b/t/parallel-tests-dynamic.sh
index 625b5f6..9d561a3 100755
--- a/t/parallel-tests-dynamic.sh
+++ b/t/parallel-tests-dynamic.sh
@@ -17,7 +17,7 @@
# Check that dynamic content for $(TESTS) is supported, both when set from
# inside the Makefile.am and when overridden from the command line.
-. ./defs || Exit 1
+. ./defs || exit 1
echo AC_OUTPUT >> configure.ac
@@ -98,7 +98,7 @@ $AUTOMAKE -a
./configure
-$MAKE check > stdout || { cat stdout; Exit 1; }
+$MAKE check > stdout || { cat stdout; exit 1; }
cat stdout
count_test_results total=13 pass=9 fail=0 xpass=0 xfail=2 skip=2 error=0
@@ -118,16 +118,16 @@ grep '^SKIP: fu\.sh$' stdout
grep '^SKIP: mu$' stdout
$MAKE mostlyclean
-test "`find . -name *.log`" = ./config.log
+test "$(find . -name '*.log')" = ./config.log
-$MAKE distcheck > stdout || { cat stdout; Exit 1; }
+$MAKE distcheck > stdout || { cat stdout; exit 1; }
cat stdout
count_test_results total=13 pass=9 fail=0 xpass=0 xfail=2 skip=2 error=0
$MAKE check tests1='$(wildcard t00*.sh t98?.sh)' \
tests2='$(shell ./get-tests-list | sed 1d)' \
TESTS='$(tests1) $(tests2)' \
- > stdout || { cat stdout; Exit 1; }
+ > stdout || { cat stdout; exit 1; }
cat stdout
count_test_results total=4 pass=3 fail=0 xpass=0 xfail=1 skip=0 error=0
@@ -138,7 +138,7 @@ grep '^PASS: t00-foo\.sh' stdout
grep '^XFAIL: t98S\.sh' stdout
$MAKE mostlyclean
-test "`find . -name *.log`" = ./config.log
+test "$(find . -name '*.log')" = ./config.log
$MAKE check TESTS='$(shell echo t00 | sed "s/$$/-foo/") t99'
test -f t00-foo.log
@@ -149,7 +149,7 @@ $MAKE check \
a='t00.err' \
b='${a:.err=-foo}' \
TESTS='$(b) t$(subst E,,$(foo)) $(call my_add_dirprefix,t,nosuffix)' \
- > stdout || { cat stdout; Exit 1; }
+ > stdout || { cat stdout; exit 1; }
cat stdout
count_test_results total=3 pass=2 fail=0 xpass=0 xfail=1 skip=0 error=0
diff --git a/t/parallel-tests-empty-tests.sh b/t/parallel-tests-empty-tests.sh
index 9edd260..aefe6b5 100755
--- a/t/parallel-tests-empty-tests.sh
+++ b/t/parallel-tests-empty-tests.sh
@@ -16,7 +16,7 @@
# Check parallel-tests features: empty TESTS
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_CONFIG_FILES([sub1/Makefile sub2/Makefile])
@@ -52,7 +52,7 @@ $AUTOMAKE -a
no_test_has_run ()
{
- ls -1 *.log | grep -v '^test-suite\.log$' | grep . && Exit 1
+ ls -1 *.log | grep -v '^test-suite\.log$' | grep . && exit 1
grep '^# TOTAL: *0$' test-suite.log
:
}
diff --git a/t/parallel-tests-exeext.sh b/t/parallel-tests-exeext.sh
index 80d0c5d..f902587 100755
--- a/t/parallel-tests-exeext.sh
+++ b/t/parallel-tests-exeext.sh
@@ -17,7 +17,7 @@
# parallel-tests:
# - check2.am and interaction with $(EXEEXT)
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
dnl We need to fool the init.m4 internals a little.
@@ -53,9 +53,9 @@ touch x y.bin a.test b.test.bin
$MAKE check
ls -l # For debugging.
test -f y.log
-test ! -r y.bin.log
+test ! -e y.bin.log
test -f b.log
-test ! -r b.test.log
+test ! -e b.test.log
# Opportunistically check that we are not forced to specify
# the test suffixes nor the $(EXEEXT) suffix when overriding
diff --git a/t/parallel-tests-exit-statuses.sh
b/t/parallel-tests-exit-statuses.sh
index ab91095..dd899ea 100755
--- a/t/parallel-tests-exit-statuses.sh
+++ b/t/parallel-tests-exit-statuses.sh
@@ -17,7 +17,7 @@
# Check parallel-tests features: normal and special exit statuses
# in the test scripts.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_OUTPUT
@@ -78,7 +78,7 @@ st=1
$MAKE check >stdout && st=0
cat stdout
cat test-suite.log
-test $st -gt 0 || Exit 1
+test $st -gt 0 || exit 1
LC_ALL=C grep '^[A-Z][A-Z]*:' stdout | LC_ALL=C sort > got-fail
diff exp-fail got-fail
@@ -86,7 +86,7 @@ st=1
$MAKE check XFAIL_TESTS="$failure_statuses 99" >stdout && st=0
cat stdout
cat test-suite.log
-test $st -gt 0 || Exit 1
+test $st -gt 0 || exit 1
LC_ALL=C grep '^[A-Z][A-Z]*:' stdout | LC_ALL=C sort > got-xfail-1
diff exp-xfail-1 got-xfail-1
@@ -97,7 +97,7 @@ $MAKE check \
> stdout || st=$?
cat stdout
cat test-suite.log
-test $st -eq 0 || Exit 1
+test $st -eq 0 || exit 1
LC_ALL=C grep '^[A-Z][A-Z]*:' stdout | LC_ALL=C sort > got-xfail-2
diff exp-xfail-2 got-xfail-2
diff --git a/t/parallel-tests-extra-programs.sh
b/t/parallel-tests-extra-programs.sh
index 2fd09cf..46b5d4b 100755
--- a/t/parallel-tests-extra-programs.sh
+++ b/t/parallel-tests-extra-programs.sh
@@ -18,7 +18,7 @@
# (or even be) $(EXTRA_PROGRAMS).
required='cc native'
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
@@ -128,8 +128,8 @@ grep foofoofoo foo.log
grep barbarbar bar.log
grep yepyepyep baz.log
# Files that shouldn't have been created.
-test ! -f none.log
-test ! -f test-suite.log
+test ! -e none.log
+test ! -e test-suite.log
# Expected testsuite progress output.
grep '^PASS: baz\.test$' stdout
# Don't anchor the end of the next two patterns, to allow for non-empty
@@ -154,7 +154,7 @@ st=0
$MAKE check AM_LAZY_CHECK=yes >stdout || st=$?
cat stdout
ls -l
-test $st -eq 0 || Exit 1
+test $st -eq 0 || exit 1
# For debugging.
stat stamp foo.log bar.log baz.log || :
@@ -165,7 +165,7 @@ is_newest stamp foo.log bar.log baz.log
test -f none.log
test -f test-suite.log
# Tests that shouldn't have been re-run.
-$EGREP '(foo|bar)\.bin|baz\.test$' stdout && Exit 1
+$EGREP '(foo|bar)\.bin|baz\.test$' stdout && exit 1
# Tests that should have been run. Again, we don't anchor the end
# of the next pattern, to allow for non-empty $(EXEEXT).
grep '^PASS: none\.bin' stdout
diff --git a/t/parallel-tests-fd-redirect-exeext.sh
b/t/parallel-tests-fd-redirect-exeext.sh
index bc9b18a..664654b 100755
--- a/t/parallel-tests-fd-redirect-exeext.sh
+++ b/t/parallel-tests-fd-redirect-exeext.sh
@@ -22,7 +22,7 @@
# sister test 'parallel-tests-fd-redirect.test'.
required='cc native'
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
@@ -105,6 +105,6 @@ cat qux.log
test $st -eq 0
grep "^ bazbazbaz$" stdout
grep "^ quxquxqux$" stdout
-$EGREP '(bazbazbaz|quxquxqux)' *.log && Exit 1
+$EGREP '(bazbazbaz|quxquxqux)' *.log && exit 1
:
diff --git a/t/parallel-tests-fd-redirect.sh b/t/parallel-tests-fd-redirect.sh
index 513b523..1d4e2b2 100755
--- a/t/parallel-tests-fd-redirect.sh
+++ b/t/parallel-tests-fd-redirect.sh
@@ -20,7 +20,7 @@
# check for tests that are binary executables.
# See also the more generic test 'check-fd-redirect.test'.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_OUTPUT
@@ -58,6 +58,6 @@ cat bar.log
test $st -eq 0
grep "^ foofoofoo$" stdout
grep "^ barbarbar$" stdout
-$EGREP '(foofoofoo|barbarbar)' *.log && Exit 1
+$EGREP '(foofoofoo|barbarbar)' *.log && exit 1
:
diff --git a/t/parallel-tests-fork-bomb.sh b/t/parallel-tests-fork-bomb.sh
index 7542fb5..8cb248e 100755
--- a/t/parallel-tests-fork-bomb.sh
+++ b/t/parallel-tests-fork-bomb.sh
@@ -18,7 +18,7 @@
# - If $(TEST_SUITE_LOG) is in $(TEST_LOGS), we get a diagnosed
# error, not a make hang or a system freeze.
-. ./defs || Exit 1
+. ./defs || exit 1
# We don't want localized error messages from make, since we'll have
# to grep them. See automake bug#11452.
@@ -64,7 +64,7 @@ do_check ()
log=$1; shift
$MAKE "$@" check >output 2>&1 || st=$?
cat output
- $FGREP '::OOPS::' output && Exit 1 # Possible infinite recursion.
+ $FGREP '::OOPS::' output && exit 1 # Possible infinite recursion.
grep "[Cc]ircular.*dependency" output | $FGREP "$log"
grep "$log:.*depends on itself" output
test $st -gt 0
diff --git a/t/parallel-tests-harderror.sh b/t/parallel-tests-harderror.sh
index b51b271..4ac1f61 100755
--- a/t/parallel-tests-harderror.sh
+++ b/t/parallel-tests-harderror.sh
@@ -16,7 +16,7 @@
# Check parallel-tests features: DISABLE_HARD_ERRORS
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_CONFIG_FILES([sub/Makefile])
@@ -62,12 +62,12 @@ DISABLE_HARD_ERRORS=x $MAKE check
# But an empty values for DISABLE_HARD_ERRORS means that hard errors
# are not to be counted like normal failures.
-$MAKE check DISABLE_HARD_ERRORS='' && Exit 1
+$MAKE check DISABLE_HARD_ERRORS='' && exit 1
cat test-suite.log
grep '^ERROR: foo$' test-suite.log
cd sub
-$MAKE DISABLE_HARD_ERRORS='' check && Exit 1
+$MAKE DISABLE_HARD_ERRORS='' check && exit 1
cat test-suite.log
grep '^ERROR: bar$' test-suite.log
cd ..
@@ -82,8 +82,8 @@ $MAKE DISABLE_HARD_ERRORS=y distcheck
echo 'DISABLE_HARD_ERRORS = yes' >> Makefile.am
$AUTOMAKE Makefile
./config.status Makefile
-VERBOSE=yes $MAKE check && Exit 1
-grep '^FAIL' test-suite.log && Exit 1
+VERBOSE=yes $MAKE check && exit 1
+grep '^FAIL' test-suite.log && exit 1
grep '^ERROR: bar$' sub/test-suite.log
echo 'DISABLE_HARD_ERRORS = zardoz' >> sub/Makefile
diff --git a/t/parallel-tests-internals.sh b/t/parallel-tests-internals.sh
index 8614c5c..f15852f 100755
--- a/t/parallel-tests-internals.sh
+++ b/t/parallel-tests-internals.sh
@@ -16,7 +16,7 @@
# Some internals of the parallel testsuite harness implementation.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_OUTPUT
diff --git a/t/parallel-tests-interrupt.tap b/t/parallel-tests-interrupt.tap
index 04ad214..76e89f2 100755
--- a/t/parallel-tests-interrupt.tap
+++ b/t/parallel-tests-interrupt.tap
@@ -19,7 +19,7 @@
# but we couldn't find a better way to deal with inter-processes
# signals and the whole process-synchronization mess.
-. ./defs || Exit 1
+. ./defs || exit 1
plan_ 16
diff --git a/t/parallel-tests-log-compiler-1.sh
b/t/parallel-tests-log-compiler-1.sh
index 0d109bb..a3b3a94 100755
--- a/t/parallel-tests-log-compiler-1.sh
+++ b/t/parallel-tests-log-compiler-1.sh
@@ -19,7 +19,7 @@
# and xxx_LOG_FLAGS), also with AC_SUBST'd stuff.
# See also related test 'parallel-tests-log-compiler-2.test'.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_SUBST([acsubst_compiler], [t-compiler])
@@ -101,7 +101,7 @@ $AUTOCONF
$AUTOMAKE -a
./configure
-$MAKE check || { cat test-suite.log; Exit 1; }
+$MAKE check || { cat test-suite.log; exit 1; }
ls -l . sub
cat test-suite.log
test -f foo.log
@@ -111,13 +111,13 @@ test -f bla.log
test -f bli.suff.log
test -f sub/test.log
-$MAKE check T_LOG_FLAGS=--bad && Exit 1
+$MAKE check T_LOG_FLAGS=--bad && exit 1
cat test-suite.log
cat bla.log
# With the above flag overridden, bla.t should fail ...
$EGREP '(^ *|/)t-compiler:.* invalid .*--bad' bla.log
# ... but no other test should.
-grep -v '^FAIL: bla\.t ' bla.log | grep 'FAIL:' && Exit 1
+grep -v '^FAIL: bla\.t ' bla.log | grep 'FAIL:' && exit 1
# Try also with a VPATH build.
$MAKE distcheck
diff --git a/t/parallel-tests-log-compiler-2.sh
b/t/parallel-tests-log-compiler-2.sh
index 72fba68..08e2c9d 100755
--- a/t/parallel-tests-log-compiler-2.sh
+++ b/t/parallel-tests-log-compiler-2.sh
@@ -20,7 +20,7 @@
# See also related test 'parallel-tests-log-compiler-1.test'.
required='cc native'
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
@@ -82,7 +82,7 @@ $AUTOMAKE -a
./configure
$MAKE
-$MAKE check || { cat test-suite.log; Exit 1; }
+$MAKE check || { cat test-suite.log; exit 1; }
ls -l . sub
cat test-suite.log
grep 'chk-compiler *1 *2' foo.log
diff --git a/t/parallel-tests-log-override.sh b/t/parallel-tests-log-override.sh
index a02ec54..940823f 100755
--- a/t/parallel-tests-log-override.sh
+++ b/t/parallel-tests-log-override.sh
@@ -16,7 +16,7 @@
# Check parallel-tests features: runtime redefinition of $(TEST_SUITE_LOG).
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac <<'END'
AC_OUTPUT
@@ -57,7 +57,7 @@ test_log_expected ()
{
test_log_edit orig > exp
test_log_edit $1 > got
- diff exp got || Exit 1
+ diff exp got || exit 1
rm -f exp got
}
@@ -73,12 +73,12 @@ cat test-suite.log
cp test-suite.log orig
$MAKE clean
-test -f test-suite.log && Exit 99 # Sanity check.
+test -f test-suite.log && exit 99 # Sanity check.
# Check that we can override the testsuite log file at runtime.
$MAKE check TEST_SUITE_LOG=zardoz.log
ls -l
-test ! -f test-suite.log
+test ! -e test-suite.log
cat zardoz.log
test_log_expected zardoz.log
# Sanity check the distribution too (this also does minimal checks on
@@ -90,7 +90,7 @@ $MAKE distcheck TEST_SUITE_LOG=zardoz.log
cp orig test-suite.log
$MAKE clean TEST_SUITE_LOG=zardoz.log
ls -l
-test ! -f zardoz.log
+test ! -e zardoz.log
diff orig test-suite.log
# Check that the default testsuite log doesn't get unduly modified.
@@ -103,7 +103,7 @@ diff orig test-suite.log
test_log_expected TheLogFile
$MAKE clean TEST_SUITE_LOG=TheLogFile
ls -l
-test ! -f TheLogFile
+test ! -e TheLogFile
diff orig test-suite.log
:
diff --git a/t/parallel-tests-logvars-example.sh
b/t/parallel-tests-logvars-example.sh
index 301eb57..50bdba2 100755
--- a/t/parallel-tests-logvars-example.sh
+++ b/t/parallel-tests-logvars-example.sh
@@ -18,7 +18,7 @@
# LOG_COMPILER, LOG_FLAGS and LOG_DEPENDNECIES given in the manual.
required=python
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac <<END
AC_SUBST([PERL], ['$PERL'])
@@ -67,7 +67,7 @@ cat baz.log
cat foo.trs
cat bar.trs
cat baz.trs
-test $st -eq 0 || Exit $st
+test $st -eq 0 || exit $st
# Check that the wrappers have been run with the expected flags.
grep '[rR]eversed.*+=.*operator.*foo\.pl' foo.log
diff --git a/t/parallel-tests-longest-stem.sh b/t/parallel-tests-longest-stem.sh
index a2d06ca..181014b 100755
--- a/t/parallel-tests-longest-stem.sh
+++ b/t/parallel-tests-longest-stem.sh
@@ -18,7 +18,7 @@
# extension-less tests. This is required to allow the user to have
# a, say, 'all.test' test case even in the face of the 'all' target.
-. ./defs || Exit 1
+. ./defs || exit 1
echo AC_OUTPUT >> configure.ac
@@ -52,7 +52,7 @@ $ACLOCAL
$AUTOCONF
$AUTOMAKE -a
-./configure --prefix="`pwd`/inst"
+./configure --prefix="$(pwd)/inst"
$MAKE check
ls -l # For debugging.
diff --git a/t/parallel-tests-many.sh b/t/parallel-tests-many.sh
index b872591..0b4fef2 100755
--- a/t/parallel-tests-many.sh
+++ b/t/parallel-tests-many.sh
@@ -18,7 +18,7 @@
# to an exceeded command line length when there are many tests.
# For automake bug#7868. This test is currently expected to fail.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_OUTPUT
@@ -67,9 +67,9 @@ for i in 1 2 3 4 5 6 7 8 9 10 12 13 14 15 16 17 18 19 29 21
22 23 24; do
mkdir $new_deepdir || break
tmpfile=$new_deepdir/$tname-some-more-chars-for-good-measure
if touch $tmpfile; then
- rm -f $tmpfile || Exit 99
+ rm -f $tmpfile || exit 99
else
- rmdir $new_deepdir || Exit 99
+ rmdir $new_deepdir || exit 99
fi
deepdir=$new_deepdir
unset tmpfile new_deepdir
@@ -106,8 +106,8 @@ setup_data ()
print " \\\n";
}
}
- ' > list-of-tests.am || Exit 99
- sed 20q list-of-tests.am || Exit 99 # For debugging.
+ ' > list-of-tests.am || exit 99
+ sed 20q list-of-tests.am || exit 99 # For debugging.
$AUTOMAKE Makefile \
|| framework_failure_ "unexpected automake failure"
./config.status Makefile \
@@ -146,9 +146,9 @@ $MAKE check TESTS=$deepdir/$tname-1.test \
&& test -f $deepdir/$tname-1.log \
|| framework_failure_ "\"make check\" with one single tests"
-rm -f $deepdir/* || Exit 99
+rm -f $deepdir/* || exit 99
-$MAKE check > stdout || { cat stdout; Exit 1; }
+$MAKE check > stdout || { cat stdout; exit 1; }
cat stdout
grep "^# TOTAL: $count$" stdout
@@ -172,7 +172,7 @@ test $(grep -c '^FAIL:' stdout) -eq 2 || st=1
test $st -eq 0 || fatal_ "couldn't simulate failure of two tests"
unset st
-$MAKE recheck > stdout || { cat stdout; Exit 1; }
+$MAKE recheck > stdout || { cat stdout; exit 1; }
cat stdout
grep "^PASS: .*$tname-1\.test" stdout
grep "^PASS: .*$tname-2\.test" stdout
@@ -182,9 +182,9 @@ grep "^# PASS: 2$" stdout
# "make clean" might ignore some failures, so we prefer to also grep its
# output to ensure that no "Argument list too long" error was encountered.
-$MAKE clean >output 2>&1 || { cat output; Exit 1; }
+$MAKE clean >output 2>&1 || { cat output; exit 1; }
cat output
-grep -i 'list.* too long' output && Exit 1
-ls $deepdir | grep '\.log$' && Exit 1
+grep -i 'list.* too long' output && exit 1
+ls $deepdir | grep '\.log$' && exit 1
:
diff --git a/t/parallel-tests-no-color-in-log.sh
b/t/parallel-tests-no-color-in-log.sh
index 2f19fbc..acfc16f 100755
--- a/t/parallel-tests-no-color-in-log.sh
+++ b/t/parallel-tests-no-color-in-log.sh
@@ -17,7 +17,7 @@
# Colorized output from the testsuite report shouldn't end up in log files.
required='grep-nonprint'
-. ./defs || Exit 1
+. ./defs || exit 1
TERM=ansi; export TERM
@@ -32,13 +32,12 @@ TESTS = pass fail skip xpass xfail error
XFAIL_TESTS = xpass xfail
END
-# Creative quoting to please maintainer-check.
-echo exit '0' > pass
-echo exit '0' > xpass
-echo exit '1' > fail
-echo exit '1' > xfail
-echo exit '77' > skip
-echo exit '99' > error
+echo 'exit 0' > pass
+echo 'exit 0' > xpass
+echo 'exit 1' > fail
+echo 'exit 1' > xfail
+echo 'exit 77' > skip
+echo 'exit 99' > error
$ACLOCAL
$AUTOCONF
@@ -46,9 +45,9 @@ $AUTOMAKE --add-missing
./configure
mv config.log config-log # Avoid possible false positives below.
-$MAKE check AM_COLOR_TESTS=always && Exit 1
+$MAKE check AM_COLOR_TESTS=always && exit 1
# Not a useless use of cat; see above comments "grep-nonprinting"
# requirement in 'test-init.sh'.
-cat *.log | grep "$esc" && Exit 1
+cat *.log | grep "$esc" && exit 1
:
diff --git a/t/parallel-tests-no-repeat.sh b/t/parallel-tests-no-repeat.sh
index 2c69650..dae8b60 100755
--- a/t/parallel-tests-no-repeat.sh
+++ b/t/parallel-tests-no-repeat.sh
@@ -17,7 +17,7 @@
# The parallel-tests harness do not cause the same test to be
# uselessly run multiple times.
-. ./defs || Exit 1
+. ./defs || exit 1
echo AC_OUTPUT >> configure.ac
echo TESTS = foo.test > Makefile.am
@@ -34,10 +34,10 @@ $AUTOMAKE -a
./configure
-$MAKE -j1 check || { cat test-suite.log; Exit 1; }
+$MAKE -j1 check || { cat test-suite.log; exit 1; }
rmdir bar
-$MAKE -j2 check || { cat test-suite.log; Exit 1; }
+$MAKE -j2 check || { cat test-suite.log; exit 1; }
rmdir bar
-$MAKE -j4 check || { cat test-suite.log; Exit 1; }
+$MAKE -j4 check || { cat test-suite.log; exit 1; }
:
diff --git a/t/parallel-tests-once.sh b/t/parallel-tests-once.sh
index 51912fb..67fcbab 100755
--- a/t/parallel-tests-once.sh
+++ b/t/parallel-tests-once.sh
@@ -18,7 +18,7 @@
# clean directory. An early implementation of the '.trs' intermediate
# files incurred a similar problem.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_OUTPUT
@@ -30,7 +30,7 @@ END
cat > foo.test <<'END'
#! /bin/sh
-test -f foo.run && Exit 1
+test -f foo.run && exit 1
: > foo.run
END
chmod a+x foo.test
diff --git a/t/parallel-tests-per-suffix-deps.sh
b/t/parallel-tests-per-suffix-deps.sh
index d60a609..7bf0017 100755
--- a/t/parallel-tests-per-suffix-deps.sh
+++ b/t/parallel-tests-per-suffix-deps.sh
@@ -19,7 +19,7 @@
# We do so with the help of "${prefix}LOG_DEPENDENCIES" variables.
# See the last wishlist in automake bug#11287.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac <<'END'
AC_SUBST([EXEEXT], [.bin])
diff --git a/t/parallel-tests-recheck-depends-on-all.sh
b/t/parallel-tests-recheck-depends-on-all.sh
index 9464a36..af53061 100755
--- a/t/parallel-tests-recheck-depends-on-all.sh
+++ b/t/parallel-tests-recheck-depends-on-all.sh
@@ -18,7 +18,7 @@
# See automake bug#11252.
required='cc native'
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
@@ -63,10 +63,10 @@ $AUTOCONF
$AUTOMAKE -a
./configure
-$MAKE check >stdout && { cat stdout; Exit 1; }
+$MAKE check >stdout && { cat stdout; exit 1; }
cat stdout
count_test_results total=3 pass=1 fail=2 skip=0 xfail=0 xpass=0 error=0
-test ! -f status
+test ! -e status
$sleep
: > status
@@ -79,13 +79,13 @@ int main (void)
}
END
-$MAKE recheck >stdout || { cat stdout; Exit 1; }
+$MAKE recheck >stdout || { cat stdout; exit 1; }
cat stdout
count_test_results total=2 pass=2 fail=0 skip=0 xfail=0 xpass=0 error=0
grep '^PASS: b\.test$' stdout
grep '^PASS: c\.test$' stdout
-$MAKE recheck >stdout || { cat stdout; Exit 1; }
+$MAKE recheck >stdout || { cat stdout; exit 1; }
cat stdout
count_test_results total=0 pass=0 fail=0 skip=0 xfail=0 xpass=0 error=0
diff --git a/t/parallel-tests-reset-term.sh b/t/parallel-tests-reset-term.sh
index 52e15c0..61cbad5 100755
--- a/t/parallel-tests-reset-term.sh
+++ b/t/parallel-tests-reset-term.sh
@@ -18,7 +18,7 @@
# TERM variable by either TESTS_ENVIRONMENT and AM_TESTS_ENVIRONMENT.
required='grep-nonprint'
-. ./defs || Exit 1
+. ./defs || exit 1
TERM=ansi; export TERM
diff --git a/t/parallel-tests-srcdir-in-test-name.sh
b/t/parallel-tests-srcdir-in-test-name.sh
index f137e93..72dc491 100755
--- a/t/parallel-tests-srcdir-in-test-name.sh
+++ b/t/parallel-tests-srcdir-in-test-name.sh
@@ -16,7 +16,7 @@
# Check parallel-tests features: listing $(srcdir)/ in TESTS works.
-. ./defs || Exit 1
+. ./defs || exit 1
echo AC_OUTPUT >> configure.ac
diff --git a/t/parallel-tests-subdir.sh b/t/parallel-tests-subdir.sh
index 336fcd8..b7bb481 100755
--- a/t/parallel-tests-subdir.sh
+++ b/t/parallel-tests-subdir.sh
@@ -17,7 +17,7 @@
# Check that the parallel test harness creates parent directories for
# the log files when needed.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_OUTPUT
diff --git a/t/parallel-tests-suffix-prog.sh b/t/parallel-tests-suffix-prog.sh
index d7b4140..168266f 100755
--- a/t/parallel-tests-suffix-prog.sh
+++ b/t/parallel-tests-suffix-prog.sh
@@ -19,7 +19,7 @@
# See also sister test 'parallel-tests-suffix.test'.
required='cc native'
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
diff --git a/t/parallel-tests-suffix.sh b/t/parallel-tests-suffix.sh
index 9e9e843..b5931b8 100755
--- a/t/parallel-tests-suffix.sh
+++ b/t/parallel-tests-suffix.sh
@@ -18,7 +18,7 @@
# - suffix rules
# See also sister test 'parallel-tests-suffix-prog.test'.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_OUTPUT
diff --git a/t/parallel-tests-trailing-bslash.sh
b/t/parallel-tests-trailing-bslash.sh
index e6fd2ad..dadc874 100755
--- a/t/parallel-tests-trailing-bslash.sh
+++ b/t/parallel-tests-trailing-bslash.sh
@@ -19,7 +19,7 @@
# older bash versions (e.g., bash 2.05b).
# See automake bug#10436.
-. ./defs || Exit 1
+. ./defs || exit 1
echo AC_OUTPUT >> configure.ac
diff --git a/t/parallel-tests-unreadable.sh b/t/parallel-tests-unreadable.sh
index fa2448a..39e3519 100755
--- a/t/parallel-tests-unreadable.sh
+++ b/t/parallel-tests-unreadable.sh
@@ -17,7 +17,7 @@
# Check that the testsuite driver copes well with unreadable '.log'
# and '.trs' files.
-. ./defs || Exit 1
+. ./defs || exit 1
: > t
chmod a-r t && test ! -r t || skip_ "you can still read unreadable files"
@@ -55,7 +55,7 @@ doit ()
$MAKE check
rm -f test-suite.log
chmod a-r $*
- $MAKE test-suite.log 2>stderr && { cat stderr >&2; Exit 1; }
+ $MAKE test-suite.log 2>stderr && { cat stderr >&2; exit 1; }
cat stderr >&2
}
diff --git a/t/parallel-tests.sh b/t/parallel-tests.sh
index 4adf832..42940c3 100755
--- a/t/parallel-tests.sh
+++ b/t/parallel-tests.sh
@@ -22,7 +22,7 @@
# - TESTS redefinition at runtime (with and without test suffixes)
# - AM_LAZY_CHECK
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_OUTPUT
@@ -58,37 +58,37 @@ $AUTOMAKE -a
./configure
-$MAKE check >stdout && { cat stdout; Exit 1; }
+$MAKE check >stdout && { cat stdout; exit 1; }
cat stdout
count_test_results total=3 pass=1 fail=1 skip=0 xfail=0 xpass=0 error=1
test -f test-suite.log
cat test-suite.log
test $(grep -c '^FAIL:' test-suite.log) -eq 1
test $(grep -c '^ERROR:' test-suite.log) -eq 1
-$EGREP '^(X?PASS|XFAIL|SKIP)' test-suite.log && Exit 1
+$EGREP '^(X?PASS|XFAIL|SKIP)' test-suite.log && exit 1
test -f baz.log
test -f bar.log
test -f foo.log
$MAKE clean
-test ! -f baz.log
-test ! -f bar.log
-test ! -f foo.log
-test ! -f test-suite.log
+test ! -e baz.log
+test ! -e bar.log
+test ! -e foo.log
+test ! -e test-suite.log
# Check dependencies: baz.test needs to run before bar.test,
# but foo.test is not needed.
# FIXME: Note that this usage has a problem: the summary will only
# FIXME: take bar.log into account, because the $(TEST_SUITE_LOG)
# FIXME: rule does not "see" baz.log. Hmm.
-$MAKE check TESTS=bar.test >stdout && { cat stdout; Exit 1; }
+$MAKE check TESTS=bar.test >stdout && { cat stdout; exit 1; }
cat stdout
grep '^FAIL: baz\.test$' stdout
grep '^ERROR: bar\.test$' stdout
test -f baz.log
test -f bar.log
-test ! -f foo.log
+test ! -e foo.log
test -f test-suite.log
# Upon a lazy rerun, foo.test should be run, but the others shouldn't.
@@ -97,39 +97,39 @@ test -f test-suite.log
# Note that the previous test and this one taken together expose the timing
# issue that requires the check-TESTS rule to always remove TEST_SUITE_LOG
# before running the tests lazily.
-$MAKE check AM_LAZY_CHECK=yes > stdout && { cat stdout; Exit 1; }
+$MAKE check AM_LAZY_CHECK=yes > stdout && { cat stdout; exit 1; }
cat stdout
test -f foo.log
grep '^PASS: foo\.test$' stdout
-grep bar.test stdout && Exit 1
-grep baz.test stdout && Exit 1
+grep bar.test stdout && exit 1
+grep baz.test stdout && exit 1
grep '^# PASS: *1$' stdout
grep '^# FAIL: *1$' stdout
grep '^# ERROR: *1$' stdout
# Now, explicitly retry with all test logs already updated, and ensure
# that the summary is still displayed.
-$MAKE check AM_LAZY_CHECK=yes > stdout && { cat stdout; Exit 1; }
+$MAKE check AM_LAZY_CHECK=yes > stdout && { cat stdout; exit 1; }
cat stdout
-grep foo.test stdout && Exit 1
-grep bar.test stdout && Exit 1
-grep baz.test stdout && Exit 1
+grep foo.test stdout && exit 1
+grep bar.test stdout && exit 1
+grep baz.test stdout && exit 1
grep '^# PASS: *1$' stdout
grep '^# FAIL: *1$' stdout
grep '^# ERROR: *1$' stdout
$MAKE clean
-$MAKE check TESTS=baz > stdout && { cat stdout; Exit 1; }
+$MAKE check TESTS=baz > stdout && { cat stdout; exit 1; }
cat stdout
-grep foo.test stdout && Exit 1
-grep bar.test stdout && Exit 1
+grep foo.test stdout && exit 1
+grep bar.test stdout && exit 1
grep baz.test stdout
$MAKE clean
-$MAKE check TESTS=baz.test > stdout && { cat stdout; Exit 1; }
+$MAKE check TESTS=baz.test > stdout && { cat stdout; exit 1; }
cat stdout
-grep foo.test stdout && Exit 1
-grep bar.test stdout && Exit 1
+grep foo.test stdout && exit 1
+grep bar.test stdout && exit 1
grep baz.test stdout
:
diff --git a/t/parallel-tests10.sh b/t/parallel-tests10.sh
index 9746024..e8e4203 100755
--- a/t/parallel-tests10.sh
+++ b/t/parallel-tests10.sh
@@ -18,7 +18,7 @@
# - trailing whitespace in TESTS
# GNU make 3.80 may expand trailing white space to '.log'.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_OUTPUT
diff --git a/t/parallel-tests2.sh b/t/parallel-tests2.sh
index 788a326..7d57640 100755
--- a/t/parallel-tests2.sh
+++ b/t/parallel-tests2.sh
@@ -20,7 +20,7 @@
# FIXME: the features tested by this script has been moved in contrib.
# FIXME: We should move this script accordingly.
-. ./defs || Exit 1
+. ./defs || exit 1
# Try the variants that are tried in check-html.am.
while :; do
@@ -77,15 +77,15 @@ $AUTOMAKE -a
./configure
-$MAKE check-html && Exit 1
+$MAKE check-html && exit 1
test -f mylog.html
# check-html should cause check_SCRIPTS to be created.
test -f bla
# "make clean" should remove HTML files.
$MAKE clean
-test ! -f mylog.html
-test ! -f bla
+test ! -e mylog.html
+test ! -e bla
# Always create the HTML output, even if there were no failures.
rm -f mylog.html
@@ -100,8 +100,8 @@ test -f mylog.html
# Create HTML output for an individual test.
$MAKE foo.html
grep 'this is .*foo\.test' foo.html
-test ! -f bar.html
-test ! -f baz.html
+test ! -e bar.html
+test ! -e baz.html
# Create HTML output for individual tests. Since the pre-existing log
# files are expected to be used for the HTML conversion, this should
@@ -112,35 +112,35 @@ grep 'this is .*baz\.test' baz.html
# HTML output removed by mostlyclean.
$MAKE mostlyclean
-test ! -f foo.html
-test ! -f bar.html
-test ! -f baz.html
-test ! -f mylog.html
+test ! -e foo.html
+test ! -e bar.html
+test ! -e baz.html
+test ! -e mylog.html
# check-html and recheck-html should cause check_SCRIPTS to be created,
# and recheck-html should rerun no tests if check has not been run.
$MAKE clean
-test ! -f mylog.html
+test ! -e mylog.html
$MAKE check-html TEST_LOGS=foo.log
test -f bla
test -f foo.log
-test ! -f bar.log
-test ! -f baz.log
+test ! -e bar.log
+test ! -e baz.log
test -f mylog.html
$MAKE clean
$MAKE recheck-html TESTS=foo.test
test -f bla
-test ! -f foo.log
+test ! -e foo.log
test -f mylog.html
$MAKE clean
$MAKE recheck-html
test -f bla
-test ! -f foo.log
-test ! -f bar.log
-test ! -f baz.log
+test ! -e foo.log
+test ! -e bar.log
+test ! -e baz.log
test -f mylog.html
:
diff --git a/t/parallel-tests3.sh b/t/parallel-tests3.sh
index 4cff0e6..0bde3af 100755
--- a/t/parallel-tests3.sh
+++ b/t/parallel-tests3.sh
@@ -17,7 +17,7 @@
# Check parallel-tests features:
# - concurrent parallel execution
-. ./defs || Exit 1
+. ./defs || exit 1
case $MAKE in
*\ -j*) skip_ "\$MAKE contains '-j'";;
diff --git a/t/parallel-tests5.sh b/t/parallel-tests5.sh
index 4c01560..f7aac36 100755
--- a/t/parallel-tests5.sh
+++ b/t/parallel-tests5.sh
@@ -21,7 +21,7 @@
# It merely serves as demonstration. :-)
required='cc native'
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
diff --git a/t/parallel-tests6.sh b/t/parallel-tests6.sh
index 94b464d..018964a 100755
--- a/t/parallel-tests6.sh
+++ b/t/parallel-tests6.sh
@@ -18,25 +18,21 @@
# - empty TESTS
# See parallel-tests10.test for a similar issue.
-. ./defs || Exit 1
+. ./defs || exit 1
-cat >> configure.ac << 'END'
-AC_OUTPUT
-END
+echo AC_OUTPUT >> configure.ac
-cat > Makefile.am << 'END'
-TESTS =
-END
+echo TESTS = > Makefile.am
$ACLOCAL
$AUTOCONF
$AUTOMAKE -a
./configure
-$MAKE check >stdout || { cat stdout; Exit 1; }
+$MAKE check >stdout || { cat stdout; exit 1; }
cat stdout
for x in TOTAL PASS FAIL XPASS FAIL SKIP ERROR; do
grep "^# $x: *0$" stdout
done
-Exit 0
+:
diff --git a/t/parallel-tests8.sh b/t/parallel-tests8.sh
index 4f32231..71d844e 100755
--- a/t/parallel-tests8.sh
+++ b/t/parallel-tests8.sh
@@ -16,7 +16,7 @@
# Check parallel-tests features: generated distributed tests.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_OUTPUT
@@ -50,7 +50,7 @@ mkdir build
cd build
../configure
$MAKE check
-test ! -f ../foo.log
+test ! -e ../foo.log
$MAKE distcheck
:
diff --git a/t/parallel-tests9.sh b/t/parallel-tests9.sh
index 42d0e2d..583c674 100755
--- a/t/parallel-tests9.sh
+++ b/t/parallel-tests9.sh
@@ -17,7 +17,7 @@
# Check parallel-tests features:
# - recheck
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_OUTPUT
@@ -55,14 +55,14 @@ $AUTOCONF
$AUTOMAKE -a
./configure
-$MAKE check >stdout && { cat stdout; Exit 1; }
+$MAKE check >stdout && { cat stdout; exit 1; }
cat stdout
count_test_results total=3 pass=1 fail=1 skip=0 xfail=0 xpass=0 error=1
-$MAKE recheck >stdout && { cat stdout; Exit 1; }
+$MAKE recheck >stdout && { cat stdout; exit 1; }
cat stdout
count_test_results total=2 pass=0 fail=1 skip=0 xfail=0 xpass=0 error=1
-grep 'foo\.test' stdout && Exit 1
+grep 'foo\.test' stdout && exit 1
grep '^ERROR: bar\.test$' stdout
grep '^FAIL: baz\.test$' stdout
@@ -71,9 +71,9 @@ grep '^FAIL: baz\.test$' stdout
$MAKE clean
$MAKE recheck
test -f bla
-test ! -f foo.log
-test ! -f bar.log
-test ! -f baz.log
+test ! -e foo.log
+test ! -e bar.log
+test ! -e baz.log
test -f mylog.log
:
diff --git a/t/parse.sh b/t/parse.sh
index 20ac2fe..ec5bcbb 100755
--- a/t/parse.sh
+++ b/t/parse.sh
@@ -16,7 +16,7 @@
# Test to make sure backslash-newline is treated as whitespace.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
@@ -32,5 +32,5 @@ END
$ACLOCAL
$AUTOMAKE
-$FGREP zar.cdoz Makefile.in && Exit 1
-Exit 0
+$FGREP zar.cdoz Makefile.in && exit 1
+exit 0
diff --git a/t/pattern-rules.sh b/t/pattern-rules.sh
index c333194..8e96d59 100755
--- a/t/pattern-rules.sh
+++ b/t/pattern-rules.sh
@@ -16,7 +16,7 @@
# Automake do not complain about nor messes up pattern rules.
-. ./defs || Exit 1
+. ./defs || exit 1
echo AC_OUTPUT >> configure.ac
@@ -52,7 +52,7 @@ for vpath in : false; do
$MAKE
diff $srcdir/bar/one.in ./foo/one.out
diff $srcdir/two/z ./two.sh
- test `cat mu.py` = True
+ test "$(cat mu.py)" = True
cd $srcdir
done
diff --git a/t/pattern-rules2.sh b/t/pattern-rules2.sh
index 1255f11..4ce6a53 100755
--- a/t/pattern-rules2.sh
+++ b/t/pattern-rules2.sh
@@ -19,7 +19,7 @@
# '${ARCH}/%.$(OBJEXT):'.
# Report from Ralf Corsepius.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >>Makefile.am << 'EOF'
${ARCH}/%.$(OBJEXT): %.S
diff --git a/t/per-target-flags.sh b/t/per-target-flags.sh
index fa2dda3..f8b8636 100755
--- a/t/per-target-flags.sh
+++ b/t/per-target-flags.sh
@@ -17,7 +17,7 @@
# Test executable-specific and library-specific flags, both with
# and without dependency tracking.
-. ./defs || Exit 1
+. ./defs || exit 1
cat > configure.ac << END
AC_INIT([$me], [1.0])
@@ -65,21 +65,21 @@ done
$AUTOMAKE
# Regression test for missing space.
-$FGREP ')-c' $makefiles && Exit 1
+$FGREP ')-c' $makefiles && exit 1
# Regression test for botchedly transformed object names.
-$FGREP '.o.o' $makefiles && Exit 1
-$FGREP '.obj.obj' $makefiles && Exit 1
-$FGREP '.$(OBJEXT).$(OBJEXT)' $makefiles && Exit 1
+$FGREP '.o.o' $makefiles && exit 1
+$FGREP '.obj.obj' $makefiles && exit 1
+$FGREP '.$(OBJEXT).$(OBJEXT)' $makefiles && exit 1
# Watch against non-transformed "foo.$(OBJEXT)", "foo.o" and "foo.obj"
# (and similarly for bar).
-$EGREP '[^-](foo|bar)\.[o$]' $makefiles && Exit 1
+$EGREP '[^-](foo|bar)\.[o$]' $makefiles && exit 1
# All our programs and libraries have per-target flags, so all
# the compilers invocations must use an explicit '-c' option.
-grep 'COMPILE. [^-]' $makefiles && Exit 1
-grep 'COMPILE. .[^c]' $makefiles && Exit 1
+grep 'COMPILE. [^-]' $makefiles && exit 1
+grep 'COMPILE. .[^c]' $makefiles && exit 1
$FGREP 'foo-foo.$(OBJEXT)' Makefile.in
$FGREP 'foo-foo.$(OBJEXT)' Makefile2.in
diff --git a/t/perf/cond.sh b/t/perf/cond.sh
index 7c8261e..cf9c760 100755
--- a/t/perf/cond.sh
+++ b/t/perf/cond.sh
@@ -17,7 +17,7 @@
# Check that many conditions do not lead to combinatorial explosion.
# (This is related to PR/352.)
-. ./defs || Exit 1
+. ./defs || exit 1
echo AC_PROG_CC >>configure.ac
diff --git a/t/perf/testsuite-recheck.sh b/t/perf/testsuite-recheck.sh
index 6fd793b..e3383be 100755
--- a/t/perf/testsuite-recheck.sh
+++ b/t/perf/testsuite-recheck.sh
@@ -19,7 +19,7 @@
# FIXME: performance is too low, and FAIL accordingly; it just offers an
# FIXME: easy way to verify how effective a performance optimization is.
-. ./defs || Exit 1
+. ./defs || exit 1
count=5000
diff --git a/t/perf/testsuite-summary.sh b/t/perf/testsuite-summary.sh
index 04408ee..296a621 100755
--- a/t/perf/testsuite-summary.sh
+++ b/t/perf/testsuite-summary.sh
@@ -20,7 +20,7 @@
# FIXME: performance is too low, and FAIL accordingly; it just offers
# FIXME: an easy way verify how effective a performance optimization is.
-. ./defs || Exit 1
+. ./defs || exit 1
count=10000
@@ -63,7 +63,7 @@ $AUTOMAKE -a
./configure
-$MAKE test-suite.log >stdout || { cat stdout; Exit 1; }
+$MAKE test-suite.log >stdout || { cat stdout; exit 1; }
cat stdout
# Sanity checks.
diff --git a/t/phony.sh b/t/phony.sh
index ce4d5f8..b1f3b7e 100755
--- a/t/phony.sh
+++ b/t/phony.sh
@@ -17,7 +17,7 @@
# Make sure .PHONY can be given dependencies several times.
# From Ralf Corsepius.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >Makefile.am << 'EOF'
.PHONY: foo
diff --git a/t/pluseq.sh b/t/pluseq.sh
index 7a8df81..74dea56 100755
--- a/t/pluseq.sh
+++ b/t/pluseq.sh
@@ -16,7 +16,7 @@
# Test '+=' functionality.
-. ./defs || Exit 1
+. ./defs || exit 1
cat > Makefile.am << 'END'
data_DATA = zar
diff --git a/t/pluseq10.sh b/t/pluseq10.sh
index e9ce944..20516c3 100755
--- a/t/pluseq10.sh
+++ b/t/pluseq10.sh
@@ -17,7 +17,7 @@
# Test for += and backslashes.
# Reported by Ralf Corsepius.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >>configure.ac << 'END'
AM_CONDITIONAL([A], [true])
@@ -48,7 +48,7 @@ $AUTOCONF
$AUTOMAKE
./configure
-$MAKE print >stdout || { cat stdout; Exit 1; }
+$MAKE print >stdout || { cat stdout; exit 1; }
cat stdout
$FGREP 'BEG: 0.h a0.h a1.h a2.h a3.h :END' stdout
diff --git a/t/pluseq11.sh b/t/pluseq11.sh
index 4c0b888..5ee5d4f 100755
--- a/t/pluseq11.sh
+++ b/t/pluseq11.sh
@@ -18,7 +18,7 @@
# is erroneously retained in the final value.
# See also sister test pluseq11b.test.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >>configure.ac <<'END'
AC_OUTPUT
@@ -43,7 +43,7 @@ END
$ACLOCAL
$AUTOMAKE
-grep '^ *FOO *=.*\\.' Makefile.in && Exit 1
+grep '^ *FOO *=.*\\.' Makefile.in && exit 1
$AUTOCONF
./configure
diff --git a/t/pluseq2.sh b/t/pluseq2.sh
index 102076a..2069444 100755
--- a/t/pluseq2.sh
+++ b/t/pluseq2.sh
@@ -16,7 +16,7 @@
# Test '+=' with conditionals.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AM_CONDITIONAL([CHECK], [true])
diff --git a/t/pluseq3.sh b/t/pluseq3.sh
index a5fdaca..c80a116 100755
--- a/t/pluseq3.sh
+++ b/t/pluseq3.sh
@@ -16,7 +16,7 @@
# Another '+=' test with conditionals.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AM_CONDITIONAL([CHECK], [true])
diff --git a/t/pluseq4.sh b/t/pluseq4.sh
index 59c82d8..32c64ea 100755
--- a/t/pluseq4.sh
+++ b/t/pluseq4.sh
@@ -16,7 +16,7 @@
# Yet another '+=' test.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
diff --git a/t/pluseq5.sh b/t/pluseq5.sh
index b64343e..bd2cd9a 100755
--- a/t/pluseq5.sh
+++ b/t/pluseq5.sh
@@ -16,7 +16,7 @@
# Test for another '+=' problem. Report from Brian Jones.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AM_CONDITIONAL([CHECK], [true])
diff --git a/t/pluseq6.sh b/t/pluseq6.sh
index 2b65e1a..2db9c6f 100755
--- a/t/pluseq6.sh
+++ b/t/pluseq6.sh
@@ -16,7 +16,7 @@
# Test that '+=' works with standard header-vars.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_SUBST([ZZZ])
diff --git a/t/pluseq7.sh b/t/pluseq7.sh
index e6e299c..c7ea2ad 100755
--- a/t/pluseq7.sh
+++ b/t/pluseq7.sh
@@ -16,7 +16,7 @@
# Test that '+=' fails when required.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
diff --git a/t/pluseq8.sh b/t/pluseq8.sh
index 724e4d5..da0ad89 100755
--- a/t/pluseq8.sh
+++ b/t/pluseq8.sh
@@ -16,7 +16,7 @@
# Another '+=' test. From Paul Berrevoets.
-. ./defs || Exit 1
+. ./defs || exit 1
cat > Makefile.am << 'END'
VAR = \
diff --git a/t/pluseq9.sh b/t/pluseq9.sh
index 981a868..4bbb78a 100755
--- a/t/pluseq9.sh
+++ b/t/pluseq9.sh
@@ -16,7 +16,7 @@
# Test the += diagnostics.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >>configure.ac << 'END'
AM_CONDITIONAL([COND1], [true])
diff --git a/t/posixsubst-data.sh b/t/posixsubst-data.sh
index 82be4e6..51b791e 100755
--- a/t/posixsubst-data.sh
+++ b/t/posixsubst-data.sh
@@ -17,7 +17,7 @@
# Test that POSIX variable expansion '$(var:str=rpl)' works
# in when used with the DATA primary.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_OUTPUT
diff --git a/t/posixsubst-extradist.sh b/t/posixsubst-extradist.sh
index 7e3cf2f..b8e69d7 100755
--- a/t/posixsubst-extradist.sh
+++ b/t/posixsubst-extradist.sh
@@ -17,7 +17,7 @@
# Test that POSIX variable expansion '$(var:str=rpl)' works when used
# in EXTRA_DIST.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_OUTPUT
diff --git a/t/posixsubst-ldadd.sh b/t/posixsubst-ldadd.sh
index 2f5b6d5..4d95994 100755
--- a/t/posixsubst-ldadd.sh
+++ b/t/posixsubst-ldadd.sh
@@ -18,7 +18,7 @@
# when used in LDADD.
required=cc
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
diff --git a/t/posixsubst-libraries.sh b/t/posixsubst-libraries.sh
index f59afa2..eab0a67 100755
--- a/t/posixsubst-libraries.sh
+++ b/t/posixsubst-libraries.sh
@@ -19,7 +19,7 @@
# Keep this in sync with sister test 'posixsubst-ltlibraries.test'.
required=cc
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
diff --git a/t/posixsubst-ltlibraries.sh b/t/posixsubst-ltlibraries.sh
index 52e603f..61cc6f2 100755
--- a/t/posixsubst-ltlibraries.sh
+++ b/t/posixsubst-ltlibraries.sh
@@ -19,7 +19,7 @@
# Keep this in sync with sister test 'posixsubst-libraries.test'.
required='cc libtool libtoolize'
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
diff --git a/t/posixsubst-programs.sh b/t/posixsubst-programs.sh
index 99642c2..6e8e56b 100755
--- a/t/posixsubst-programs.sh
+++ b/t/posixsubst-programs.sh
@@ -18,7 +18,7 @@
# with the PROGRAMS primary.
required=cc
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
diff --git a/t/posixsubst-scripts.sh b/t/posixsubst-scripts.sh
index 79c95e2..c9083cb 100755
--- a/t/posixsubst-scripts.sh
+++ b/t/posixsubst-scripts.sh
@@ -17,7 +17,7 @@
# Test that POSIX variable expansion '$(var:str=rpl)' works when used
# with the SCRIPTS primary.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_OUTPUT
diff --git a/t/posixsubst-sources.sh b/t/posixsubst-sources.sh
index 17cd4f0..ed545d2 100755
--- a/t/posixsubst-sources.sh
+++ b/t/posixsubst-sources.sh
@@ -18,7 +18,7 @@
# with the SOURCES primary.
required=cc
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
diff --git a/t/ppf77.sh b/t/ppf77.sh
index 70266d6..73a32cb 100755
--- a/t/ppf77.sh
+++ b/t/ppf77.sh
@@ -17,7 +17,7 @@
# Test to make sure preprocessed F77 works.
# Report from Jochen Kuepper.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_F77
diff --git a/t/pr2.sh b/t/pr2.sh
index a93c255..84973c9 100755
--- a/t/pr2.sh
+++ b/t/pr2.sh
@@ -27,7 +27,7 @@
# to the distribution directory before it creates a templ
# subdirectory in the distribution directory.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_OUTPUT([README.foo:templ/README.foo.in])
diff --git a/t/pr211.sh b/t/pr211.sh
index 97e28eb..a7dcee8 100755
--- a/t/pr211.sh
+++ b/t/pr211.sh
@@ -28,7 +28,7 @@
# rename one of the 'foo.o' files.
required=libtoolize
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
diff --git a/t/pr220.sh b/t/pr220.sh
index 657221d..2054fb3 100755
--- a/t/pr220.sh
+++ b/t/pr220.sh
@@ -22,7 +22,7 @@
# to debug the problem.
# Note that this should be also in the documentation.
-. ./defs || Exit 1
+. ./defs || exit 1
cat > Makefile.am << 'EOF'
if NEVER_TRUE
@@ -51,7 +51,7 @@ $AUTOMAKE -a
cd build
# configure should fail since we've done something invalid.
-../configure 2>stderr && { cat stderr >&2; Exit 1; }
+../configure 2>stderr && { cat stderr >&2; exit 1; }
cat stderr >&2
grep 'conditional.*NEVER_TRUE' stderr
diff --git a/t/pr224.sh b/t/pr224.sh
index ef44cdd..b72f42c 100755
--- a/t/pr224.sh
+++ b/t/pr224.sh
@@ -24,7 +24,7 @@
# should be '$(top_builddir)/bar/.deps'.
required=cc
-. ./defs || Exit 1
+. ./defs || exit 1
mkdir foo
@@ -58,6 +58,6 @@ cd build
$MAKE
test -d foo/.deps
$MAKE distclean
-test -d foo/.deps && Exit 1
+test -d foo/.deps && exit 1
:
diff --git a/t/pr229.sh b/t/pr229.sh
index cacdb82..cb3b223 100755
--- a/t/pr229.sh
+++ b/t/pr229.sh
@@ -18,7 +18,7 @@
# Make sure AC_CYGWIN requires config.{sub,guess}.
# Reported by James Youngman.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac <<EOF
AC_CYGWIN
diff --git a/t/pr279-2.sh b/t/pr279-2.sh
index 5618d76..2d5221b 100755
--- a/t/pr279-2.sh
+++ b/t/pr279-2.sh
@@ -24,7 +24,7 @@
# fail with messages like:
# foo_DEPENDENCIES was already defined in condition TRUE, ...
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
diff --git a/t/pr279.sh b/t/pr279.sh
index 3383131..f3bc52f 100755
--- a/t/pr279.sh
+++ b/t/pr279.sh
@@ -24,7 +24,7 @@
# fail with messages like:
# foo_DEPENDENCIES was already defined in condition TRUE, ...
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
diff --git a/t/pr287.sh b/t/pr287.sh
index 1cd26ae..62eb739 100755
--- a/t/pr287.sh
+++ b/t/pr287.sh
@@ -16,7 +16,7 @@
# Test for PR 287: empty SUBDIRS.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_OUTPUT
diff --git a/t/pr300-lib.sh b/t/pr300-lib.sh
index a676a3a..d9a5dd1 100755
--- a/t/pr300-lib.sh
+++ b/t/pr300-lib.sh
@@ -18,7 +18,7 @@
# PR/300
required=cc
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_RANLIB
@@ -65,8 +65,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/t/pr300-ltlib.sh b/t/pr300-ltlib.sh
index 1495b0b..4926834 100755
--- a/t/pr300-ltlib.sh
+++ b/t/pr300-ltlib.sh
@@ -18,7 +18,7 @@
# PR/300
required='cc libtoolize'
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
@@ -52,29 +52,29 @@ cwd=$(pwd) || fatal_ "getting current working directory"
./configure --prefix "$cwd/inst" --libdir "$cwd/inst/lib"
# A rule in the Makefile should create subdir.
-test ! -d subdir
-$MAKE >stdout || { cat stdout; Exit 1; }
+test ! -e subdir
+$MAKE >stdout || { cat stdout; exit 1; }
cat stdout
test -d subdir
grep 'liba.la .*-rpath .*lib' stdout
-grep 'liba.la .*-rpath .*lib/subdir' stdout && Exit 1
+grep 'liba.la .*-rpath .*lib/subdir' stdout && exit 1
grep 'libb.la .*-rpath .*lib/subdir' stdout
test -f subdir/liba.la
test -f subdir/libb.la
-$MAKE install 2>stderr || { cat stderr >&2; Exit 1; }
+$MAKE install 2>stderr || { cat stderr >&2; exit 1; }
cat stderr >&2
-grep 'remember.*--finish' stderr && Exit 1
+grep 'remember.*--finish' stderr && exit 1
test -f inst/lib/liba.la
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/t/pr300-prog.sh b/t/pr300-prog.sh
index 7be0911..b9aa97d 100755
--- a/t/pr300-prog.sh
+++ b/t/pr300-prog.sh
@@ -18,7 +18,7 @@
# PR/300
required=cc
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
diff --git a/t/pr307.sh b/t/pr307.sh
index abcff80..04b4ee9 100755
--- a/t/pr307.sh
+++ b/t/pr307.sh
@@ -33,7 +33,7 @@
# compilation.
required='libtoolize gcc'
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
@@ -76,7 +76,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/t/pr401.sh b/t/pr401.sh
index 0a0cbcd..28aa16a 100755
--- a/t/pr401.sh
+++ b/t/pr401.sh
@@ -18,7 +18,7 @@
# (pr401b.test and pr401c.test do the same for LTLIBOBJS and ALLOCA)
required=cc
-. ./defs || Exit 1
+. ./defs || exit 1
mkdir lib src
@@ -100,7 +100,7 @@ $ACLOCAL
$AUTOCONF
$AUTOMAKE
./configure
-test ! -d lib/lib
+test ! -e lib/lib
$MAKE distcheck
## -------------------------------------------- ##
@@ -131,8 +131,8 @@ $ACLOCAL
$AUTOCONF
$AUTOMAKE --add-missing
./configure
-test ! -d src/lib
-test ! -d 'src/$(top_builddir)'
+test ! -e src/lib
+test ! -e 'src/$(top_builddir)'
$MAKE
$MAKE check
$MAKE distclean
diff --git a/t/pr401b.sh b/t/pr401b.sh
index f41dde9..997b045 100755
--- a/t/pr401b.sh
+++ b/t/pr401b.sh
@@ -18,7 +18,7 @@
# (pr401.test and pr401c.test do the same for LIBOBJS and ALLOCA)
required='cc libtoolize'
-. ./defs || Exit 1
+. ./defs || exit 1
mkdir lib src
@@ -101,7 +101,7 @@ $ACLOCAL
$AUTOCONF
$AUTOMAKE -a
./configure
-test ! -d lib/lib
+test ! -e lib/lib
$MAKE distcheck
@@ -133,8 +133,8 @@ $ACLOCAL
$AUTOCONF
$AUTOMAKE --add-missing
./configure
-test ! -d src/lib
-test ! -d 'src/$(top_builddir)'
+test ! -e src/lib
+test ! -e 'src/$(top_builddir)'
$MAKE
$MAKE check
$MAKE distclean
diff --git a/t/pr401c.sh b/t/pr401c.sh
index c2fc06e..19d275f 100755
--- a/t/pr401c.sh
+++ b/t/pr401c.sh
@@ -18,7 +18,7 @@
# (pr401.test and pr401b.test do the same for LIBOBJS and LTLIBOBJS)
required=cc
-. ./defs || Exit 1
+. ./defs || exit 1
mkdir lib src
@@ -102,7 +102,7 @@ $ACLOCAL
$AUTOCONF
$AUTOMAKE
./configure
-test ! -d lib/lib
+test ! -e lib/lib
$MAKE distcheck
@@ -135,8 +135,8 @@ $AUTOCONF
$AUTOMAKE --add-missing
./configure
$MAKE
-test ! -d src/lib
-test ! -d 'src/$(top_builddir)'
+test ! -e src/lib
+test ! -e 'src/$(top_builddir)'
$MAKE check
$MAKE distclean
diff --git a/t/pr72.sh b/t/pr72.sh
index b16e879..3c2c914 100755
--- a/t/pr72.sh
+++ b/t/pr72.sh
@@ -18,7 +18,7 @@
# Empty _SOURCES results in $(LINK) undefined.
required=libtool
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
diff --git a/t/pr8365-remake-timing.sh b/t/pr8365-remake-timing.sh
index 7af1e7f..8dbb11a 100755
--- a/t/pr8365-remake-timing.sh
+++ b/t/pr8365-remake-timing.sh
@@ -22,7 +22,7 @@
# make by hand. Thus, fixing it would not be worth the hassle, but
# we prefer to keep it exposed anyway.
-. ./defs || Exit 1
+. ./defs || exit 1
# We'll use calls to stat to get debugging information.
if stat /dev/null; then stat=stat; else stat=:; fi
diff --git a/t/pr87.sh b/t/pr87.sh
index a642df3..8be6038 100755
--- a/t/pr87.sh
+++ b/t/pr87.sh
@@ -18,7 +18,7 @@
# "make distcheck" fails when two source dirs exist.
required=cc
-. ./defs || Exit 1
+. ./defs || exit 1
subdirs="foo bar"
diff --git a/t/pr9.sh b/t/pr9.sh
index 2556b8b..15e8b4b 100755
--- a/t/pr9.sh
+++ b/t/pr9.sh
@@ -23,7 +23,7 @@
# ltconfig, ltmain.sh, mdate-sh, and missing. In fact, the entire
# 'support/' directory is omitted.
-. ./defs || Exit 1
+. ./defs || exit 1
cat > configure.ac << END
AC_INIT([$me], [1.0])
diff --git a/t/prefix.sh b/t/prefix.sh
index 26c088a..907cd78 100755
--- a/t/prefix.sh
+++ b/t/prefix.sh
@@ -16,7 +16,7 @@
# Test to make sure range of prefixes can be extended
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
diff --git a/t/primary-prefix-couples-documented-valid.sh
b/t/primary-prefix-couples-documented-valid.sh
index 7b0021a..5b43157 100755
--- a/t/primary-prefix-couples-documented-valid.sh
+++ b/t/primary-prefix-couples-documented-valid.sh
@@ -18,7 +18,7 @@
# examples in the Automake manual do not cause obvious errors.
# Please keep this test in sync with the automake manual.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac <<'END'
AC_PROG_CC
diff --git a/t/primary-prefix-couples-force-valid.sh
b/t/primary-prefix-couples-force-valid.sh
index af183fd..bf4d39f 100755
--- a/t/primary-prefix-couples-force-valid.sh
+++ b/t/primary-prefix-couples-force-valid.sh
@@ -24,7 +24,7 @@
# should work.
required=cc
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac <<'END'
AC_PROG_CC
diff --git a/t/primary-prefix-invalid-couples.tap
b/t/primary-prefix-invalid-couples.tap
index 407c873..dadf38d 100755
--- a/t/primary-prefix-invalid-couples.tap
+++ b/t/primary-prefix-invalid-couples.tap
@@ -20,7 +20,7 @@
# cover more cases.
# See also test 'primary-prefix-valid-couples.test'.
-. ./defs || Exit 1
+. ./defs || exit 1
plan_ "later"
@@ -182,7 +182,7 @@ while read lineno prefix primary; do
done <all.list
# Check that automake really failed only for the expected reason(s).
-grep -v 'dir.* not a legitimate directory' stderr && Exit 1
+grep -v 'dir.* not a legitimate directory' stderr && exit 1
# Check that the same failures are present without the '--add-missing'
# option.
diff --git a/t/primary-prefix-valid-couples.sh
b/t/primary-prefix-valid-couples.sh
index df21c6b..d7efb98 100755
--- a/t/primary-prefix-valid-couples.sh
+++ b/t/primary-prefix-valid-couples.sh
@@ -17,7 +17,7 @@
# Test for valid prefix/primary combinations.
# See also test 'primary-prefix-invalid-couples.test'.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac <<'END'
AC_PROG_CC
diff --git a/t/primary.sh b/t/primary.sh
index e1a8f44..b107f4d 100755
--- a/t/primary.sh
+++ b/t/primary.sh
@@ -16,7 +16,7 @@
# Test to make sure errors in am_install_var work.
-. ./defs || Exit 1
+. ./defs || exit 1
cat > Makefile.am << 'END'
bin_PROGRAMS = @programs@
diff --git a/t/primary2.sh b/t/primary2.sh
index f9417d8..f355da0 100755
--- a/t/primary2.sh
+++ b/t/primary2.sh
@@ -16,7 +16,7 @@
# Test to make sure errors in am_install_var work.
-. ./defs || Exit 1
+. ./defs || exit 1
echo AC_PROG_CC >> configure.ac
diff --git a/t/primary3.sh b/t/primary3.sh
index 80dab29..9905a8c 100755
--- a/t/primary3.sh
+++ b/t/primary3.sh
@@ -17,7 +17,7 @@
# Make sure we can build programs ending in '.la'
required=cc
-. ./defs || Exit 1
+. ./defs || exit 1
cat >>configure.ac <<EOF
AC_PROG_CC
diff --git a/t/print-libdir.sh b/t/print-libdir.sh
index 0c69942..9a33ac7 100755
--- a/t/print-libdir.sh
+++ b/t/print-libdir.sh
@@ -17,10 +17,10 @@
# Test on automake options '--print-data-dir' and '--print-script-dir'.
am_create_testdir=empty
-. ./defs || Exit 1
+. ./defs || exit 1
-libdir=$($AUTOMAKE --print-libdir) || Exit 1
-case $libdir in /*);; *) Exit 1;; esac
+libdir=$($AUTOMAKE --print-libdir) || exit 1
+case $libdir in /*);; *) exit 1;; esac
test -d "$libdir"
test "$libdir" = "$am_pkgvdatadir"
test "$libdir" = "$am_scriptdir"
diff --git a/t/proginst.sh b/t/proginst.sh
index 4008b47..afb7300 100755
--- a/t/proginst.sh
+++ b/t/proginst.sh
@@ -17,7 +17,7 @@
# 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
diff --git a/t/programs-primary-rewritten.sh b/t/programs-primary-rewritten.sh
index 7de6d99..89b8025 100755
--- a/t/programs-primary-rewritten.sh
+++ b/t/programs-primary-rewritten.sh
@@ -18,7 +18,7 @@
# checks have been introduced in commit 'Release-1-9-254-g9d0eaef' into
# the former test 'subst2.test'.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_SUBST([FOO], [c])
diff --git a/t/py-compile-basedir.sh b/t/py-compile-basedir.sh
index 03617fb..f2cef30 100755
--- a/t/py-compile-basedir.sh
+++ b/t/py-compile-basedir.sh
@@ -17,7 +17,7 @@
# Test the '--basedir' option of the 'py-compile' script,
required=python
-. ./defs || Exit 1
+. ./defs || exit 1
# We'll need to create files in '..', so we need one more subdirectory
# level in order not to clutter up the top-level tests directory.
@@ -34,7 +34,7 @@ for d in foo foo/bar "$(pwd)/foo" . .. ../foo ''; do
else
d2=$d
fi
- ../install-sh -d "$d2" "$d2/sub" || Exit 99
+ ../install-sh -d "$d2" "$d2/sub" || exit 99
: > "$d2/$f.py"
: > "$d2/sub/$f.py"
./py-compile --basedir "$d" "$f.py" "sub/$f.py"
@@ -44,7 +44,7 @@ for d in foo foo/bar "$(pwd)/foo" . .. ../foo ''; do
test -f "$d2/sub/$f.pyc"
test -f "$d2/sub/$f.pyo"
rm -f "$d2/$f.pyc" "$d2/$f.pyo" "$d2/sub/$f.pyc" "$d2/sub/$f.pyo"
- find . | grep '\.py[co]$' && Exit 1
+ find . | grep '\.py[co]$' && exit 1
done
:
diff --git a/t/py-compile-basic.sh b/t/py-compile-basic.sh
index 5fa3bf6..9e554e2 100755
--- a/t/py-compile-basic.sh
+++ b/t/py-compile-basic.sh
@@ -19,7 +19,7 @@
# 'py-compile-basic2.test'.
required=python
-. ./defs || Exit 1
+. ./defs || exit 1
cp "$am_scriptdir/py-compile" . \
|| fatal_ "failed to fetch auxiliary script py-compile"
diff --git a/t/py-compile-basic2.sh b/t/py-compile-basic2.sh
index 3a09f45..c4c7ce0 100755
--- a/t/py-compile-basic2.sh
+++ b/t/py-compile-basic2.sh
@@ -19,7 +19,7 @@
# related test 'py-compile-basic.test'.
required=python
-. ./defs || Exit 1
+. ./defs || exit 1
ocwd=$(pwd) || fatal_ "getting current working directory"
diff --git a/t/py-compile-destdir.sh b/t/py-compile-destdir.sh
index ab3fe77..4d303d5 100755
--- a/t/py-compile-destdir.sh
+++ b/t/py-compile-destdir.sh
@@ -17,7 +17,7 @@
# Test the '--destdir' option of the 'py-compile' script,
required=python
-. ./defs || Exit 1
+. ./defs || exit 1
cp "$am_scriptdir/py-compile" . \
|| fatal_ "failed to fetch auxiliary script py-compile"
@@ -32,12 +32,12 @@ echo 'def bar (): return "bar"' > $destdir/sub/bar.py
./py-compile --destdir $destdir foo.py sub/bar.py
ls -l $destdir $destdir/sub # For debugging.
-ls . sub | grep '\.py[co]$' && Exit 1
+ls . sub | grep '\.py[co]$' && exit 1
test -f $destdir/foo.pyc
test -f $destdir/foo.pyo
test -f $destdir/sub/bar.pyc
test -f $destdir/sub/bar.pyo
strings $destdir/*.py[co] $destdir/sub/*.py[co] || : # For debugging.
-$FGREP $destdir $destdir/*.py[co] $destdir/sub/*.py[co] && Exit 1
+$FGREP $destdir $destdir/*.py[co] $destdir/sub/*.py[co] && exit 1
:
diff --git a/t/py-compile-env.sh b/t/py-compile-env.sh
index 5dd7e5f..89d4ffc 100755
--- a/t/py-compile-env.sh
+++ b/t/py-compile-env.sh
@@ -16,7 +16,7 @@
# Make sure 'py-compile' honours the PYTHON environment variable.
-. ./defs || Exit 1
+. ./defs || exit 1
cp "$am_scriptdir/py-compile" . \
|| fatal_ "failed to fetch auxiliary script py-compile"
@@ -31,14 +31,14 @@ mkdir sub1
cd sub1
PYTHON=: ../py-compile foo.py
-ls | grep . && Exit 1
+ls | grep . && exit 1
-PYTHON=false ../py-compile foo.py && Exit 1
-ls | grep . && Exit 1
+PYTHON=false ../py-compile foo.py && exit 1
+ls | grep . && exit 1
PYTHON='echo GrEpMe AndMeToo' ../py-compile foo.py
PYTHON='echo GrEpMe AndMeToo' ../py-compile foo.py | grep 'GrEpMe AndMeToo'
-ls | grep . && Exit 1
+ls | grep . && exit 1
cd ..
mkdir sub2
@@ -46,7 +46,7 @@ cd sub2
PYTHON=../my-py ../py-compile foo.py
test -f my-py.run
-ls | grep -v '^my-py\.run$' | grep . && Exit 1
+ls | grep -v '^my-py\.run$' | grep . && exit 1
cd ..
mkdir sub3
@@ -54,6 +54,6 @@ cd sub3
PATH=..$PATH_SEPARATOR$PATH; export PATH
PYTHON=my-py py-compile foo.py
test -f my-py.run
-ls | grep -v '^my-py\.run$' | grep . && Exit 1
+ls | grep -v '^my-py\.run$' | grep . && exit 1
:
diff --git a/t/py-compile-option-terminate.sh b/t/py-compile-option-terminate.sh
index f54ffc7..5c2b56f 100755
--- a/t/py-compile-option-terminate.sh
+++ b/t/py-compile-option-terminate.sh
@@ -18,7 +18,7 @@
# explicitly terminate the option list for 'py-compile'.
required=python
-. ./defs || Exit 1
+. ./defs || exit 1
cp "$am_scriptdir/py-compile" . \
|| fatal_ "failed to fetch auxiliary script py-compile"
diff --git a/t/py-compile-usage.sh b/t/py-compile-usage.sh
index 9dfe0a7..13ddc8e 100755
--- a/t/py-compile-usage.sh
+++ b/t/py-compile-usage.sh
@@ -17,7 +17,7 @@
# Test 'py-compile --help', 'py-compile --version', and that 'py-compile'
# correctly complains on wrong usage.
-. ./defs || Exit 1
+. ./defs || exit 1
cp "$am_scriptdir/py-compile" . \
|| fatal_ "failed to fetch auxiliary script py-compile"
@@ -25,9 +25,9 @@ cp "$am_scriptdir/py-compile" . \
# --help
./py-compile --help >stdout 2>stderr \
- || { cat stdout; cat stderr >&2; Exit 1; }
+ || { cat stdout; cat stderr >&2; exit 1; }
cat stdout
-test -s stderr && { cat stderr >&2; Exit 1; }
+test -s stderr && { cat stderr >&2; exit 1; }
grep '^Usage: py-compile .' stdout
$FGREP ' [--basedir DIR]' stdout
$FGREP ' [--destdir DIR]' stdout
@@ -35,9 +35,9 @@ $FGREP ' [--destdir DIR]' stdout
# --version
./py-compile --version >stdout 2>stderr \
- || { cat stdout; cat stderr >&2; Exit 1; }
+ || { cat stdout; cat stderr >&2; exit 1; }
cat stdout
-test -s stderr && { cat stderr >&2; Exit 1; }
+test -s stderr && { cat stderr >&2; exit 1; }
year='20[0-9][0-9]' # Hopefully automake will be obsolete in 80 years ;-)
month='(0[0-9]|1[012])'
day='([012][0-9]|3[01])'
@@ -48,7 +48,7 @@ test $(wc -l <stdout) -eq 1
# Unknown option.
for opt in -b -d --foo; do
- ./py-compile $opt 2>stderr && { cat stderr >&2; Exit 1; }
+ ./py-compile $opt 2>stderr && { cat stderr >&2; exit 1; }
cat stderr >&2
grep "^py-compile: unrecognized option '$opt'" stderr
grep "^Try 'py-compile --help' for more information" stderr
@@ -57,7 +57,7 @@ done
# Missing option argument.
for opt in --basedir --destdir; do
- ./py-compile $opt 2>stderr && { cat stderr >&2; Exit 1; }
+ ./py-compile $opt 2>stderr && { cat stderr >&2; exit 1; }
cat stderr >&2
grep "^py-compile: option '$opt' requires an argument" stderr
grep "^Try 'py-compile --help' for more information" stderr
@@ -66,7 +66,7 @@ done
# Missing files.
for args in '' '--basedir dir' '--destdir dir'; do
- ./py-compile $args 2>stderr && { cat stderr >&2; Exit 1; }
+ ./py-compile $args 2>stderr && { cat stderr >&2; exit 1; }
cat stderr >&2
grep '^py-compile: no files given' stderr
grep "^Try 'py-compile --help' for more information" stderr
diff --git a/t/python-dist.sh b/t/python-dist.sh
index 25dd4fe..0b6a4b0 100755
--- a/t/python-dist.sh
+++ b/t/python-dist.sh
@@ -17,7 +17,7 @@
# Test distribution of *_PYTHON files.
# This test does not require python.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AM_PATH_PYTHON([], [:], [:])
@@ -73,6 +73,6 @@ $AUTOMAKE
$MAKE disttest
# It's not distributed, hence it shouldn't be needlessly generated.
-test ! -f my-nodist.py
+test ! -e my-nodist.py
:
diff --git a/t/python-pr10995.sh b/t/python-pr10995.sh
index 375b792..c530a13 100755
--- a/t/python-pr10995.sh
+++ b/t/python-pr10995.sh
@@ -19,7 +19,7 @@
# declaration.
required=python
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac <<'EOF'
AM_PATH_PYTHON
@@ -48,8 +48,8 @@ test -f py-compile
$MAKE install
test -f inst/py/yes.py
test -f inst/py/yes.pyc
-test ! -f inst/py/no.py
-test ! -f inst/py/no.pyc
+test ! -e inst/py/no.py
+test ! -e inst/py/no.pyc
$MAKE disttest
diff --git a/t/python-vars.sh b/t/python-vars.sh
index 97a45c9..35cd5d7 100755
--- a/t/python-vars.sh
+++ b/t/python-vars.sh
@@ -18,7 +18,7 @@
# advertised in the manual.
required=python
-. ./defs || Exit 1
+. ./defs || exit 1
# In case the user's config.site defines pythondir or pyexecdir.
CONFIG_SITE=/dev/null; export CONFIG_SITE
@@ -30,8 +30,8 @@ PYTHON=python
# vary among different python installations, so we need more relaxed
# and ad-hoc checks for them. Also, more proper "functional" checks
# on them should be done in the 'python-virtualenv.test' test.
-PYTHON_VERSION=$($PYTHON -c 'import sys; print(sys.version[:3])') || Exit 1
-PYTHON_PLATFORM=$($PYTHON -c 'import sys; print(sys.platform)') || Exit 1
+PYTHON_VERSION=$($PYTHON -c 'import sys; print(sys.version[:3])') || exit 1
+PYTHON_PLATFORM=$($PYTHON -c 'import sys; print(sys.platform)') || exit 1
PYTHON_EXEC_PREFIX='${exec_prefix}'
PYTHON_PREFIX='${prefix}'
pkgpythondir="\${pythondir}/$me"
diff --git a/t/python-virtualenv.sh b/t/python-virtualenv.sh
index c6785db..cc5ace0 100755
--- a/t/python-virtualenv.sh
+++ b/t/python-virtualenv.sh
@@ -18,7 +18,7 @@
# This test also works as a mild stress-test on the python support.
required='cc python virtualenv'
-. ./defs || Exit 1
+. ./defs || exit 1
# In case the user's config.site defines pythondir or pyexecdir.
CONFIG_SITE=/dev/null; export CONFIG_SITE
@@ -166,7 +166,7 @@ xMAKE () { $MAKE pythondir="$py_site" pyexecdir="$py_site"
"$@"; }
export pythondir pyexecdir
xMAKE install
-test ! -d bad-prefix
+test ! -e bad-prefix
xMAKE test-install
xMAKE test-run
xMAKE uninstall
@@ -183,7 +183,7 @@ $MAKE install
python -c 'import am_foo; print(am_foo.__file__)'
python -c 'import am_virtenv; print(am_virtenv.__file__)'
deactivate "nondestructive"
-python -c 'import am_foo' && Exit 1
-python -c 'import am_virtenv' && Exit 1
+python -c 'import am_foo' && exit 1
+python -c 'import am_virtenv' && exit 1
:
diff --git a/t/python.sh b/t/python.sh
index 0fe5d12..a3add40 100755
--- a/t/python.sh
+++ b/t/python.sh
@@ -16,7 +16,7 @@
# Test to make sure py_compile and am__py_compile are correctly defined.
-. ./defs || Exit 1
+. ./defs || exit 1
echo 'AM_PATH_PYTHON' >> configure.ac
diff --git a/t/python10.sh b/t/python10.sh
index cc1fd5f..5465810 100755
--- a/t/python10.sh
+++ b/t/python10.sh
@@ -17,7 +17,7 @@
# Test _PYTHON with conditionals.
required=python
-. ./defs || Exit 1
+. ./defs || exit 1
cat >>configure.ac <<'EOF'
AM_PATH_PYTHON
@@ -61,26 +61,26 @@ $MAKE install
test -f "$inst/your/two.py"
test -f "$inst/your/two.pyc"
test -f "$inst/your/two.pyo"
-test ! -f "$inst/my/one.py"
-test ! -f "$inst/my/one.pyc"
-test ! -f "$inst/my/one.pyo"
+test ! -e "$inst/my/one.py"
+test ! -e "$inst/my/one.pyc"
+test ! -e "$inst/my/one.pyo"
$MAKE uninstall
-test ! -f "$inst/your/two.py"
-test ! -f "$inst/your/two.pyc"
-test ! -f "$inst/your/two.pyo"
+test ! -e "$inst/your/two.py"
+test ! -e "$inst/your/two.pyc"
+test ! -e "$inst/your/two.pyo"
../configure --prefix=$cwd/"$inst" one=1
$MAKE install
-test ! -f "$inst/your/two.py"
-test ! -f "$inst/your/two.pyc"
-test ! -f "$inst/your/two.pyo"
+test ! -e "$inst/your/two.py"
+test ! -e "$inst/your/two.pyc"
+test ! -e "$inst/your/two.pyo"
test -f "$inst/my/one.py"
test -f "$inst/my/one.pyc"
test -f "$inst/my/one.pyo"
$MAKE uninstall
-test ! -f "$inst/my/one.py"
-test ! -f "$inst/my/one.pyc"
-test ! -f "$inst/my/one.pyo"
+test ! -e "$inst/my/one.py"
+test ! -e "$inst/my/one.pyc"
+test ! -e "$inst/my/one.pyo"
$MAKE disttest
diff --git a/t/python11.sh b/t/python11.sh
index aff3c9c..e86d30e 100755
--- a/t/python11.sh
+++ b/t/python11.sh
@@ -17,7 +17,7 @@
# Test missing python.
# Python is not required for this test.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >>configure.ac <<'EOF'
m4_define([_AM_PYTHON_INTERPRETER_LIST], [IShouldNotExist1 IShouldNotExist2])
@@ -33,7 +33,7 @@ EOF
$ACLOCAL
$AUTOCONF
-./configure >stdout 2>stderr && { cat stdout; cat stderr >&2; Exit 1; }
+./configure >stdout 2>stderr && { cat stdout; cat stderr >&2; exit 1; }
cat stdout
cat stderr >&2
grep 'checking for IShouldNotExist1' stdout
@@ -48,7 +48,7 @@ $AUTOCONF --force
./configure
# Any user setting should be used.
-./configure PYTHON=foo >stdout && { cat stdout; Exit 1; }
+./configure PYTHON=foo >stdout && { cat stdout; exit 1; }
cat stdout
grep 'PYTHON = foo' stdout
diff --git a/t/python12.sh b/t/python12.sh
index d7b0cc7..898c673 100755
--- a/t/python12.sh
+++ b/t/python12.sh
@@ -17,7 +17,7 @@
# Ensure DESTDIR is not included in byte-compiled files.
required=python
-. ./defs || Exit 1
+. ./defs || exit 1
cat >>configure.ac <<'EOF'
AM_PATH_PYTHON
@@ -49,6 +49,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/t/python2.sh b/t/python2.sh
index 3b13b33..71ba25f 100755
--- a/t/python2.sh
+++ b/t/python2.sh
@@ -16,7 +16,7 @@
# Make sure that Automake suggests using AM_PATH_PYTHON.
-. ./defs || Exit 1
+. ./defs || exit 1
$ACLOCAL
diff --git a/t/python3.sh b/t/python3.sh
index 33c4275..8667cf9 100755
--- a/t/python3.sh
+++ b/t/python3.sh
@@ -17,7 +17,7 @@
# Make sure we install built python files.
required=python
-. ./defs || Exit 1
+. ./defs || exit 1
cat >>configure.ac <<EOF
AM_PATH_PYTHON
diff --git a/t/python4.sh b/t/python4.sh
index 4294bb2..d084861 100755
--- a/t/python4.sh
+++ b/t/python4.sh
@@ -17,7 +17,7 @@
# Test detection of missing Python.
# Python is not required for this test.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >>configure.ac <<EOF
AM_PATH_PYTHON
@@ -31,12 +31,12 @@ $AUTOCONF
$AUTOMAKE --add-missing
# Simulate no Python.
-./configure PYTHON=: 2>stderr && { cat stderr >&2; Exit 1; }
+./configure PYTHON=: 2>stderr && { cat stderr >&2; exit 1; }
cat stderr >&2
grep 'no suitable Python interpreter found' stderr
# Again, but from the environment this time.
-env PYTHON=: ./configure 2>stderr && { cat stderr >&2; Exit 1; }
+env PYTHON=: ./configure 2>stderr && { cat stderr >&2; exit 1; }
cat stderr >&2
grep 'no suitable Python interpreter found' stderr
diff --git a/t/python5.sh b/t/python5.sh
index 80429f9..8e1e030 100755
--- a/t/python5.sh
+++ b/t/python5.sh
@@ -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
cat >>configure.ac <<EOF
# Hopefully the Python team will never release such a version.
@@ -35,7 +35,7 @@ $AUTOMAKE --add-missing
./configure >stdout 2>stderr && {
cat stdout
cat stderr >&2
- Exit 1
+ exit 1
}
cat stdout
cat stderr >&2
diff --git a/t/python5b.sh b/t/python5b.sh
index 366c9b1..39190d9 100755
--- a/t/python5b.sh
+++ b/t/python5b.sh
@@ -18,7 +18,7 @@
# Same as python5.test, but with the user forcing the python to use.
required=python
-. ./defs || Exit 1
+. ./defs || exit 1
cat >>configure.ac << 'END'
# Hopefully the Python team will never release such a version.
@@ -43,7 +43,7 @@ $AUTOMAKE --add-missing
./configure PYTHON=my-python >stdout 2>stderr && {
cat stdout
cat stderr >&2
- Exit 1
+ exit 1
}
cat stdout
cat stderr >&2
diff --git a/t/python6.sh b/t/python6.sh
index 245cf4f..b2bc7da 100755
--- a/t/python6.sh
+++ b/t/python6.sh
@@ -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
cat >>configure.ac <<\EOF
AM_PATH_PYTHON(,, [echo "$PYTHON" > py])
diff --git a/t/python7.sh b/t/python7.sh
index 93f0c96..b3b1421 100755
--- a/t/python7.sh
+++ b/t/python7.sh
@@ -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
cat >>configure.ac <<\EOF
# Hopefully the Python team will never release such a version.
diff --git a/t/python8.sh b/t/python8.sh
index f999cb6..dd1174a 100755
--- a/t/python8.sh
+++ b/t/python8.sh
@@ -17,7 +17,7 @@
# Test ACTION-IF-TRUE in AM_PATH_PYTHON.
required=python
-. ./defs || Exit 1
+. ./defs || exit 1
cat >>configure.ac <<'EOF'
# $PYTHON is supposed to be properly set in ACTION-IF-TRUE.
diff --git a/t/python9.sh b/t/python9.sh
index a992aab..41f32e5 100755
--- a/t/python9.sh
+++ b/t/python9.sh
@@ -18,7 +18,7 @@
# Similar to python8.test, but requiring a version.
required=python
-. ./defs || Exit 1
+. ./defs || exit 1
cat >>configure.ac <<'EOF'
# $PYTHON is supposed to be properly set in ACTION-IF-TRUE.
diff --git a/t/recurs.sh b/t/recurs.sh
index 5a9c165..0dc04d3 100755
--- a/t/recurs.sh
+++ b/t/recurs.sh
@@ -16,7 +16,7 @@
# Test to make sure recursive variable definitions die.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
diff --git a/t/recurs2.sh b/t/recurs2.sh
index e2c5213..9472631 100755
--- a/t/recurs2.sh
+++ b/t/recurs2.sh
@@ -17,7 +17,7 @@
# Test to make sure recursive variable definitions die.
# From Jim Meyering.
-. ./defs || Exit 1
+. ./defs || exit 1
cat > Makefile.am << 'END'
man_MANS = chgrp.1
diff --git a/t/relativize.tap b/t/relativize.tap
index 8f53b6c..d940ddf 100755
--- a/t/relativize.tap
+++ b/t/relativize.tap
@@ -17,7 +17,7 @@
# Test Automake-provided internal make macro $(am__relativize).
am_create_testdir=empty
-. ./defs || Exit 1
+. ./defs || exit 1
plan_ later
diff --git a/t/remake-aclocal-version-mismatch.sh
b/t/remake-aclocal-version-mismatch.sh
index 01321c3..22d31d0 100755
--- a/t/remake-aclocal-version-mismatch.sh
+++ b/t/remake-aclocal-version-mismatch.sh
@@ -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
echo AC_OUTPUT >>configure.ac
@@ -30,18 +30,18 @@ $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
-$MAKE 2>stderr || { cat cat stderr >&2; Exit 1; }
+$MAKE 2>stderr || { cat cat stderr >&2; exit 1; }
cat stderr >&2
grep 'You have another version of autoconf' stderr
grep 'aclocal.m4:.*this file was generated for' stderr
-$MAKE 2>stderr || { cat cat stderr >&2; Exit 1; }
+$MAKE 2>stderr || { cat cat stderr >&2; exit 1; }
cat stderr >&2
-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/t/remake-all-1.sh b/t/remake-all-1.sh
index 92beb09..b57157a 100755
--- a/t/remake-all-1.sh
+++ b/t/remake-all-1.sh
@@ -16,7 +16,7 @@
# Check that the "all" target triggers rebuilt of outdated Makefiles.
-. ./defs || Exit 1
+. ./defs || exit 1
mkfile=Makefile
@@ -42,7 +42,7 @@ $AUTOMAKE
./configure
-$FGREP "$magic1" mkfile.in && Exit 1 # Sanity check.
+$FGREP "$magic1" mkfile.in && exit 1 # Sanity check.
# Two code paths in configure.am:
diff --git a/t/remake-am-pr10111.sh b/t/remake-am-pr10111.sh
index c567608..b3b7c6c 100755
--- a/t/remake-am-pr10111.sh
+++ b/t/remake-am-pr10111.sh
@@ -22,7 +22,7 @@
# big deal in practice (in fact, this test *currently fails*). Still,
# keeping the limitation exposed is a good idea anyway.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac <<'END'
AC_OUTPUT
diff --git a/t/remake-deleted-am-2.sh b/t/remake-deleted-am-2.sh
index 1d048be..0b55062 100755
--- a/t/remake-deleted-am-2.sh
+++ b/t/remake-deleted-am-2.sh
@@ -18,7 +18,7 @@
# of the "deleted header problem". This test checks deeper inclusion
# stacks, and use VPATH builds.
-. ./defs || Exit 1
+. ./defs || exit 1
echo AC_OUTPUT >> configure.ac
@@ -60,7 +60,7 @@ echo '# this is baz' > $srcdir/baz.am
rm -f $srcdir/fnord.am
$MAKE
# Sanity checks.
-$FGREP 'you are not seeing this' $srcdir/Makefile.in Makefile && Exit 1
+$FGREP 'you are not seeing this' $srcdir/Makefile.in Makefile && exit 1
$FGREP 'this is baz' $srcdir/Makefile.in
$FGREP 'this is baz' Makefile
@@ -69,7 +69,7 @@ rm -rf $srcdir/sub $srcdir/foo.am $srcdir/baz.am
echo '# no more inclusions' > $srcdir/Makefile.am
$MAKE
# Sanity checks.
-$EGREP 'this is (foo|bar|baz)' Makefile $srcdir/Makefile.in && Exit 1
+$EGREP 'this is (foo|bar|baz)' Makefile $srcdir/Makefile.in && exit 1
$FGREP 'no more inclusions' Makefile
:
diff --git a/t/remake-deleted-am-subdir.sh b/t/remake-deleted-am-subdir.sh
index 3ca8507..868d36e 100755
--- a/t/remake-deleted-am-subdir.sh
+++ b/t/remake-deleted-am-subdir.sh
@@ -18,7 +18,7 @@
# of the "deleted header problem". This test does the check when the
# SUBDIRS variable is involved.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac <<'END'
AC_CONFIG_FILES([sub1/Makefile sub2/Makefile])
@@ -56,7 +56,7 @@ echo '# this is sub1/Makefile.am' > sub1/Makefile.am
rm -f sub1/bar.am
$MAKE all
# Sanity checks.
-$FGREP 'this is bar' sub1/Makefile.in sub1/Makefile && Exit 1
+$FGREP 'this is bar' sub1/Makefile.in sub1/Makefile && exit 1
$FGREP 'this is sub1/Makefile.am' sub1/Makefile.in
$FGREP 'this is sub1/Makefile.am' sub1/Makefile
@@ -68,7 +68,7 @@ done
rm -f foo.am
$MAKE all
# Sanity checks.
-$FGREP 'this is foo' sub*/Makefile* Makefile* && Exit 1
+$FGREP 'this is foo' sub*/Makefile* Makefile* && exit 1
for d in . sub1 sub2; do
$FGREP "this is $d/Makefile.am" $d/Makefile.in
$FGREP "this is $d/Makefile.am" $d/Makefile
diff --git a/t/remake-deleted-am.sh b/t/remake-deleted-am.sh
index 4bd77d6..f754a37 100755
--- a/t/remake-deleted-am.sh
+++ b/t/remake-deleted-am.sh
@@ -17,7 +17,7 @@
# Check that inclusion of '.am' fragments by automake does not suffer
# of the "deleted header problem". Basic checks are done here.
-. ./defs || Exit 1
+. ./defs || exit 1
echo AC_OUTPUT >> configure.ac
@@ -49,7 +49,7 @@ mv -f t Makefile.am
rm -f foo.am
$MAKE Makefile
# Sanity checks.
-$FGREP 'this is foo' Makefile.in Makefile && Exit 1
+$FGREP 'this is foo' Makefile.in Makefile && exit 1
$FGREP 'this is bar' Makefile.in
$FGREP 'this is bar' Makefile
$FGREP 'this is baz' Makefile.in
@@ -62,6 +62,6 @@ $MAKE Makefile
# Sanity checks.
$FGREP 'empty empty' Makefile.in
$FGREP 'empty empty' Makefile
-grep 'this is ba[rz]' Makefile Makefile.in && Exit 1
+grep 'this is ba[rz]' Makefile Makefile.in && exit 1
:
diff --git a/t/remake-deleted-m4-file.sh b/t/remake-deleted-m4-file.sh
index 1245a47..fc74834 100755
--- a/t/remake-deleted-m4-file.sh
+++ b/t/remake-deleted-m4-file.sh
@@ -20,7 +20,7 @@
# header file" issue w.r.t. aclocal.m4 dependencies. See also related
# test 'acloca22.test'.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac <<'END'
FOO_MACRO
diff --git a/t/remake-gnulib-add-acsubst.sh b/t/remake-gnulib-add-acsubst.sh
index 46590e7..99b5366 100755
--- a/t/remake-gnulib-add-acsubst.sh
+++ b/t/remake-gnulib-add-acsubst.sh
@@ -22,7 +22,7 @@
# for more info).
required=cc
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac <<'END'
AC_PROG_CC
diff --git a/t/remake-gnulib-add-header.sh b/t/remake-gnulib-add-header.sh
index 91c38e5..0f6feef 100755
--- a/t/remake-gnulib-add-header.sh
+++ b/t/remake-gnulib-add-header.sh
@@ -22,7 +22,7 @@
# for more info).
required=cc
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac <<'END'
AC_CONFIG_HEADERS([config.h])
@@ -89,7 +89,7 @@ $AUTOCONF
$MAKE
ls -l
-test ! -f stdio.h
+test ! -e stdio.h
# Also try our build rules in a VPATH build.
$MAKE distcheck
diff --git a/t/remake-gnulib-remove-header.sh b/t/remake-gnulib-remove-header.sh
index aff60df..ec94af5 100755
--- a/t/remake-gnulib-remove-header.sh
+++ b/t/remake-gnulib-remove-header.sh
@@ -23,7 +23,7 @@
# for more info).
required=cc
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac <<'END'
AC_CONFIG_HEADERS([config.h])
@@ -113,7 +113,7 @@ for vpath in : false; do
$MAKE
ls -l
- test ! -f stdio.h
+ test ! -e stdio.h
# And now simulate that we want our custom stdio.h back.
diff --git a/t/remake-m4-pr10111.sh b/t/remake-m4-pr10111.sh
index 09a2a4c..8a28925 100755
--- a/t/remake-m4-pr10111.sh
+++ b/t/remake-m4-pr10111.sh
@@ -22,7 +22,7 @@
# big deal in practice (in fact, this test *currently fails*). Still,
# keeping the limitation exposed is a good idea anyway.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac <<'END'
m4_include([foobar.m4])
diff --git a/t/remake-moved-m4-file.sh b/t/remake-moved-m4-file.sh
index 2192385..c5cf42a 100755
--- a/t/remake-moved-m4-file.sh
+++ b/t/remake-moved-m4-file.sh
@@ -17,7 +17,7 @@
# Test remake rules when m4 files get moved among different "include
# dirs" (i.e. those passed to aclocal with '-I' option).
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac <<'END'
MY_MACRO
@@ -54,9 +54,9 @@ $MAKE test
$MAKE distdir
ls -l $distdir $distdir/*
test -f $distdir/d2/foo.m4
-test ! -f $distdir/d1/foo.m4
+test ! -e $distdir/d1/foo.m4
test -f $distdir/d1/macros.m4
-test ! -f $distdir/d2/macros.m4
+test ! -e $distdir/d2/macros.m4
# Move both files at once.
mv d1/macros.m4 d3/macros.m4
@@ -66,9 +66,9 @@ $MAKE distdir
ls -l $distdir $distdir/*
test -f $distdir/d3/foo.m4
test -f $distdir/d3/macros.m4
-test ! -f $distdir/d1/foo.m4
-test ! -f $distdir/d2/foo.m4
-test ! -f $distdir/d1/macros.m4
-test ! -f $distdir/d2/macros.m4
+test ! -e $distdir/d1/foo.m4
+test ! -e $distdir/d2/foo.m4
+test ! -e $distdir/d1/macros.m4
+test ! -e $distdir/d2/macros.m4
:
diff --git a/t/remake-renamed-am.sh b/t/remake-renamed-am.sh
index 32ca06c..8ebe563 100755
--- a/t/remake-renamed-am.sh
+++ b/t/remake-renamed-am.sh
@@ -18,7 +18,7 @@
# of the "deleted header problem". This test checks that we can rename
# an included .am file without confusing the remake rules.
-. ./defs || Exit 1
+. ./defs || exit 1
echo AC_OUTPUT >> configure.ac
@@ -44,14 +44,14 @@ rm -f has-run-1
mv -f foo.am bar.am
echo include bar.am > Makefile.am
$MAKE Makefile
-$FGREP 'foo.am' Makefile Makefile.in && Exit 1
+$FGREP 'foo.am' Makefile Makefile.in && exit 1
$sleep
rm -f has-run-1 bar.am
echo 'all-local:; echo ok > has-run-2' > zardoz.am
echo 'include $(srcdir)/zardoz.am' > Makefile.am
$MAKE
-test ! -f has-run-1
+test ! -e has-run-1
test -f has-run-2
:
diff --git a/t/remake-renamed-m4-file.sh b/t/remake-renamed-m4-file.sh
index 553da92..666cf4c 100755
--- a/t/remake-renamed-m4-file.sh
+++ b/t/remake-renamed-m4-file.sh
@@ -16,7 +16,7 @@
# Test remake rules when m4 files get renamed.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac <<'END'
MY_MACRO
@@ -54,14 +54,14 @@ $MAKE test
$MAKE distdir
ls -l $distdir $distdir/*
test -f $distdir/m4/bar.m4
-test ! -f $distdir/m4/foo.m4
+test ! -e $distdir/m4/foo.m4
mv m4/macros.m4 m4/defs.m4
$MAKE test
$MAKE distdir
ls -l $distdir $distdir/*
test -f $distdir/m4/defs.m4
-test ! -f $distdir/m4/macros.m4
+test ! -e $distdir/m4/macros.m4
# Rename both files at once.
@@ -72,9 +72,9 @@ $MAKE distdir
ls -l $distdir $distdir/*
test -f $distdir/m4/quux.m4
test -f $distdir/acinclude.m4
-test ! -f $distdir/m4/foo.m4
-test ! -f $distdir/m4/bar.m4
-test ! -f $distdir/m4/macros.m4
-test ! -f $distdir/m4/defs.m4
+test ! -e $distdir/m4/foo.m4
+test ! -e $distdir/m4/bar.m4
+test ! -e $distdir/m4/macros.m4
+test ! -e $distdir/m4/defs.m4
:
diff --git a/t/remake-renamed-m4-macro-and-file.sh
b/t/remake-renamed-m4-macro-and-file.sh
index 72d922d..f82bf15 100755
--- a/t/remake-renamed-m4-macro-and-file.sh
+++ b/t/remake-renamed-m4-macro-and-file.sh
@@ -18,7 +18,7 @@
# an m4 macro in it gets renamed. Kudos to Bruno Haible for thinking
# about this situation. See also related test 'acloca22.test'.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac <<'END'
MY_MACRO
@@ -61,7 +61,7 @@ $MAKE distdir
ls -l $distdir $distdir/*
test -f $distdir/m4/bar.m4
test -f $distdir/m4/macros.m4
-test ! -f $distdir/m4/foo.m4
+test ! -e $distdir/m4/foo.m4
# Rename both at once.
@@ -78,7 +78,7 @@ $MAKE distdir
ls -l $distdir $distdir/*
test -f $distdir/m4/quux.m4
test -f $distdir/m4/defs.m4
-test ! -f $distdir/m4/bar.m4
-test ! -f $distdir/m4/macros.m4
+test ! -e $distdir/m4/bar.m4
+test ! -e $distdir/m4/macros.m4
:
diff --git a/t/remake-renamed-m4-macro.sh b/t/remake-renamed-m4-macro.sh
index 981a440..96cd730 100755
--- a/t/remake-renamed-m4-macro.sh
+++ b/t/remake-renamed-m4-macro.sh
@@ -17,7 +17,7 @@
# Test remake rules when the name of an m4 macro change. Try both with
# and without indirection.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac <<'END'
MY_MACRO
diff --git a/t/remake-subdir-from-subdir.sh b/t/remake-subdir-from-subdir.sh
index a7be412..51a5231 100755
--- a/t/remake-subdir-from-subdir.sh
+++ b/t/remake-subdir-from-subdir.sh
@@ -19,7 +19,7 @@
# See also the other similar tests 'remake-subdir*.test', and the
# related test 'aclocal5.test'.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac <<'END'
m4_include([subdirs.m4])
diff --git a/t/remake-subdir-gnu.sh b/t/remake-subdir-gnu.sh
index 52afc44..a2ead75 100755
--- a/t/remake-subdir-gnu.sh
+++ b/t/remake-subdir-gnu.sh
@@ -20,7 +20,7 @@
# See also the other similar tests 'remake-subdir*.test', and the
# related test 'aclocal5.test'
-. ./defs || Exit 1
+. ./defs || exit 1
magic1='::MagicString::One::'
magic2='__MagicString__Two__'
@@ -73,7 +73,7 @@ cd ..
debug_info
$FGREP $magic2 sub/GNUmakefile
$FGREP $magic2 sub/GNUmakefile.in
-$FGREP $magic1 sub/GNUmakefile sub/GNUmakefile.in && Exit 1
-$FGREP $magic2 GNUmakefile GNUmakefile.in && Exit 1
+$FGREP $magic1 sub/GNUmakefile sub/GNUmakefile.in && exit 1
+$FGREP $magic2 GNUmakefile GNUmakefile.in && exit 1
:
diff --git a/t/remake-subdir-long-time.sh b/t/remake-subdir-long-time.sh
index 093ab0e..92f61aa 100755
--- a/t/remake-subdir-long-time.sh
+++ b/t/remake-subdir-long-time.sh
@@ -21,7 +21,7 @@
# an explicit delay in the build process.
# Suggestion by Ralf Wildenhues.
-. ./defs || Exit 1
+. ./defs || exit 1
cat > configure.ac <<END
AC_INIT([$me], [1.0])
diff --git a/t/remake-subdir.sh b/t/remake-subdir.sh
index a297b44..412630b 100755
--- a/t/remake-subdir.sh
+++ b/t/remake-subdir.sh
@@ -19,7 +19,7 @@
# See also the other similar tests 'remake-subdir*.test', and the
# related test 'aclocal5.test'.
-. ./defs || Exit 1
+. ./defs || exit 1
magic1='::MagicString::One::'
magic2='__MagicString__Two__'
@@ -69,7 +69,7 @@ cd ..
debug_info
$FGREP $magic2 sub/Makefile
$FGREP $magic2 sub/Makefile.in
-$FGREP $magic1 sub/Makefile sub/Makefile.in && Exit 1
-$FGREP $magic2 Makefile Makefile.in && Exit 1
+$FGREP $magic1 sub/Makefile sub/Makefile.in && exit 1
+$FGREP $magic2 Makefile Makefile.in && exit 1
:
diff --git a/t/remake.sh b/t/remake.sh
index 620d5f8..b883d2a 100755
--- a/t/remake.sh
+++ b/t/remake.sh
@@ -18,7 +18,7 @@
# are correctly generated.
# See also sister functional test 'remake1a.test'.
-. ./defs || Exit 1
+. ./defs || exit 1
cat > configure.ac <<END
AC_INIT([$me], [1.0])
diff --git a/t/remake10a.sh b/t/remake10a.sh
index 67da954..232c1d5 100755
--- a/t/remake10a.sh
+++ b/t/remake10a.sh
@@ -18,7 +18,7 @@
# configure.ac.
# Keep in sync with sister tests 'remake10b.test' and 'remake10c.test'.
-. ./defs || Exit 1
+. ./defs || exit 1
magic1=::MagicStringOne::
magic2=__MagicStringTwo__
@@ -71,7 +71,7 @@ for vpath in : false; do
echo "m4_define([my_fingerprint], [$magic2])" > $top_srcdir/foo.m4
$remake
$FGREP FINGERPRINT Makefile # For debugging.
- $FGREP $magic1 Makefile && Exit 1
+ $FGREP $magic1 Makefile && exit 1
$FGREP $magic2 Makefile
$sleep
@@ -79,23 +79,23 @@ for vpath in : false; do
echo "m4_define([my_fingerprint], [$magic3])" > $top_srcdir/bar.m4
$remake
$FGREP FINGERPRINT Makefile # For debugging.
- $FGREP $magic1 Makefile && Exit 1
- $FGREP $magic2 Makefile && Exit 1
+ $FGREP $magic1 Makefile && exit 1
+ $FGREP $magic2 Makefile && exit 1
$FGREP $magic3 Makefile
$sleep
echo "m4_define([my_fingerprint], [$magic1])" > $top_srcdir/bar.m4
$remake
- $FGREP $magic2 Makefile && Exit 1
- $FGREP $magic3 Makefile && Exit 1
+ $FGREP $magic2 Makefile && exit 1
+ $FGREP $magic3 Makefile && exit 1
$FGREP $magic1 Makefile
$sleep
echo "m4_define([my_fingerprint], [DummyValue])" > $top_srcdir/foo.m4
$MAKE distcheck
- $FGREP $magic1 Makefile && Exit 1 # Sanity check.
- $FGREP $magic2 Makefile && Exit 1 # Likewise.
- $FGREP $magic3 Makefile && Exit 1 # Likewise.
+ $FGREP $magic1 Makefile && exit 1 # Sanity check.
+ $FGREP $magic2 Makefile && exit 1 # Likewise.
+ $FGREP $magic3 Makefile && exit 1 # Likewise.
$MAKE distclean
diff --git a/t/remake10b.sh b/t/remake10b.sh
index c3f573d..fe49199 100755
--- a/t/remake10b.sh
+++ b/t/remake10b.sh
@@ -18,7 +18,7 @@
# Makefile.am.
# Keep in sync with sister tests 'remake10a.test' and 'remake10c.test'.
-. ./defs || Exit 1
+. ./defs || exit 1
magic1=::MagicStringOne::
magic2=__MagicStringTwo__
@@ -70,7 +70,7 @@ for vpath in : false; do
echo "FINGERPRINT = $magic2" > $top_srcdir/foo.am
$remake
$FGREP FINGERPRINT Makefile # For debugging.
- $FGREP $magic1 Makefile && Exit 1
+ $FGREP $magic1 Makefile && exit 1
$FGREP $magic2 Makefile
$sleep
@@ -78,23 +78,23 @@ for vpath in : false; do
echo "FINGERPRINT = $magic3" > $top_srcdir/bar.am
$remake
$FGREP FINGERPRINT Makefile # For debugging.
- $FGREP $magic1 Makefile && Exit 1
- $FGREP $magic2 Makefile && Exit 1
+ $FGREP $magic1 Makefile && exit 1
+ $FGREP $magic2 Makefile && exit 1
$FGREP $magic3 Makefile
$sleep
echo "FINGERPRINT = $magic1" > $top_srcdir/bar.am
$remake
- $FGREP $magic2 Makefile && Exit 1
- $FGREP $magic3 Makefile && Exit 1
+ $FGREP $magic2 Makefile && exit 1
+ $FGREP $magic3 Makefile && exit 1
$FGREP $magic1 Makefile
$sleep
echo "FINGERPRINT = DummyValue" > $top_srcdir/foo.am
$MAKE distcheck
- $FGREP $magic1 Makefile && Exit 1 # Sanity check.
- $FGREP $magic2 Makefile && Exit 1 # Likewise.
- $FGREP $magic3 Makefile && Exit 1 # Likewise.
+ $FGREP $magic1 Makefile && exit 1 # Sanity check.
+ $FGREP $magic2 Makefile && exit 1 # Likewise.
+ $FGREP $magic3 Makefile && exit 1 # Likewise.
$MAKE distclean
diff --git a/t/remake10c.sh b/t/remake10c.sh
index c94cd98..739d7a7 100755
--- a/t/remake10c.sh
+++ b/t/remake10c.sh
@@ -18,7 +18,7 @@
# aclocal.m4.
# Keep in sync with sister tests 'remake10a.test' and 'remake10b.test'.
-. ./defs || Exit 1
+. ./defs || exit 1
magic1=::MagicStringOne::
magic2=__MagicStringTwo__
@@ -73,7 +73,7 @@ for vpath in : false; do
echo "AC_DEFUN([my_fingerprint], [$magic2])" > $top_srcdir/m4/foo.m4
$remake
$FGREP FINGERPRINT Makefile # For debugging.
- $FGREP $magic1 Makefile && Exit 1
+ $FGREP $magic1 Makefile && exit 1
$FGREP $magic2 Makefile
$sleep
@@ -81,24 +81,24 @@ for vpath in : false; do
echo "AC_DEFUN([my_fingerprint], [$magic3])" > $top_srcdir/m4/bar.m4
$remake
$FGREP FINGERPRINT Makefile # For debugging.
- $FGREP $magic1 Makefile && Exit 1
- $FGREP $magic2 Makefile && Exit 1
+ $FGREP $magic1 Makefile && exit 1
+ $FGREP $magic2 Makefile && exit 1
$FGREP $magic3 Makefile
$sleep
echo "AC_DEFUN([my_fingerprint], [$magic1])" > $top_srcdir/m4/bar.m4
$remake
- $FGREP $magic2 Makefile && Exit 1
- $FGREP $magic3 Makefile && Exit 1
+ $FGREP $magic2 Makefile && exit 1
+ $FGREP $magic3 Makefile && exit 1
$FGREP $magic1 Makefile
$sleep
echo "AC_DEFUN([my_fingerprint], [DummyValue])" > $top_srcdir/m4/foo.m4
echo "AC_DEFUN([AM_UNUSED], [NoSuchMacro])" > $top_srcdir/m4/bar.m4
$MAKE distcheck
- $FGREP $magic1 Makefile && Exit 1 # Sanity check.
- $FGREP $magic2 Makefile && Exit 1 # Likewise.
- $FGREP $magic3 Makefile && Exit 1 # Likewise.
+ $FGREP $magic1 Makefile && exit 1 # Sanity check.
+ $FGREP $magic2 Makefile && exit 1 # Likewise.
+ $FGREP $magic3 Makefile && exit 1 # Likewise.
$MAKE distclean
diff --git a/t/remake11.sh b/t/remake11.sh
index 3b97df9..8f29499 100755
--- a/t/remake11.sh
+++ b/t/remake11.sh
@@ -19,7 +19,7 @@
# rules don't break in obvious ways in a slightly "heavier than usual"
# setup.
-. ./defs || Exit 1
+. ./defs || exit 1
ocwd=$(pwd) || fatal_ "getting current working directory"
@@ -76,7 +76,7 @@ cd "$ocwd"
for f in configure config.status $makefiles_list $bar_list; do
$FGREP "$magic2" $f
done
-$FGREP "$magic1" configure config.status $makefiles_list $bar_list && Exit 1
+$FGREP "$magic1" configure config.status $makefiles_list $bar_list && exit 1
$MAKE distcheck
diff --git a/t/remake12.sh b/t/remake12.sh
index dda5550..15a56ce 100755
--- a/t/remake12.sh
+++ b/t/remake12.sh
@@ -17,7 +17,7 @@
# Test basic remake rules for Makefiles with non-default names
# and/or with multiple sources.
-. ./defs || Exit 1
+. ./defs || exit 1
magic1=::MagicStringOne::
magic2=__MagicStringTwo__
@@ -85,7 +85,7 @@ mv -f t zardoz.am
cat zardoz.am # For debugging.
$MAKE nil
$FGREP my-check zardoz # Sanity check.
-$FGREP $magic1 zardoz zardoz.in && Exit 1
+$FGREP $magic1 zardoz zardoz.in && exit 1
$FGREP $magic2 zardoz
$FGREP $magic2 zardoz.in
@@ -102,10 +102,10 @@ echo 'BAR = $(BAZ)' > top.in
echo "BAZ = $magic3" > bot.in
$MAKE test
$FGREP my-check zardoz # Sanity check.
-$FGREP $magic3 quux.in && Exit 1
+$FGREP $magic3 quux.in && exit 1
$FGREP $magic3 zardoz
-$FGREP $magic1 zardoz && Exit 1
-$FGREP $magic2 zardoz && Exit 1
+$FGREP $magic1 zardoz && exit 1
+$FGREP $magic2 zardoz && exit 1
# After the remake above, the files 'zardoz.am' and 'zardoz.in'
# should be no more needed.
echo 'endif' > zardoz.am # Put in a syntax error.
diff --git a/t/remake1a.sh b/t/remake1a.sh
index fede092..6460fc3 100755
--- a/t/remake1a.sh
+++ b/t/remake1a.sh
@@ -17,7 +17,7 @@
# Make sure remaking rules in subdir are correctly generated.
# See also sister "grepping" test 'remake.test'.
-. ./defs || Exit 1
+. ./defs || exit 1
fingerprint='=/FiNgErPrInT/='
@@ -47,7 +47,7 @@ $MAKE Makefile
cd ..
# Check that no spurious Makefile has been created in the
# top-level directory.
-test ! -r Makefile
+test ! -e Makefile
# Check that the Makefile in the subdirectory has been properly
# updated.
$FGREP "$fingerprint" sub/Makefile
diff --git a/t/remake2.sh b/t/remake2.sh
index 228b14f..ff88d78 100755
--- a/t/remake2.sh
+++ b/t/remake2.sh
@@ -18,7 +18,7 @@
# are correct even when there is no upper-level Makefile.
# TODO: we should really add also functional tests for this!
-. ./defs || Exit 1
+. ./defs || exit 1
cat > configure.ac <<END
AC_INIT([$me], [1.0])
diff --git a/t/remake3.sh b/t/remake3.sh
index 96294fb..e19d8ea 100755
--- a/t/remake3.sh
+++ b/t/remake3.sh
@@ -18,7 +18,7 @@
# in a subdirectory even when there is no Makefile for that subdirectory.
# See also sister functional test 'remake3a.test'.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_CONFIG_FILES([sub/foo])
diff --git a/t/remake3a.sh b/t/remake3a.sh
index cac2abc..9cbd105 100755
--- a/t/remake3a.sh
+++ b/t/remake3a.sh
@@ -18,7 +18,7 @@
# there is no Makefile for that subdirectory.
# See also sister "grepping" test 'remake3.test'.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_CONFIG_FILES([sub/foo])
diff --git a/t/remake4.sh b/t/remake4.sh
index c43a535..955d5dc 100755
--- a/t/remake4.sh
+++ b/t/remake4.sh
@@ -27,7 +27,7 @@
#
# Report from Akim Demaille.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >>configure.ac <<'EOF'
# Rebuild rule are ok until make dist, but not afterwards.
diff --git a/t/remake5.sh b/t/remake5.sh
index be98afd..1383d0d 100755
--- a/t/remake5.sh
+++ b/t/remake5.sh
@@ -18,7 +18,7 @@
# but not all.
# Report from Ralf Corsepius.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >>configure.ac <<'EOF'
AM_MAINTAINER_MODE
@@ -59,7 +59,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/t/remake6.sh b/t/remake6.sh
index b5e9646..2146b38 100755
--- a/t/remake6.sh
+++ b/t/remake6.sh
@@ -16,7 +16,7 @@
# Make sure remaking rules work when subdir Makefile.in has been removed.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_CONFIG_FILES([sub/Makefile])
@@ -37,7 +37,7 @@ $MAKE
do_check ()
{
- $MAKE >stdout || { cat stdout; Exit 1; }
+ $MAKE >stdout || { cat stdout; exit 1; }
cat stdout
test $(grep -c "/missing " stdout) -eq 1
}
diff --git a/t/remake7.sh b/t/remake7.sh
index fbd15e6..9ccf5d1 100755
--- a/t/remake7.sh
+++ b/t/remake7.sh
@@ -16,7 +16,7 @@
# Make sure remaking rules fail when they should.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_CONFIG_FILES([sub/Makefile])
@@ -40,30 +40,30 @@ $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/t/remake8a.sh b/t/remake8a.sh
index a03a476..30c25f4 100755
--- a/t/remake8a.sh
+++ b/t/remake8a.sh
@@ -21,7 +21,7 @@
# Keep this in sync with sister test 'remake8b.test', which performs the
# same checks for a VPATH build.
-. ./defs || Exit 1
+. ./defs || exit 1
mv -f configure.ac configure.stub
@@ -73,7 +73,7 @@ END
$MAKE
cat bar
grep '!Baz!' bar
-test ! -r foo
+test ! -e foo
$MAKE distcheck
rm -f bar
@@ -103,7 +103,7 @@ END
$MAKE
cat quux
grep '!Zardoz!' quux
-test ! -r bar
+test ! -e bar
$MAKE distcheck
rm -f quux
diff --git a/t/remake8b.sh b/t/remake8b.sh
index e240b81..a0adf07 100755
--- a/t/remake8b.sh
+++ b/t/remake8b.sh
@@ -21,7 +21,7 @@
# Keep this in sync with sister test 'remake8a.test', which performs the
# same checks for a in-tree build.
-. ./defs || Exit 1
+. ./defs || exit 1
mv -f configure.ac configure.stub
@@ -75,7 +75,7 @@ END
$MAKE
cat bar
grep '!Baz!' bar
-test ! -r foo
+test ! -e foo
$MAKE distcheck
rm -f bar
@@ -105,7 +105,7 @@ END
$MAKE
cat quux
grep '!Zardoz!' quux
-test ! -r bar
+test ! -e bar
$MAKE distcheck
rm -f quux
diff --git a/t/remake9a.sh b/t/remake9a.sh
index f9a2b83..5678722 100755
--- a/t/remake9a.sh
+++ b/t/remake9a.sh
@@ -17,7 +17,7 @@
# Test remake rules when configure.ac or its prerequisites change.
# Keep in sync with the other sister tests 'remake9*.test'.
-. ./defs || Exit 1
+. ./defs || exit 1
magic1=::MagicStringOne::
magic2=__MagicStringTwo__
@@ -81,7 +81,7 @@ for vpath in : false; do
> $srcdir/tweak-configure-in
$MAKE nil
$FGREP FINGERPRINT Makefile # For debugging.
- $FGREP $magic1 Makefile && Exit 1
+ $FGREP $magic1 Makefile && exit 1
$FGREP $magic2 Makefile
test x"$(./foo.sh)" = x"$magic2"
@@ -90,8 +90,8 @@ for vpath in : false; do
sed "s/^\\(FINGERPRINT\\)=.*/\\1=DummyValue/" $srcdir/configure.ac >t
mv -f t $srcdir/configure.ac
$MAKE distcheck
- $FGREP $magic1 Makefile && Exit 1 # Sanity check.
- $FGREP $magic2 Makefile && Exit 1 # Likewise.
+ $FGREP $magic1 Makefile && exit 1 # Sanity check.
+ $FGREP $magic2 Makefile && exit 1 # Likewise.
$MAKE distclean
diff --git a/t/remake9b.sh b/t/remake9b.sh
index 901ebe2..262642c 100755
--- a/t/remake9b.sh
+++ b/t/remake9b.sh
@@ -17,7 +17,7 @@
# Test remake rules when Makefile.am or its prerequisites change.
# Keep in sync with the other sister tests 'remake9*.test'.
-. ./defs || Exit 1
+. ./defs || exit 1
magic1=::MagicStringOne::
magic2=__MagicStringTwo__
@@ -83,7 +83,7 @@ for vpath in : false; do
> $srcdir/tweak-makefile-am
$MAKE nil
$FGREP FINGERPRINT Makefile # For debugging.
- $FGREP $magic1 Makefile && Exit 1
+ $FGREP $magic1 Makefile && exit 1
$FGREP $magic2 Makefile
test x"$(./foo.sh)" = x"$magic2"
@@ -92,8 +92,8 @@ for vpath in : false; do
sed "s/^\\(FINGERPRINT\\) *=.*/\\1 = DummyValue/" $srcdir/Makefile.am >t
mv -f t $srcdir/Makefile.am
$MAKE distcheck
- $FGREP $magic1 Makefile && Exit 1 # Sanity check.
- $FGREP $magic2 Makefile && Exit 1 # Likewise.
+ $FGREP $magic1 Makefile && exit 1 # Sanity check.
+ $FGREP $magic2 Makefile && exit 1 # Likewise.
$MAKE distclean
diff --git a/t/remake9c.sh b/t/remake9c.sh
index 7ef7ca1..e640593 100755
--- a/t/remake9c.sh
+++ b/t/remake9c.sh
@@ -17,7 +17,7 @@
# Test remake rules when acinclude.m4 or its prerequisites change.
# Keep in sync with the other sister tests 'remake9*.test'.
-. ./defs || Exit 1
+. ./defs || exit 1
magic1=::MagicStringOne::
magic2=__MagicStringTwo__
@@ -85,7 +85,7 @@ for vpath in : false; do
> $srcdir/tweak-acinclude-m4
$MAKE nil
$FGREP FINGERPRINT Makefile # For debugging.
- $FGREP $magic1 Makefile && Exit 1
+ $FGREP $magic1 Makefile && exit 1
$FGREP $magic2 Makefile
test x"$(./foo.sh)" = x"$magic2"
@@ -93,8 +93,8 @@ for vpath in : false; do
echo : > $srcdir/tweak-acinclude-m4 # Make it a no-op again.
echo "AC_DEFUN([my_fingerprint], [DummyValue])" > $srcdir/acinclude.m4
$MAKE distcheck
- $FGREP $magic1 Makefile && Exit 1 # Sanity check.
- $FGREP $magic2 Makefile && Exit 1 # Likewise.
+ $FGREP $magic1 Makefile && exit 1 # Sanity check.
+ $FGREP $magic2 Makefile && exit 1 # Likewise.
$MAKE distclean
diff --git a/t/remake9d.sh b/t/remake9d.sh
index 9a4e777..5c8fb2f 100755
--- a/t/remake9d.sh
+++ b/t/remake9d.sh
@@ -17,7 +17,7 @@
# Test remake rules when aclocal.m4 or its prerequisites change.
# Keep in sync with the other sister tests 'remake9*.test'.
-. ./defs || Exit 1
+. ./defs || exit 1
magic1=::MagicStringOne::
magic2=__MagicStringTwo__
@@ -85,7 +85,7 @@ for vpath in : false; do
> $srcdir/tweak-aclocal-m4
$MAKE nil
$FGREP FINGERPRINT Makefile # For debugging.
- $FGREP $magic1 Makefile && Exit 1
+ $FGREP $magic1 Makefile && exit 1
$FGREP $magic2 Makefile
test x"$(./foo.sh)" = x"$magic2"
@@ -93,8 +93,8 @@ for vpath in : false; do
echo cat > $srcdir/tweak-aclocal-m4 # Make it a no-op again.
echo 'AC_DEFUN([my_fingerprint], [DummyValue])' >> $srcdir/aclocal.m4
$MAKE distcheck
- $FGREP $magic1 Makefile && Exit 1 # Sanity check.
- $FGREP $magic2 Makefile && Exit 1 # Likewise.
+ $FGREP $magic1 Makefile && exit 1 # Sanity check.
+ $FGREP $magic2 Makefile && exit 1 # Likewise.
$MAKE distclean
diff --git a/t/repeated-options.sh b/t/repeated-options.sh
index e48a60f..69a9cb4 100755
--- a/t/repeated-options.sh
+++ b/t/repeated-options.sh
@@ -18,12 +18,11 @@
# generate broken or incorrect makefiles.
required=bzip2
-. ./defs || Exit 1
+. ./defs || exit 1
cat >configure.ac <<END
AC_INIT([$me], [1.0])
AM_INIT_AUTOMAKE([foreign foreign dist-bzip2 no-dist-gzip dist-bzip2])
-AC_PROG_CC
AC_CONFIG_FILES([Makefile])
AC_OUTPUT
END
@@ -36,13 +35,13 @@ END
$ACLOCAL
$AUTOCONF
$AUTOMAKE --foreign --foreign -Wall 2>stderr && test ! -s stderr \
- || { cat stderr >&2; Exit 1; }
+ || { cat stderr >&2; exit 1; }
./configure
$MAKE
$MAKE distcheck
test -f $me-1.0.tar.bz2
-test ! -r $me-1.0.tar.gz
+test ! -e $me-1.0.tar.gz
:
diff --git a/t/req.sh b/t/req.sh
index b814ae7..27b0ab1 100755
--- a/t/req.sh
+++ b/t/req.sh
@@ -16,7 +16,7 @@
# Test to make sure macro used in m4 file is included.
-. ./defs || Exit 1
+. ./defs || exit 1
cat > configure.ac <<EOF
AC_INIT([$me], [1.0])
diff --git a/t/reqd.sh b/t/reqd.sh
index 1ddac46..1af4c23 100755
--- a/t/reqd.sh
+++ b/t/reqd.sh
@@ -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
cat >> configure.ac <<EOF
AC_CONFIG_FILES([one/Makefile two/Makefile])
diff --git a/t/reqd2.sh b/t/reqd2.sh
index a9442a2..5734fd1 100755
--- a/t/reqd2.sh
+++ b/t/reqd2.sh
@@ -19,7 +19,7 @@
# to fix the Makefiles.)
required='libtoolize'
-. ./defs || Exit 1
+. ./defs || exit 1
cat > configure.ac << 'END'
AC_INIT([req2], [1.0])
diff --git a/t/rulepat.sh b/t/rulepat.sh
index 5e547a5..a7cbb97 100755
--- a/t/rulepat.sh
+++ b/t/rulepat.sh
@@ -16,7 +16,7 @@
# Test to make sure RULE_PATTERN catches strange targets.
-. ./defs || Exit 1
+. ./defs || exit 1
cat > Makefile.am << 'END'
$(srcdir)/Makefile.am:
diff --git a/t/sanity.sh b/t/sanity.sh
index d4f328c..09b1272 100755
--- a/t/sanity.sh
+++ b/t/sanity.sh
@@ -16,7 +16,7 @@
# Unsafe absolute directory names should be diagnosed.
-. ./defs || Exit 1
+. ./defs || exit 1
mkdir 'unsafe$'
cd 'unsafe$'
@@ -29,14 +29,14 @@ mv ../install-sh ../missing .
$ACLOCAL
$AUTOCONF
$AUTOMAKE
-./configure 2>stderr && { cat stderr >&2; Exit 1; }
+./configure 2>stderr && { cat stderr >&2; exit 1; }
cat stderr >&2
grep 'unsafe absolute working directory' stderr
cd ..
mkdir build
cd build
-../unsafe$/configure 2>stderr && { cat stderr >&2; Exit 1; }
+../unsafe$/configure 2>stderr && { cat stderr >&2; exit 1; }
cat stderr >&2
grep 'unsafe srcdir' stderr
diff --git a/t/scripts.sh b/t/scripts.sh
index 4808358..996cc9a 100755
--- a/t/scripts.sh
+++ b/t/scripts.sh
@@ -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 > Makefile.am << 'END'
noinst_SCRIPTS = foo
diff --git a/t/seenc.sh b/t/seenc.sh
index d1bfa23..9f0ae11 100755
--- a/t/seenc.sh
+++ b/t/seenc.sh
@@ -16,7 +16,7 @@
# Test to make sure C-but-not-CC error works.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
dnl AC_PROG_CC and AC_PROG_CXX missing on purpose
diff --git a/t/self-check-cleanup.tap b/t/self-check-cleanup.tap
index d379c43..2c5a9a9 100755
--- a/t/self-check-cleanup.tap
+++ b/t/self-check-cleanup.tap
@@ -17,7 +17,7 @@
# Sanity check for the automake testsuite.
# Check creation/removal of temporary test working directory by './defs'.
-. ./defs || Exit 1
+. ./defs || exit 1
plan_ 43
@@ -80,9 +80,7 @@ chmod 500 t/dummy.dir/sub t/dummy.dir
command_ok_ "pre-cleanup can deal with low-perms testdir" \
$AM_TEST_RUNNER_SHELL -c '. ./defs' t/dummy.sh
command_ok_ "pre-cleanup removed low-perms testdir" \
- eval 'test ! -f t/dummy.dir \
- && test ! -d t/dummy.dir \
- && test ! -r t/dummy.dir'
+ test ! -e t/dummy.dir
do_clean_setup
@@ -91,7 +89,7 @@ do_clean_setup
command_ok_ "post-cleanup can deal with low-perms testdir" \
$AM_TEST_RUNNER_SHELL -c '
stderr_fileno_=2
- . ./defs || Exit 1
+ . ./defs || exit 1
set -e
mkdir dir dir/sub
cd dir
@@ -107,9 +105,7 @@ command_ok_ "post-cleanup can deal with low-perms testdir" \
:
' t/dummy.sh
command_ok_ "post-cleanup removed null-perms testdir" \
- eval 'test ! -f t/dummy.dir \
- && test ! -d t/dummy.dir \
- && test ! -r t/dummy.dir'
+ test ! -e t/dummy.dir
do_clean_setup
@@ -137,7 +133,7 @@ if test $have_symlinks = yes; then
$AM_TEST_RUNNER_SHELL -c '
ocwd=$(pwd) || exit 1
stderr_fileno_=2
- . ./defs || Exit 1
+ . ./defs || exit 1
ln -s "$ocwd/dir" "$ocwd/file" .
' t/dummy.sh
ls -l # For debugging.
@@ -166,7 +162,7 @@ for st in 1 2 3 10 77 99 126 127 130 255; do
stderr_fileno_=2
. ./defs
: > foo
- Exit $st
+ exit $st
" t/dummy.sh
command_ok_ "testdir not removed if exiting with status $st" \
test -f t/dummy.dir/foo
diff --git a/t/self-check-configure-help.sh b/t/self-check-configure-help.sh
index 23b9dc7..cbe0aa5 100755
--- a/t/self-check-configure-help.sh
+++ b/t/self-check-configure-help.sh
@@ -17,7 +17,7 @@
# Sanity check on the function used by the automake testsuite to
# analyze output of "configure --help".
-. ./defs || Exit 1
+. ./defs || exit 1
# FIXME: this test is a good candidate for a conversion to TAP.
@@ -167,11 +167,11 @@ END
compare_extracted_help ()
{
- cat > exp || Exit 99
- extract_configure_help "$1" help > got || Exit 1
+ cat > exp || exit 99
+ extract_configure_help "$1" help > got || exit 1
cat exp
cat got
- diff exp got || Exit 1
+ diff exp got || exit 1
}
compare_extracted_help --disable-libcap <<'END'
diff --git a/t/self-check-dir.tap b/t/self-check-dir.tap
index 7e09fc7..4a228d7 100755
--- a/t/self-check-dir.tap
+++ b/t/self-check-dir.tap
@@ -20,7 +20,7 @@
# and the creation of such directory if we want.
am_create_testdir=no
-. ./defs || Exit 99
+. ./defs || exit 99
plan_ 5
@@ -35,11 +35,10 @@ echo "$cwd"
do_check ()
{
- test ! -d _self.dir || rm -rf _self.dir \
- || framework_failure_ "cleaning up _self.dir"
+ rm -rf _self.dir || framework_failure_ "cleaning up _self.dir"
command_ok_ "$1 [$2]" $AM_TEST_RUNNER_SHELL -c "
$2
- . ./defs || Exit 99
+ . ./defs || exit 99
# Don't fail if 'ls -l' fails; avoids possible racy spurious failures.
pwd; ls -l || : # For debugging.
$3
@@ -48,28 +47,26 @@ do_check ()
do_check 'testdir has the expected path' \
'unset am_create_testdir' \
- 'case $(pwd) in '"$cwd"'/t/_self.dir);; *) Exit 1;; esac'
+ 'case $(pwd) in '"$cwd"'/t/_self.dir);; *) exit 1;; esac'
do_check 'fully pre-populated testdir' \
'unset am_create_testdir' \
- 'test -f install-sh || Exit 1
- test -f configure.ac || Exit 1
- case $(pwd) in '"$cwd"'/t/_self.dir) : ;; *) Exit 1;; esac'
+ 'test -f install-sh || exit 1
+ test -f configure.ac || exit 1
+ case $(pwd) in '"$cwd"'/t/_self.dir) : ;; *) exit 1;; esac'
do_check 'testdir has the expected path' \
'am_create_testdir=empty' \
- 'case $(pwd) in '"$cwd"'/t/_self.dir) : ;; *) Exit 1;; esac'
+ 'case $(pwd) in '"$cwd"'/t/_self.dir) : ;; *) exit 1;; esac'
do_check 'do not pre-populate testdir' \
'am_create_testdir=empty' \
- 'ls -a | grep -v "^\\.\\{1,2\\}$" | grep . && Exit 1; :'
+ 'ls -a | grep -v "^\\.\\{1,2\\}$" | grep . && exit 1; :'
do_check 'do not create nor chdir in testdir' \
'am_create_testdir=no' \
- 'test ! -d t/_self.dir || Exit 1
- test ! -f t/_self.dir || Exit 1
- test ! -r t/_self.dir || Exit 1
- grep "compare-autodiffs" Makefile || Exit 1
- case $(pwd) in '"$cwd"') : ;; *) Exit 1;; esac'
+ 'test ! -e t/_self.dir || exit 1
+ grep "compare-autodiffs" Makefile || exit 1
+ case $(pwd) in '"$cwd"') : ;; *) exit 1;; esac'
:
diff --git a/t/self-check-env-sanitize.tap b/t/self-check-env-sanitize.tap
index c6ac980..3e48d89 100755
--- a/t/self-check-env-sanitize.tap
+++ b/t/self-check-env-sanitize.tap
@@ -19,15 +19,14 @@
# some testsuite-influential variables are set in the environment.
am_create_testdir=no
-. ./defs || Exit 1
+. ./defs || exit 1
set -x
exec 5>&1
-plan_ 18 # Two times the number of variable names in $vars.
+plan_ 16 # Two times the number of variable names in $vars.
vars='
- me
required
am_serial_tests
am_using_tap
diff --git a/t/self-check-exit.tap b/t/self-check-exit.tap
index 0ad5651..4bc6710 100755
--- a/t/self-check-exit.tap
+++ b/t/self-check-exit.tap
@@ -20,7 +20,7 @@
# Also check that the 'errexit' shell flag is active.
am_create_testdir=no
-. ./defs || Exit 99
+. ./defs || exit 99
plan_ 34
@@ -35,15 +35,17 @@ AM_TESTS_REEXEC=no; export AM_TESTS_REEXEC
# ./defs, i.e., when 'set -e' is not active yet, for the benefit of shells
# (like Bash 2.05 and Solaris 10 /bin/ksh) that returns a non-zero status
# when unsetting an already-unset variable.
-init='stderr_fileno_=2; unset am_explicit_skips; . ./defs'
+# Add an extra newline at the end so that the aliases defined by 'defs'
+# can take effect. Yes, this is truly required.
+init="stderr_fileno_=2; unset am_explicit_skips; . ./defs${nl}"
# Required so that the code in defs doesn't go crazy trying to creating a
# temporary directory in the absolute dir of $AM_TEST_RUNNER_SHELL.
dummy_test_script=t/$me.sh
for st in 1 2 3 4 5 77 99 126 127 128 129 130 255; do
- for exit_cmd in "Exit $st" "sh -c 'exit $st'"; do
- $AM_TEST_RUNNER_SHELL -c "$init; $exit_cmd; :" "$dummy_test_script"
+ for exit_cmd in "exit $st" "sh -c 'exit $st'"; do
+ $AM_TEST_RUNNER_SHELL -c "$init $exit_cmd; :" "$dummy_test_script"
command_ok_ "$exit_cmd" test $? -eq $st
done
done
@@ -59,7 +61,7 @@ for sig in 1 2 13 15; do
# <http://lists.gnu.org/archive/html/bug-autoconf/2011-09/msg00004.html>
trap : 2
fi
- $AM_TEST_RUNNER_SHELL -c "$init; kill -$sig \$\$; :" "$dummy_test_script"
+ $AM_TEST_RUNNER_SHELL -c "$init kill -$sig \$\$; :" "$dummy_test_script"
rc=$?
if test $sig -eq 2; then
# Reset default SIGINT handler as portably as possible.
@@ -70,34 +72,19 @@ for sig in 1 2 13 15; do
done
: Non-existent program.
-# Solaris 10 /bin/sh erroneously exit with success right away when the
-# following three conditions are met at the same time:
-# 1. the 'errexit' flag is active,
-# 2. an exit trap is installed, and
-# 3. a non-existing command is issued.
-# Note that the non-existent command is issued as the last command to
-# the shell in the next line; this is deliberate.
-# FIXME: remove this workaround once we have a better configure-time
-# determination of '$AM_TEST_RUNNER_SHELL'.
-if $AM_TEST_RUNNER_SHELL -c 'set -e; trap "exit \$?" 0; non-existent-program';
then
- maybe_todo=TODO reason="known Solaris /bin/sh bug"
-else
- maybe_todo="" reason=""
-fi
-$AM_TEST_RUNNER_SHELL -c "$init; non-existent-prog; :" "$dummy_test_script"
-command_ok_ "command not found" -D "$maybe_todo" -r "$reason" \
- -- test $? -gt 0
+$AM_TEST_RUNNER_SHELL -c "$init non-existent-prog; :" "$dummy_test_script"
+command_ok_ "command not found" -- test $? -gt 0
: Non-executable command.
test -f Makefile && test ! -x Makefile || \
framowork_failure_ "no proper Makefile in the current directory"
-$AM_TEST_RUNNER_SHELL -c "$init; ./Makefile; :" "$dummy_test_script"
+$AM_TEST_RUNNER_SHELL -c "$init ./Makefile; :" "$dummy_test_script"
command_ok_ "permission denied" test $? -gt 0
: Syntax errors in the test code.
-$AM_TEST_RUNNER_SHELL -c "$init; if :; then" "$dummy_test_script"
+$AM_TEST_RUNNER_SHELL -c "$init if :; then" "$dummy_test_script"
command_ok_ "syntax error 1" test $? -gt 0
-$AM_TEST_RUNNER_SHELL -c "$init; true ( true )" "$dummy_test_script"
+$AM_TEST_RUNNER_SHELL -c "$init true ( true )" "$dummy_test_script"
command_ok_ "syntax error 2" test $? -gt 0
:
diff --git a/t/self-check-explicit-skips.sh b/t/self-check-explicit-skips.sh
index ffab44d..fa1626e 100755
--- a/t/self-check-explicit-skips.sh
+++ b/t/self-check-explicit-skips.sh
@@ -19,7 +19,7 @@
# an early exit due to some command exiting unexpectedly with status 77.
am_create_testdir=no
-. ./defs || Exit 1
+. ./defs || exit 1
set +e
@@ -30,26 +30,29 @@ AM_TESTS_REEXEC=no; export AM_TESTS_REEXEC
# testsuite shell to ensure it supports "VAR=val shell_func" correctly.
run_dummy_test ()
{
- env $2 $AM_TEST_RUNNER_SHELL -c "am_create_testdir=no; . ./defs; $1" \
- dummy.sh
+ env $2 $AM_TEST_RUNNER_SHELL -c "
+ am_create_testdir=no
+ . ./defs
+ $1
+ " dummy.sh
}
run_dummy_test '(exit 77); exit 77'
-test $? -eq 77 || Exit 1
+test $? -eq 77 || exit 1
run_dummy_test 'sh -c "exit 77"' am_explicit_skips=no
-test $? -eq 77 || Exit 1
+test $? -eq 77 || exit 1
-run_dummy_test '(exit 77); exit 77' am_explicit_skips=yes
-test $? -eq 78 || Exit 1
+run_dummy_test '(exit 77); exit 77' am_explicit_skips=yes
+test $? -eq 78 || exit 1
run_dummy_test 'sh -c "exit 77"' am_explicit_skips=y
-test $? -eq 78 || Exit 1
+test $? -eq 78 || exit 1
-run_dummy_test 'Exit 77' am_explicit_skips=yes
-test $? -eq 77 || Exit 1
+run_dummy_test 'exit 77' am_explicit_skips=yes
+test $? -eq 77 || exit 1
run_dummy_test 'skip_ "foo"' am_explicit_skips=y
-test $? -eq 77 || Exit 1
+test $? -eq 77 || exit 1
:
diff --git a/t/self-check-is-blocked-signal.tap
b/t/self-check-is-blocked-signal.tap
index 5c0dded..9077ca8 100755
--- a/t/self-check-is-blocked-signal.tap
+++ b/t/self-check-is-blocked-signal.tap
@@ -18,7 +18,7 @@
# shell function.
am_create_testdir=no
-. ./defs || Exit 99
+. ./defs || exit 99
plan_ 2
diff --git a/t/self-check-is_newest.tap b/t/self-check-is_newest.tap
index 842c411..a5f84b3 100755
--- a/t/self-check-is_newest.tap
+++ b/t/self-check-is_newest.tap
@@ -16,7 +16,7 @@
# Sanity check for the automake testsuite: the 'is_newest' subroutine.
-. ./defs || Exit 1
+. ./defs || exit 1
plan_ 21
diff --git a/t/self-check-me.tap b/t/self-check-me.tap
index 0ac8e20..717fe2e 100755
--- a/t/self-check-me.tap
+++ b/t/self-check-me.tap
@@ -15,13 +15,12 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Sanity check for the automake testsuite.
-# Make sure that $me gets automatically defined by './defs', and that it
-# can be overridden by the test script.
+# Make sure that $me gets automatically defined by './defs'.
am_create_testdir=no
-. ./defs || Exit 1
+. ./defs || exit 1
-plan_ 14
+plan_ 12
AM_TESTS_REEXEC=no; export AM_TESTS_REEXEC
@@ -46,28 +45,16 @@ done
do_check foo.bar 'foo\.bar'
do_check abc. 'abc\.'
-# If we override $me, ./defs should not modify it.
+# A definition of $me in the environment should be ignored.
-s=$($AM_TEST_RUNNER_SHELL -c 'me=foo.sh && . ./defs && echo me=$me' bad.sh)
+s=$(me=bad $AM_TEST_RUNNER_SHELL -c '. ./defs && echo me=$me' foo.sh)
command_ok_ "override of \$me before ./defs causes no error" \
test $? -eq 0
r='ok'
-printf '%s\n' "$s" | grep '^me=foo\.sh$' || r='not ok'
-printf '%s\n' "$s" | grep 'me=bad' && r='not ok'
-result_ "$r" "override of \$me before ./defs is honored"
-unset r
-
-# Overriding $me after sourcing ./defs-static should work.
-s=$($AM_TEST_RUNNER_SHELL -c '. ./defs-static && me=zardoz &&
- . ./defs && echo me=$me' bad.sh)
-command_ok_ "override of \$me after ./defs-static causes no error" \
- test $? -eq 0
-
-r='ok'
-printf '%s\n' "$s" | grep '^me=zardoz$' || r='not ok'
-printf '%s\n' "$s" | grep 'me=bad' && r='not ok'
-result_ "$r" "override of \$me after ./defs-static is honored"
+printf '%s\n' "$s" | grep '^me=foo$' || r='not ok'
+printf '%s\n' "$s" | grep 'me=bad' && r='not ok'
+result_ "$r" "\$me from the environment is ignored"
unset r
:
diff --git a/t/self-check-reexec.tap b/t/self-check-reexec.tap
index 3feeb62..f46797f 100755
--- a/t/self-check-reexec.tap
+++ b/t/self-check-reexec.tap
@@ -19,7 +19,7 @@
# configure-time $AM_TEST_RUNNER_SHELL.
am_create_testdir=empty
-. ./defs || Exit 1
+. ./defs || exit 1
plan_ 32
diff --git a/t/self-check-report.sh b/t/self-check-report.sh
index e5998b5..11211ec 100755
--- a/t/self-check-report.sh
+++ b/t/self-check-report.sh
@@ -21,34 +21,34 @@
unset stderr_fileno_ || :
am_create_testdir=empty
-. ./defs || Exit 1
+. ./defs || exit 1
set +e
exec 5>&1
-(warn_ foobar) 2>&1 1>&5 | grep '^foobar$' || Exit 1
-(fail_ foo); test $? -eq 1 || Exit 1
-(fail_ foo) 2>&1 1>&5 | grep "^$me: failed test: foo" || Exit 1
-(skip_ foo); test $? -eq 77 || Exit 1
-(skip_ foo) 2>&1 1>&5 | grep "^$me: skipped test: foo" || Exit 1
-(fatal_ foo); test $? -eq 99 || Exit 1
-(fatal_ foo) 2>&1 1>&5 | grep "^$me: hard error: foo" || Exit 1
-(framework_failure_ foo); test $? -eq 99 || Exit 1
+(warn_ foobar) 2>&1 1>&5 | grep '^foobar$' || exit 1
+(fail_ foo); test $? -eq 1 || exit 1
+(fail_ foo) 2>&1 1>&5 | grep "^$me: failed test: foo" || exit 1
+(skip_ foo); test $? -eq 77 || exit 1
+(skip_ foo) 2>&1 1>&5 | grep "^$me: skipped test: foo" || exit 1
+(fatal_ foo); test $? -eq 99 || exit 1
+(fatal_ foo) 2>&1 1>&5 | grep "^$me: hard error: foo" || exit 1
+(framework_failure_ foo); test $? -eq 99 || exit 1
(framework_failure_ foo) 2>&1 1>&5 \
- | grep "^$me: set-up failure: foo" || Exit 1
+ | grep "^$me: set-up failure: foo" || exit 1
stderr_fileno_=6
-(warn_ foobar) 6>&1 1>&5 | grep '^foobar$' || Exit 1
-(fail_ foo); test $? -eq 1 || Exit 1
-(fail_ foo) 6>&1 1>&5 | grep "^$me: failed test: foo" || Exit 1
-(skip_ foo); test $? -eq 77 || Exit 1
-(skip_ foo) 6>&1 1>&5 | grep "^$me: skipped test: foo" || Exit 1
-(fatal_ foo); test $? -eq 99 || Exit 1
-(fatal_ foo) 6>&1 1>&5 | grep "^$me: hard error: foo" || Exit 1
-(framework_failure_ foo); test $? -eq 99 || Exit 1
+(warn_ foobar) 6>&1 1>&5 | grep '^foobar$' || exit 1
+(fail_ foo); test $? -eq 1 || exit 1
+(fail_ foo) 6>&1 1>&5 | grep "^$me: failed test: foo" || exit 1
+(skip_ foo); test $? -eq 77 || exit 1
+(skip_ foo) 6>&1 1>&5 | grep "^$me: skipped test: foo" || exit 1
+(fatal_ foo); test $? -eq 99 || exit 1
+(fatal_ foo) 6>&1 1>&5 | grep "^$me: hard error: foo" || exit 1
+(framework_failure_ foo); test $? -eq 99 || exit 1
(framework_failure_ foo) 6>&1 1>&5 \
- | grep "^$me: set-up failure: foo" || Exit 1
+ | grep "^$me: set-up failure: foo" || exit 1
:
diff --git a/t/self-check-seq.tap b/t/self-check-seq.tap
index 8162a4e..ead4eed 100755
--- a/t/self-check-seq.tap
+++ b/t/self-check-seq.tap
@@ -17,7 +17,7 @@
# Sanity check for the automake testsuite.
# Check the 'seq_' subroutine.
-. ./defs || Exit 1
+. ./defs || exit 1
plan_ 14
diff --git a/t/self-check-unindent.tap b/t/self-check-unindent.tap
index 3591656..2bd3bc2 100755
--- a/t/self-check-unindent.tap
+++ b/t/self-check-unindent.tap
@@ -17,7 +17,7 @@
# Sanity check for the automake testsuite.
# Check the 'unindent' subroutine.
-. ./defs || Exit 1
+. ./defs || exit 1
plan_ 22
diff --git a/t/serial-tests.sh b/t/serial-tests.sh
index 809c519..5e008ff 100755
--- a/t/serial-tests.sh
+++ b/t/serial-tests.sh
@@ -17,12 +17,12 @@
# Option 'serial-tests'.
am_create_testdir=empty
-. ./defs || Exit 1
+. ./defs || exit 1
hasnt_parallel_tests ()
{
- $EGREP -i 'test_suite_log|test_(logs|bases)|\.log.*:' $1 && Exit 1
- grep 'recheck.*:' $1 && Exit 1
+ $EGREP -i 'test_suite_log|test_(logs|bases)|\.log.*:' $1 && exit 1
+ grep 'recheck.*:' $1 && exit 1
grep '^check-TESTS: \$(am__cooked_tests)$' $1
}
@@ -62,7 +62,7 @@ $ACLOCAL
$AUTOMAKE
grep TEST Makefile.in # For debugging.
hasnt_parallel_tests Makefile.in
-test ! -r test-driver
+test ! -e test-driver
cd ..
cd two
@@ -74,7 +74,7 @@ has_parallel_tests aMakefile.in
hasnt_parallel_tests bMakefile.in
mv aMakefile.in aMakefile.sav
mv bMakefile.in bMakefile.sav
-test ! -r test-driver
+test ! -e test-driver
test -f config/test-driver
$AUTOMAKE
diff aMakefile.sav aMakefile.in
diff --git a/t/silent-configsite.sh b/t/silent-configsite.sh
index a31fb2a..02b608a 100755
--- a/t/silent-configsite.sh
+++ b/t/silent-configsite.sh
@@ -18,7 +18,7 @@
# from config.site, and that this default can be overridden from
# either the ./configure or make command line.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac <<'EOF'
# This line will be edited later to force silent-rules default.
diff --git a/t/silent-lex.sh b/t/silent-lex.sh
index a663961..5b98a1b 100755
--- a/t/silent-lex.sh
+++ b/t/silent-lex.sh
@@ -17,7 +17,7 @@
# Check silent-rules mode for Lex.
required='cc lex'
-. ./defs || Exit 1
+. ./defs || exit 1
cat >>configure.ac <<'EOF'
AM_PROG_CC_C_O
@@ -53,15 +53,15 @@ $AUTOMAKE --add-missing
$AUTOCONF
# Ensure per-target rules are used, to ensure their coverage below.
-$FGREP 'foo2-foo.c' Makefile.in || Exit 99
+$FGREP 'foo2-foo.c' Makefile.in || exit 99
./configure --enable-silent-rules
-$MAKE >stdout || { cat stdout; Exit 1; }
+$MAKE >stdout || { cat stdout; exit 1; }
cat stdout
-$EGREP ' (-c|-o)' stdout && Exit 1
-$EGREP '(mv|ylwrap) ' stdout && Exit 1
+$EGREP ' (-c|-o)' stdout && exit 1
+$EGREP '(mv|ylwrap) ' stdout && exit 1
grep 'LEX .*foo\.' stdout
grep ' CC .*foo\.' stdout
@@ -73,11 +73,11 @@ grep 'CCLD .*foo2' stdout
# different set of rules.
$MAKE clean
-$MAKE >stdout || { cat stdout; Exit 1; }
+$MAKE >stdout || { cat stdout; exit 1; }
cat stdout
-$EGREP ' (-c|-o)' stdout && Exit 1
-$EGREP '(mv|ylwrap) ' stdout && Exit 1
+$EGREP ' (-c|-o)' stdout && exit 1
+$EGREP '(mv|ylwrap) ' stdout && exit 1
# Don't look for LEX, as probably lex hasn't been re-run.
grep ' CC .*foo\.' stdout
@@ -88,27 +88,27 @@ grep 'CCLD .*foo2' stdout
$MAKE clean
rm -f *foo.c
-$MAKE V=1 >stdout || { cat stdout; Exit 1; }
+$MAKE V=1 >stdout || { cat stdout; exit 1; }
cat stdout
grep ' -c ' stdout
grep ' -o ' stdout
grep 'ylwrap ' stdout
-$EGREP '(LEX|CC|CCLD) ' stdout && Exit 1
+$EGREP '(LEX|CC|CCLD) ' stdout && exit 1
# Cleaning and then rebuilding with the same V flag (and without
# removing the generated sources in between) shouldn't trigger a
# different set of rules.
$MAKE clean
-$MAKE V=1 >stdout || { cat stdout; Exit 1; }
+$MAKE V=1 >stdout || { cat stdout; exit 1; }
cat stdout
# Don't look for ylwrap, as probably lex hasn't been re-run.
grep ' -c ' stdout
grep ' -o ' stdout
-$EGREP '(LEX|CC|CCLD) ' stdout && Exit 1
+$EGREP '(LEX|CC|CCLD) ' stdout && exit 1
:
diff --git a/t/silent-many-gcc.sh b/t/silent-many-gcc.sh
index 1560bc2..a369487 100755
--- a/t/silent-many-gcc.sh
+++ b/t/silent-many-gcc.sh
@@ -22,7 +22,7 @@
# 'silent-many-generic.test', which should work with generic compilers.
required='gcc g++ gfortran lex yacc'
-. ./defs || Exit 1
+. ./defs || exit 1
# Avoids too much code duplication.
do_and_check_silent_build ()
@@ -32,15 +32,15 @@ do_and_check_silent_build ()
*) rebuild=false;;
esac
- $MAKE >stdout || { cat stdout; Exit 1; }
+ $MAKE >stdout || { cat stdout; exit 1; }
cat stdout
# Avoid spurious failures with SunStudio Fortran compilers.
sed '/^NOTICE:/d' stdout > t
mv -f t stdout
cat stdout
- $EGREP ' (-c|-o)' stdout && Exit 1
- $EGREP '(mv|ylwrap) ' stdout && Exit 1
+ $EGREP ' (-c|-o)' stdout && exit 1
+ $EGREP '(mv|ylwrap) ' stdout && exit 1
grep ' CC .*bar\.' stdout
grep 'CXX .*foo1\.' stdout
@@ -69,17 +69,17 @@ do_and_check_verbose_build ()
*) rebuild=false;;
esac
- $MAKE V=1 >stdout || { cat stdout; Exit 1; }
+ $MAKE V=1 >stdout || { cat stdout; exit 1; }
cat stdout
grep ' -c ' stdout
grep ' -o ' stdout
- $EGREP '(CC|CXX|FC|F77|LD) ' stdout && Exit 1
+ $EGREP '(CC|CXX|FC|F77|LD) ' stdout && exit 1
if ! $rebuild; then
grep 'ylwrap ' stdout
- $EGREP '(LEX|YACC) ' stdout && Exit 1
+ $EGREP '(LEX|YACC) ' stdout && exit 1
fi
unset rebuild
@@ -170,9 +170,9 @@ $FGREP am_cv_CC_dependencies_compiler_type configure
$FGREP am_cv_CXX_dependencies_compiler_type configure
# Ensure per-target rules are used, to ensure their coverage below.
# (We do not do an exhaustive check, that wouldn't be practical).
-$FGREP 'bar-bar.$(OBJEXT)' Makefile.in || Exit 99
-$FGREP 'baz-foo5.c' Makefile.in || Exit 99
-$FGREP 'baz-foo6.c' Makefile.in || Exit 99
+$FGREP 'bar-bar.$(OBJEXT)' Makefile.in || exit 99
+$FGREP 'baz-foo5.c' Makefile.in || exit 99
+$FGREP 'baz-foo6.c' Makefile.in || exit 99
# Force gcc ("fast") depmode.
depmodes="am_cv_CC_dependencies_compiler_type=gcc \
diff --git a/t/silent-many-generic.sh b/t/silent-many-generic.sh
index 05fd611..eb1010c 100755
--- a/t/silent-many-generic.sh
+++ b/t/silent-many-generic.sh
@@ -23,7 +23,7 @@
# and forces the use of gcc depmode.
required='cc c++ fortran fortran77 lex yacc'
-. ./defs || Exit 1
+. ./defs || exit 1
# Avoids too much code duplication.
do_and_check_silent_build ()
@@ -33,15 +33,15 @@ do_and_check_silent_build ()
*) rebuild=false;;
esac
- $MAKE >stdout || { cat stdout; Exit 1; }
+ $MAKE >stdout || { cat stdout; exit 1; }
cat stdout
# Avoid spurious failures with SunStudio Fortran compilers.
sed '/^NOTICE:/d' stdout > t
mv -f t stdout
cat stdout
- $EGREP ' (-c|-o)' stdout && Exit 1
- $EGREP '(mv|ylwrap) ' stdout && Exit 1
+ $EGREP ' (-c|-o)' stdout && exit 1
+ $EGREP '(mv|ylwrap) ' stdout && exit 1
grep ' CC .*bar\.' stdout
grep 'CXX .*foo1\.' stdout
@@ -70,17 +70,17 @@ do_and_check_verbose_build ()
*) rebuild=false;;
esac
- $MAKE V=1 >stdout || { cat stdout; Exit 1; }
+ $MAKE V=1 >stdout || { cat stdout; exit 1; }
cat stdout
grep ' -c ' stdout
grep ' -o ' stdout
- $EGREP '(CC|CXX|FC|F77|LD) ' stdout && Exit 1
+ $EGREP '(CC|CXX|FC|F77|LD) ' stdout && exit 1
if ! $rebuild; then
grep 'ylwrap ' stdout
- $EGREP '(LEX|YACC) ' stdout && Exit 1
+ $EGREP '(LEX|YACC) ' stdout && exit 1
fi
unset rebuild
@@ -197,9 +197,9 @@ $AUTOCONF
# Ensure per-target rules are used, to ensure their coverage below.
# (We do not do an exhaustive check, that wouldn't be practical).
-$FGREP 'bar-bar.$(OBJEXT)' Makefile.in || Exit 99
-$FGREP 'baz-foo5.c' Makefile.in || Exit 99
-$FGREP 'baz-foo6.c' Makefile.in || Exit 99
+$FGREP 'bar-bar.$(OBJEXT)' Makefile.in || exit 99
+$FGREP 'baz-foo5.c' Makefile.in || exit 99
+$FGREP 'baz-foo6.c' Makefile.in || exit 99
# Force dependency tracking explicitly, so that slow dependency
# extractors are not rejected. Try also with dependency tracking
diff --git a/t/silent-texi.sh b/t/silent-texi.sh
index 0a6bb48..1640e0e 100755
--- a/t/silent-texi.sh
+++ b/t/silent-texi.sh
@@ -17,7 +17,7 @@
# Check texinfo rules in silent-rules mode.
required='makeinfo tex texi2dvi dvips'
-. ./defs || Exit 1
+. ./defs || exit 1
echo AC_OUTPUT >> configure.ac
@@ -64,16 +64,16 @@ grep '^ TEXI2DVI sub/zardoz.dvi$' stdout
grep '^ TEXI2PDF sub/zardoz.pdf$' stdout
# No make recipe is displayed before being executed.
$EGREP 'texi2(dvi|pdf)|dvips|makeinfo|(rm|mv) ' \
- stdout stderr && Exit 1
+ stdout stderr && exit 1
# No verbose output from TeX nor dvips.
$EGREP '(zardoz|foo)\.log|3\.14|Copyright|This is|[Oo]utput ' \
- stdout stderr && Exit 1
+ stdout stderr && exit 1
# Verbose mode output.
-$MAKE clean || Exit 1
-$MAKE V=1 dvi html info ps pdf >output 2>&1 || { cat output; Exit 1; }
+$MAKE clean || exit 1
+$MAKE V=1 dvi html info ps pdf >output 2>&1 || { cat output; exit 1; }
cat output
-$EGREP '(DVIPS|MAKEINFO|TEXI2(PDF|DVI)) ' output && Exit 1
+$EGREP '(DVIPS|MAKEINFO|TEXI2(PDF|DVI)) ' output && exit 1
# Verbose output from TeX.
grep '[Oo]utput .*foo\.pdf' output
grep '[Oo]utput .*zardoz\.pdf' output
diff --git a/t/silent-yacc-headers.sh b/t/silent-yacc-headers.sh
index f272270..6324047 100755
--- a/t/silent-yacc-headers.sh
+++ b/t/silent-yacc-headers.sh
@@ -18,7 +18,7 @@
# involved (i.e., the '-d' option is in *YFLAGS).
required='cc yacc'
-. ./defs || Exit 1
+. ./defs || exit 1
mkdir sub
@@ -60,11 +60,11 @@ $FGREP '$(bar_YFLAGS)' Makefile.in
./configure --enable-silent-rules
-$MAKE >stdout || { cat stdout; Exit 1; }
+$MAKE >stdout || { cat stdout; exit 1; }
cat stdout
-$EGREP ' (-c|-d|-o)' stdout && Exit 1
-$EGREP '(mv|ylwrap) ' stdout && Exit 1
+$EGREP ' (-c|-d|-o)' stdout && exit 1
+$EGREP '(mv|ylwrap) ' stdout && exit 1
grep 'YACC *parse\.c' stdout
grep 'updating *parse\.h' stdout
@@ -78,11 +78,11 @@ grep 'CCLD *bar' stdout
# Check recovering from header removal.
rm -f parse.h bar-parse.h
-$MAKE parse.h bar-parse.h >stdout || { cat stdout; Exit 1; }
+$MAKE parse.h bar-parse.h >stdout || { cat stdout; exit 1; }
cat stdout
-$EGREP ' (-c|-d|-o)' stdout && Exit 1
-$EGREP '(mv|ylwrap) ' stdout && Exit 1
+$EGREP ' (-c|-d|-o)' stdout && exit 1
+$EGREP '(mv|ylwrap) ' stdout && exit 1
grep 'YACC *parse\.c' stdout
grep 'updating *parse\.h' stdout
@@ -94,11 +94,11 @@ grep 'updating *bar-parse\.h' stdout
# different set of rules.
$MAKE clean
-$MAKE >stdout || { cat stdout; Exit 1; }
+$MAKE >stdout || { cat stdout; exit 1; }
cat stdout
-$EGREP ' (-c|-d|-o)' stdout && Exit 1
-$EGREP '(mv|ylwrap) ' stdout && Exit 1
+$EGREP ' (-c|-d|-o)' stdout && exit 1
+$EGREP '(mv|ylwrap) ' stdout && exit 1
# Don't look for "YACC *.c" and "updating *.h", as yacc shouldn't
# have been re-run.
@@ -109,11 +109,11 @@ grep 'CCLD *bar' stdout
# Check recovering from header removal.
rm -f parse.h bar-parse.h
-$MAKE parse.h bar-parse.h >stdout || { cat stdout; Exit 1; }
+$MAKE parse.h bar-parse.h >stdout || { cat stdout; exit 1; }
cat stdout
-$EGREP ' (-c|-d|-o)' stdout && Exit 1
-$EGREP '(mv|ylwrap) ' stdout && Exit 1
+$EGREP ' (-c|-d|-o)' stdout && exit 1
+$EGREP '(mv|ylwrap) ' stdout && exit 1
grep 'YACC *parse\.c' stdout
grep 'updating *parse\.h' stdout
@@ -125,7 +125,7 @@ $MAKE maintainer-clean
./configure --enable-silent-rules
-$MAKE V=1 >stdout || { cat stdout; Exit 1; }
+$MAKE V=1 >stdout || { cat stdout; exit 1; }
cat stdout
grep ' -c ' stdout
@@ -133,40 +133,40 @@ grep ' -o ' stdout
grep ' -d ' stdout
grep 'ylwrap ' stdout
-$EGREP '(YACC|CC|CCLD) ' stdout && Exit 1
+$EGREP '(YACC|CC|CCLD) ' stdout && exit 1
# Check recovering from header removal.
rm -f parse.h bar-parse.h
-$MAKE V=1 parse.h bar-parse.h >stdout || { cat stdout; Exit 1; }
+$MAKE V=1 parse.h bar-parse.h >stdout || { cat stdout; exit 1; }
cat stdout
grep ' -d ' stdout
grep 'ylwrap ' stdout
-grep 'YACC' stdout && Exit 1
+grep 'YACC' stdout && exit 1
# Cleaning and then rebuilding with the same V flag (and without
# removing the generated sources in between) shouldn't trigger a
# different set of rules.
$MAKE clean
-$MAKE V=1 >stdout || { cat stdout; Exit 1; }
+$MAKE V=1 >stdout || { cat stdout; exit 1; }
cat stdout
# Don't look for ylwrap, as probably lex hasn't been re-run.
grep ' -c ' stdout
grep ' -o ' stdout
-$EGREP '(YACC|CC|CCLD) ' stdout && Exit 1
+$EGREP '(YACC|CC|CCLD) ' stdout && exit 1
# Check recovering from header removal.
rm -f parse.h bar-parse.h
-$MAKE V=1 parse.h bar-parse.h >stdout || { cat stdout; Exit 1; }
+$MAKE V=1 parse.h bar-parse.h >stdout || { cat stdout; exit 1; }
cat stdout
grep ' -d ' stdout
grep 'ylwrap ' stdout
-grep 'YACC' stdout && Exit 1
+grep 'YACC' stdout && exit 1
:
diff --git a/t/silent-yacc.sh b/t/silent-yacc.sh
index 9a075fc..e68d38e 100755
--- a/t/silent-yacc.sh
+++ b/t/silent-yacc.sh
@@ -18,7 +18,7 @@
# Keep this in sync with sister test 'silent-yacc-gcc.test'.
required='cc yacc'
-. ./defs || Exit 1
+. ./defs || exit 1
cat >>configure.ac <<'EOF'
AM_PROG_CC_C_O
@@ -51,15 +51,15 @@ $AUTOMAKE --add-missing
$AUTOCONF
# Ensure per-target rules are used, to ensure their coverage below.
-$FGREP 'foo2-foo.c' Makefile.in || Exit 99
+$FGREP 'foo2-foo.c' Makefile.in || exit 99
./configure --enable-silent-rules
-$MAKE >stdout || { cat stdout; Exit 1; }
+$MAKE >stdout || { cat stdout; exit 1; }
cat stdout
-$EGREP ' (-c|-o)' stdout && Exit 1
-$EGREP '(mv|ylwrap) ' stdout && Exit 1
+$EGREP ' (-c|-o)' stdout && exit 1
+$EGREP '(mv|ylwrap) ' stdout && exit 1
grep 'YACC .*foo\.' stdout
grep ' CC .*foo\.' stdout
@@ -71,11 +71,11 @@ grep 'CCLD .*foo2' stdout
# different set of rules.
$MAKE clean
-$MAKE >stdout || { cat stdout; Exit 1; }
+$MAKE >stdout || { cat stdout; exit 1; }
cat stdout
-$EGREP ' (-c|-o)' stdout && Exit 1
-$EGREP '(mv|ylwrap) ' stdout && Exit 1
+$EGREP ' (-c|-o)' stdout && exit 1
+$EGREP '(mv|ylwrap) ' stdout && exit 1
# Don't look for YACC, as probably yacc hasn't been re-run.
grep ' CC .*foo\.' stdout
@@ -86,27 +86,27 @@ grep 'CCLD .*foo2' stdout
$MAKE clean
rm -f *foo.[ch]
-$MAKE V=1 >stdout || { cat stdout; Exit 1; }
+$MAKE V=1 >stdout || { cat stdout; exit 1; }
cat stdout
grep ' -c ' stdout
grep ' -o ' stdout
grep 'ylwrap ' stdout
-$EGREP '(YACC|CC|CCLD) ' stdout && Exit 1
+$EGREP '(YACC|CC|CCLD) ' stdout && exit 1
# Cleaning and then rebuilding with the same V flag (and without
# removing the generated sources in between) shouldn't trigger a
# different set of rules.
$MAKE clean
-$MAKE V=1 >stdout || { cat stdout; Exit 1; }
+$MAKE V=1 >stdout || { cat stdout; exit 1; }
cat stdout
# Don't look for ylwrap, as probably lex hasn't been re-run.
grep ' -c ' stdout
grep ' -o ' stdout
-$EGREP '(YACC|CC|CCLD) ' stdout && Exit 1
+$EGREP '(YACC|CC|CCLD) ' stdout && exit 1
:
diff --git a/t/silent.sh b/t/silent.sh
index f736c3b..59e09d3 100755
--- a/t/silent.sh
+++ b/t/silent.sh
@@ -19,7 +19,7 @@
# Please keep this file in sync with silent2.test.
required=cc
-. ./defs || Exit 1
+. ./defs || exit 1
mkdir sub
@@ -46,9 +46,9 @@ $AUTOMAKE --add-missing
$AUTOCONF
./configure --enable-silent-rules
-$MAKE >stdout || { cat stdout; Exit 1; }
+$MAKE >stdout || { cat stdout; exit 1; }
cat stdout
-$EGREP ' (-c|-o)|(mv|mkdir) ' stdout && Exit 1
+$EGREP ' (-c|-o)|(mv|mkdir) ' stdout && exit 1
grep ' CC *foo\.o' stdout
grep ' CC *bar-bar\.o' stdout
grep ' CC *sub/baz\.o' stdout
@@ -59,11 +59,11 @@ grep ' CCLD *sub/baz' stdout
grep ' CCLD *sub/bla' stdout
$MAKE clean
-$MAKE V=1 >stdout || { cat stdout; Exit 1; }
+$MAKE V=1 >stdout || { cat stdout; exit 1; }
cat stdout
grep ' -c' stdout
grep ' -o foo' stdout
grep ' -o sub/baz' stdout
-$EGREP '(CC|LD) ' stdout && Exit 1
+$EGREP '(CC|LD) ' stdout && exit 1
:
diff --git a/t/silent2.sh b/t/silent2.sh
index a7f0207..11e8349 100755
--- a/t/silent2.sh
+++ b/t/silent2.sh
@@ -20,7 +20,7 @@
# Please keep this file in sync with silent.test.
required=gcc
-. ./defs || Exit 1
+. ./defs || exit 1
mkdir sub
@@ -47,9 +47,9 @@ $AUTOMAKE --add-missing
$AUTOCONF
./configure am_cv_CC_dependencies_compiler_type=gcc --enable-silent-rules
-$MAKE >stdout || { cat stdout; Exit 1; }
+$MAKE >stdout || { cat stdout; exit 1; }
cat stdout
-$EGREP ' (-c|-o)|(mv|mkdir) ' stdout && Exit 1
+$EGREP ' (-c|-o)|(mv|mkdir) ' stdout && exit 1
grep ' CC *foo\.o' stdout
grep ' CC *bar-bar\.o' stdout
grep ' CC *sub/baz\.o' stdout
@@ -60,11 +60,11 @@ grep ' CCLD *sub/baz' stdout
grep ' CCLD *sub/bla' stdout
$MAKE clean
-$MAKE V=1 >stdout || { cat stdout; Exit 1; }
+$MAKE V=1 >stdout || { cat stdout; exit 1; }
cat stdout
grep ' -c' stdout
grep ' -o foo' stdout
grep ' -o sub/baz' stdout
-$EGREP '(CC|LD) ' stdout && Exit 1
+$EGREP '(CC|LD) ' stdout && exit 1
:
diff --git a/t/silent3.sh b/t/silent3.sh
index 325c7e7..dd9cc8d 100755
--- a/t/silent3.sh
+++ b/t/silent3.sh
@@ -19,7 +19,7 @@
# Please keep this file in sync with silent4.test and silent9.test.
required='cc libtoolize'
-. ./defs || Exit 1
+. ./defs || exit 1
mkdir sub
@@ -50,9 +50,9 @@ $AUTOMAKE --add-missing
$AUTOCONF
./configure --enable-silent-rules
-$MAKE >stdout || { cat stdout; Exit 1; }
+$MAKE >stdout || { cat stdout; exit 1; }
cat stdout
-$EGREP ' (-c|-o)|(mv|mkdir) ' stdout && Exit 1
+$EGREP ' (-c|-o)|(mv|mkdir) ' stdout && exit 1
grep ' CC *libfoo\.lo' stdout
grep ' CC *libbar_la-libbar\.lo' stdout
grep ' CC *sub/libbaz\.lo' stdout
@@ -63,12 +63,12 @@ grep ' CCLD *sub/libbaz\.la' stdout
grep ' CCLD *sub/libbla\.la' stdout
$MAKE clean
-$MAKE V=1 >stdout || { cat stdout; Exit 1; }
+$MAKE V=1 >stdout || { cat stdout; exit 1; }
cat stdout
grep ' -c' stdout
grep ' -o libfoo' stdout
grep ' -o sub/libbaz' stdout
# The libtool command line can contain e.g. a '--tag=CC' option.
-sed 's/--tag=[^ ]*/--tag=x/g' stdout | $EGREP '(CC|LD) ' && Exit 1
+sed 's/--tag=[^ ]*/--tag=x/g' stdout | $EGREP '(CC|LD) ' && exit 1
:
diff --git a/t/silent4.sh b/t/silent4.sh
index eccb341..562d0c8 100755
--- a/t/silent4.sh
+++ b/t/silent4.sh
@@ -20,7 +20,7 @@
# Please keep this file in sync with silent3.test and silent9.test.
required="libtoolize gcc"
-. ./defs || Exit 1
+. ./defs || exit 1
mkdir sub
@@ -51,9 +51,9 @@ $AUTOMAKE --add-missing
$AUTOCONF
./configure am_cv_CC_dependencies_compiler_type=gcc --enable-silent-rules
-$MAKE >stdout || { cat stdout; Exit 1; }
+$MAKE >stdout || { cat stdout; exit 1; }
cat stdout
-$EGREP ' (-c|-o)|(mv|mkdir) ' stdout && Exit 1
+$EGREP ' (-c|-o)|(mv|mkdir) ' stdout && exit 1
grep ' CC *libfoo\.lo' stdout
grep ' CC *libbar_la-libbar\.lo' stdout
grep ' CC *sub/libbaz\.lo' stdout
@@ -64,12 +64,12 @@ grep ' CCLD *sub/libbaz\.la' stdout
grep ' CCLD *sub/libbla\.la' stdout
$MAKE clean
-$MAKE V=1 >stdout || { cat stdout; Exit 1; }
+$MAKE V=1 >stdout || { cat stdout; exit 1; }
cat stdout
grep ' -c' stdout
grep ' -o libfoo' stdout
grep ' -o sub/libbaz' stdout
# The libtool command line can contain e.g. a '--tag=CC' option.
-sed 's/--tag=[^ ]*/--tag=x/g' stdout | $EGREP '(CC|LD) ' && Exit 1
+sed 's/--tag=[^ ]*/--tag=x/g' stdout | $EGREP '(CC|LD) ' && exit 1
:
diff --git a/t/silent6.sh b/t/silent6.sh
index 8d3a326..a531db9 100755
--- a/t/silent6.sh
+++ b/t/silent6.sh
@@ -16,7 +16,7 @@
# Check user extensibility of silent-rules mode.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >>configure.ac <<'EOF'
AC_CONFIG_FILES([sub/Makefile])
@@ -68,17 +68,17 @@ do_check ()
esac
shift
$MAKE clean
- $MAKE ${1+"$@"} >output 2>&1 || { cat output; Exit 1; }
+ $MAKE ${1+"$@"} >output 2>&1 || { cat output; exit 1; }
sed 's/^/ /' output
if $silent; then
- $FGREP 'cp ' output && Exit 1
- $FGREP 'generate-header' output && Exit 1
- $FGREP 'rm -f' output && Exit 1
- grep '[012]\.h' output && Exit 1
+ $FGREP 'cp ' output && exit 1
+ $FGREP 'generate-header' output && exit 1
+ $FGREP 'rm -f' output && exit 1
+ grep '[012]\.h' output && exit 1
grep '^ XGEN foo$' output
grep '^ GEN \[headers\]$' output
else
- $FGREP 'GEN ' output && Exit 1
+ $FGREP 'GEN ' output && exit 1
$FGREP 'cp ./foo.in foo' output
$FGREP "rm -f sub/0.h sub/1.h sub/2.h" output
$FGREP "generate-header --flags sub/0.h sub/1.h sub/2.h" output
diff --git a/t/silent7.sh b/t/silent7.sh
index 716eada..5e5472e 100755
--- a/t/silent7.sh
+++ b/t/silent7.sh
@@ -17,7 +17,7 @@
# Check user extensibility of silent-rules mode.
# Aslo check that silent rules are disabled by default.
-. ./defs || Exit 1
+. ./defs || exit 1
echo AC_OUTPUT >> configure.ac
@@ -42,46 +42,46 @@ $AUTOCONF
# Silent rules are disabled by default, since we haven't called
# "AM_SILENT_RULES([yes])" explicitly.
./configure
-$MAKE >stdout || { cat stdout; Exit 1; }
+$MAKE >stdout || { cat stdout; exit 1; }
cat stdout
-grep 'GEN ' stdout && Exit 1
+grep 'GEN ' stdout && exit 1
grep 'cp ' stdout
grep 'echo ' stdout
$MAKE clean
-$MAKE V=1 >stdout || { cat stdout; Exit 1; }
+$MAKE V=1 >stdout || { cat stdout; exit 1; }
cat stdout
-grep 'GEN ' stdout && Exit 1
+grep 'GEN ' stdout && exit 1
grep 'cp ' stdout
grep 'echo ' stdout
$MAKE clean
-$MAKE V=0 >stdout || { cat stdout; Exit 1; }
+$MAKE V=0 >stdout || { cat stdout; exit 1; }
cat stdout
grep 'GEN .*foo' stdout
-grep 'cp ' stdout && Exit 1
-grep 'echo ' stdout && Exit 1
+grep 'cp ' stdout && exit 1
+grep 'echo ' stdout && exit 1
$MAKE distclean
./configure --enable-silent-rules
-$MAKE >stdout || { cat stdout; Exit 1; }
+$MAKE >stdout || { cat stdout; exit 1; }
cat stdout
grep 'GEN .*foo' stdout
-grep 'cp ' stdout && Exit 1
-grep 'echo ' stdout && Exit 1
+grep 'cp ' stdout && exit 1
+grep 'echo ' stdout && exit 1
$MAKE clean
-$MAKE V=0 >stdout || { cat stdout; Exit 1; }
+$MAKE V=0 >stdout || { cat stdout; exit 1; }
cat stdout
grep 'GEN .*foo' stdout
-grep 'cp ' stdout && Exit 1
-grep 'echo ' stdout && Exit 1
+grep 'cp ' stdout && exit 1
+grep 'echo ' stdout && exit 1
$MAKE clean
-$MAKE V=1 >stdout || { cat stdout; Exit 1; }
+$MAKE V=1 >stdout || { cat stdout; exit 1; }
cat stdout
-grep 'GEN ' stdout && Exit 1
+grep 'GEN ' stdout && exit 1
grep 'cp ' stdout
grep 'echo ' stdout
diff --git a/t/silent9.sh b/t/silent9.sh
index 6c23c9f..ddc48cf 100755
--- a/t/silent9.sh
+++ b/t/silent9.sh
@@ -19,7 +19,7 @@
# Please keep this file in sync with silent3.test and silent4.test.
required='cc libtoolize'
-. ./defs || Exit 1
+. ./defs || exit 1
mkdir sub
@@ -50,9 +50,9 @@ $AUTOMAKE --add-missing
$AUTOCONF
./configure --disable-dependency-tracking --enable-silent-rules
-$MAKE >stdout || { cat stdout; Exit 1; }
+$MAKE >stdout || { cat stdout; exit 1; }
cat stdout
-$EGREP ' (-c|-o)|(mv|mkdir) ' stdout && Exit 1
+$EGREP ' (-c|-o)|(mv|mkdir) ' stdout && exit 1
grep ' CC *libfoo\.lo' stdout
grep ' CC *libbar_la-libbar\.lo' stdout
grep ' CC *sub/libbaz\.lo' stdout
@@ -63,12 +63,12 @@ grep ' CCLD *sub/libbaz\.la' stdout
grep ' CCLD *sub/libbla\.la' stdout
$MAKE clean
-$MAKE V=1 >stdout || { cat stdout; Exit 1; }
+$MAKE V=1 >stdout || { cat stdout; exit 1; }
cat stdout
grep ' -c' stdout
grep ' -o libfoo' stdout
grep ' -o sub/libbaz' stdout
# The libtool command line can contain e.g. a '--tag=CC' option.
-sed 's/--tag=[^ ]*/--tag=x/g' stdout | $EGREP '(CC|LD) ' && Exit 1
+sed 's/--tag=[^ ]*/--tag=x/g' stdout | $EGREP '(CC|LD) ' && exit 1
:
diff --git a/t/silentcxx-gcc.sh b/t/silentcxx-gcc.sh
index 35f01be..6417b6b 100755
--- a/t/silentcxx-gcc.sh
+++ b/t/silentcxx-gcc.sh
@@ -19,7 +19,7 @@
# test 'silentcxx.test', which should work with generic compilers.
required=g++
-. ./defs || Exit 1
+. ./defs || exit 1
mkdir sub
@@ -65,11 +65,11 @@ for config_args in \
am_cv_CXX_dependencies_compiler_type=gcc
do
./configure $config_args --enable-silent-rules
- $MAKE >stdout || { cat stdout; Exit 1; }
+ $MAKE >stdout || { cat stdout; exit 1; }
cat stdout
- $EGREP ' (-c|-o)' stdout && Exit 1
- grep 'mv ' stdout && Exit 1
+ $EGREP ' (-c|-o)' stdout && exit 1
+ grep 'mv ' stdout && exit 1
grep ' CXX *foo\.o' stdout
grep ' CXX *baz\.o' stdout
@@ -87,14 +87,14 @@ do
# Ensure a clean rebuild.
$MAKE clean
- $MAKE V=1 >stdout || { cat stdout; Exit 1; }
+ $MAKE V=1 >stdout || { cat stdout; exit 1; }
cat stdout
grep ' -c ' stdout
grep ' -o quux' stdout
grep ' -o bar2' stdout
- $EGREP '(CC|CXX|LD) ' stdout && Exit 1
+ $EGREP '(CC|CXX|LD) ' stdout && exit 1
# Ensure a clean reconfiguration/rebuild.
$MAKE clean
diff --git a/t/silentcxx.sh b/t/silentcxx.sh
index e350726..be24509 100755
--- a/t/silentcxx.sh
+++ b/t/silentcxx.sh
@@ -19,7 +19,7 @@
# and forces the use of gcc depmode.
required=c++
-. ./defs || Exit 1
+. ./defs || exit 1
mkdir sub
@@ -65,11 +65,11 @@ for config_args in \
--enable-dependency-tracking --disable-dependency-tracking
do
./configure $config_args --enable-silent-rules
- $MAKE >stdout || { cat stdout; Exit 1; }
+ $MAKE >stdout || { cat stdout; exit 1; }
cat stdout
- $EGREP ' (-c|-o)' stdout && Exit 1
- grep 'mv ' stdout && Exit 1
+ $EGREP ' (-c|-o)' stdout && exit 1
+ grep 'mv ' stdout && exit 1
grep ' CXX *foo\.o' stdout
grep ' CXX *baz\.o' stdout
@@ -87,14 +87,14 @@ do
# Ensure a clean rebuild.
$MAKE clean
- $MAKE V=1 >stdout || { cat stdout; Exit 1; }
+ $MAKE V=1 >stdout || { cat stdout; exit 1; }
cat stdout
grep ' -c ' stdout
grep ' -o quux' stdout
grep ' -o bar2' stdout
- $EGREP '(CXX|LD) ' stdout && Exit 1
+ $EGREP '(CXX|LD) ' stdout && exit 1
# Ensure a clean reconfiguration/rebuild.
$MAKE clean
diff --git a/t/silentf77.sh b/t/silentf77.sh
index 0b8846e..aaaa9d8 100755
--- a/t/silentf77.sh
+++ b/t/silentf77.sh
@@ -18,7 +18,7 @@
# Keep this ins sync with the sister test silentf90.test.
required=fortran77
-. ./defs || Exit 1
+. ./defs || exit 1
mkdir sub
@@ -50,15 +50,15 @@ $AUTOMAKE --add-missing
$AUTOCONF
./configure --enable-silent-rules
-$MAKE >stdout || { cat stdout; Exit 1; }
+$MAKE >stdout || { cat stdout; exit 1; }
cat stdout
# Avoid spurious failures with SunStudio Fortran compilers.
sed '/^NOTICE:/d' stdout > t
mv -f t stdout
cat stdout
-$EGREP ' (-c|-o)' stdout && Exit 1
-grep 'mv ' stdout && Exit 1
+$EGREP ' (-c|-o)' stdout && exit 1
+grep 'mv ' stdout && exit 1
grep ' F77 *foo\.' stdout
grep ' F77 *foo2-foo\.' stdout
@@ -69,17 +69,17 @@ grep ' F77LD *foo2' stdout
grep ' F77LD *sub/bar1' stdout
grep ' F77LD *bar2' stdout
-$EGREP '(FC|FCLD) ' stdout && Exit 1
+$EGREP '(FC|FCLD) ' stdout && exit 1
# Ensure a clean rebuild.
$MAKE clean
-$MAKE V=1 >stdout || { cat stdout; Exit 1; }
+$MAKE V=1 >stdout || { cat stdout; exit 1; }
cat stdout
grep ' -c ' stdout
grep ' -o ' stdout
-$EGREP '(F77|FC|LD) ' stdout && Exit 1
+$EGREP '(F77|FC|LD) ' stdout && exit 1
:
diff --git a/t/silentf90.sh b/t/silentf90.sh
index 3466b8a..3561674 100755
--- a/t/silentf90.sh
+++ b/t/silentf90.sh
@@ -18,7 +18,7 @@
# Keep this ins sync with the sister test silentf77.test.
required=fortran
-. ./defs || Exit 1
+. ./defs || exit 1
mkdir sub
@@ -50,15 +50,15 @@ $AUTOMAKE --add-missing
$AUTOCONF
./configure --enable-silent-rules
-$MAKE >stdout || { cat stdout; Exit 1; }
+$MAKE >stdout || { cat stdout; exit 1; }
cat stdout
# Avoid spurious failures with SunStudio Fortran compilers.
sed '/^NOTICE:/d' stdout > t
mv -f t stdout
cat stdout
-$EGREP ' (-c|-o)' stdout && Exit 1
-grep 'mv ' stdout && Exit 1
+$EGREP ' (-c|-o)' stdout && exit 1
+grep 'mv ' stdout && exit 1
grep ' FC *foo\.' stdout
grep ' FC *foo2-foo\.' stdout
@@ -69,17 +69,17 @@ grep ' FCLD *foo2' stdout
grep ' FCLD *sub/bar1' stdout
grep ' FCLD *bar2' stdout
-$EGREP '(F77|F77LD) ' stdout && Exit 1
+$EGREP '(F77|F77LD) ' stdout && exit 1
# Ensure a clean rebuild.
$MAKE clean
-$MAKE V=1 >stdout || { cat stdout; Exit 1; }
+$MAKE V=1 >stdout || { cat stdout; exit 1; }
cat stdout
grep ' -c ' stdout
grep ' -o ' stdout
-$EGREP '(F77|FC|LD) ' stdout && Exit 1
+$EGREP '(F77|FC|LD) ' stdout && exit 1
:
diff --git a/t/space.sh b/t/space.sh
index c46ade1..96bf9ba 100755
--- a/t/space.sh
+++ b/t/space.sh
@@ -16,7 +16,7 @@
# Test leading space on macro assignment.
-. ./defs || Exit 1
+. ./defs || exit 1
echo AC_PROG_CC >> configure.ac
diff --git a/t/specflg-dummy.sh b/t/specflg-dummy.sh
index 47a1c21..5cd0791 100755
--- a/t/specflg-dummy.sh
+++ b/t/specflg-dummy.sh
@@ -20,7 +20,7 @@
# even if AM_CFLAGS is undefined. Similarly for other *FLAGS variables
# (CXXFLAGS, YFLAGS, LDFLAGS, ...)
-. ./defs || Exit 1
+. ./defs || exit 1
# Disable shell globbing if possible.
(set +f) >/dev/null 2>&1 && set +f
diff --git a/t/specflg6.sh b/t/specflg6.sh
index 9d0d1ed..1d6ed8b 100755
--- a/t/specflg6.sh
+++ b/t/specflg6.sh
@@ -18,7 +18,7 @@
# conditionals are present.
# From Richard Boulton.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
diff --git a/t/specflg7.sh b/t/specflg7.sh
index 8caf930..7261d18 100755
--- a/t/specflg7.sh
+++ b/t/specflg7.sh
@@ -17,7 +17,7 @@
# The true/false example from the manual, plus a check for _SHORTNAME.
required='cc native'
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
diff --git a/t/specflg8.sh b/t/specflg8.sh
index d0c198f..598970a 100755
--- a/t/specflg8.sh
+++ b/t/specflg8.sh
@@ -19,7 +19,7 @@
# use of _CPPFLAGS (PR/337).
required='cc native'
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
@@ -55,7 +55,7 @@ $AUTOMAKE -a
$MAKE
./true
-./false && Exit 1
+./false && exit 1
objext=$(sed -n -e 's/^OBJEXT = //p' < Makefile)
test -f ./true-true.$objext
diff --git a/t/specflg9.sh b/t/specflg9.sh
index 96e7a2e..c8cde9e 100755
--- a/t/specflg9.sh
+++ b/t/specflg9.sh
@@ -16,7 +16,7 @@
# Another check for per-target flag substitutions.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
@@ -36,10 +36,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/t/spell.sh b/t/spell.sh
index 790739d..9946691 100755
--- a/t/spell.sh
+++ b/t/spell.sh
@@ -17,7 +17,7 @@
# Test to make sure misspellings in _SOURCES variables cause failure.
required=cc
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
@@ -38,7 +38,7 @@ $AUTOCONF
$AUTOMAKE
./configure
-$MAKE 2>stderr && { cat stderr >&2; Exit 1; }
+$MAKE 2>stderr && { cat stderr >&2; exit 1; }
cat stderr >&2
LC_ALL=C sed 's/^Makefile:[0-9][0-9]*: //' stderr > got
diff --git a/t/spell2.sh b/t/spell2.sh
index dead9c1..6bc7e11 100755
--- a/t/spell2.sh
+++ b/t/spell2.sh
@@ -17,7 +17,7 @@
# Test to make sure misspellings in _LDADD variable cause failure.
required=cc
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
@@ -38,7 +38,7 @@ $AUTOMAKE
./configure
-$MAKE 2>stderr && { cat stderr >&2; Exit 1; }
+$MAKE 2>stderr && { cat stderr >&2; exit 1; }
cat stderr >&2
LC_ALL=C sed 's/^Makefile:[0-9][0-9]*: //' stderr > got
diff --git a/t/spell3.sh b/t/spell3.sh
index a96fa03..c12703b 100755
--- a/t/spell3.sh
+++ b/t/spell3.sh
@@ -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
diff --git a/t/spelling.sh b/t/spelling.sh
index fb68f31..f6f99eb 100755
--- a/t/spelling.sh
+++ b/t/spelling.sh
@@ -16,7 +16,7 @@
# Test to make sure that misspelled prefixes actually cause error.
-. ./defs || Exit 1
+. ./defs || exit 1
cat > Makefile.am << 'EOF'
bni_PROGRAMS = zot
diff --git a/t/spy-autovars.sh b/t/spy-autovars.sh
index 4326745..99f506e 100755
--- a/t/spy-autovars.sh
+++ b/t/spy-autovars.sh
@@ -21,7 +21,7 @@
# automatic variables of GNU make.
am_create_testdir=empty
-. ./defs || Exit 1
+. ./defs || exit 1
cat > Makefile <<'END'
foo:
diff --git a/t/spy-pattern-rules.sh b/t/spy-pattern-rules.sh
index b2bb25d..c1e0c79 100755
--- a/t/spy-pattern-rules.sh
+++ b/t/spy-pattern-rules.sh
@@ -19,7 +19,7 @@
# This is used at least in our 'parallel-tests' support.
am_create_testdir=empty
-. ./defs || Exit 1
+. ./defs || exit 1
cat > Makefile <<'END'
default:
diff --git a/t/spy-phony.sh b/t/spy-phony.sh
index 4e42819..105a44a 100755
--- a/t/spy-phony.sh
+++ b/t/spy-phony.sh
@@ -17,7 +17,7 @@
# Check that the '.PHONY' semantics we expect truly hold.
am_create_testdir=empty
-. ./defs || Exit 1
+. ./defs || exit 1
cat > Makefile <<'END'
.PHONY: pdir pfile
@@ -41,17 +41,17 @@ test ! -f rdir/foo
: > pfile
mkdir pdir
$MAKE pdir pfile
-test "`cat pfile`" = bar
-test "`cat pdir/foo`" = foo
+test "$(cat pfile)" = bar
+test "$(cat pdir/foo)" = foo
$MAKE other
-test "`cat dummy`" = baz
+test "$(cat dummy)" = baz
$MAKE other
-test "`cat dummy`" = "baz${nl}baz"
+test "$(cat dummy)" = "baz${nl}baz"
echo not run > indirect
$MAKE indirect
-test "`cat indirect`" = run
-test "`cat dummy`" = "baz${nl}baz${nl}baz"
+test "$(cat indirect)" = run
+test "$(cat dummy)" = "baz${nl}baz${nl}baz"
:
diff --git a/t/spy-rm.tap b/t/spy-rm.tap
index af7ba2a..f279745 100755
--- a/t/spy-rm.tap
+++ b/t/spy-rm.tap
@@ -25,7 +25,7 @@
# <http://austingroupbugs.net/view.php?id=542>
am_create_testdir=empty
-. ./defs || Exit 1
+. ./defs || exit 1
plan_ 10
diff --git a/t/spy-trailing-backlash.sh b/t/spy-trailing-backlash.sh
index cc5d720..07e6767 100755
--- a/t/spy-trailing-backlash.sh
+++ b/t/spy-trailing-backlash.sh
@@ -18,7 +18,7 @@
# semantic we expect.
am_create_testdir=empty
-. ./defs || Exit 1
+. ./defs || exit 1
cat > Makefile << 'END'
default:
@@ -63,7 +63,7 @@ END
$MAKE
$MAKE ok
$MAKE ok | grep ':--#--:'
-$MAKE rule1 && Exit 1
+$MAKE rule1 && exit 1
$MAKE rule2
test -f sentinel
$MAKE rule3
diff --git a/t/spy-var-append.sh b/t/spy-var-append.sh
index b7d614f..ac8cc52 100755
--- a/t/spy-var-append.sh
+++ b/t/spy-var-append.sh
@@ -19,7 +19,7 @@
# any '+=' appending to it gets overridden as well.
am_create_testdir=empty
-. ./defs || Exit 1
+. ./defs || exit 1
cat > Makefile << 'END'
var0 += foo
@@ -48,7 +48,7 @@ END
checkit ()
{
- $MAKE "$@" 2>stderr && test ! -s stderr || { cat stderr >&2; Exit 1; }
+ $MAKE "$@" 2>stderr && test ! -s stderr || { cat stderr >&2; exit 1; }
}
checkit test1
diff --git a/t/spy-vpath-rewrite.sh b/t/spy-vpath-rewrite.sh
index b5dd589..df345c4 100755
--- a/t/spy-vpath-rewrite.sh
+++ b/t/spy-vpath-rewrite.sh
@@ -18,9 +18,9 @@
# We use that assumption in some of our rules, so it better explicitly
# check that it truly holds.
-. ./defs || Exit 1
+. ./defs || exit 1
-ocwd=`pwd` || fatal_ "couldn't get current working directory"
+ocwd=$(pwd) || fatal_ "couldn't get current working directory"
mkdir src
cd src
@@ -109,8 +109,8 @@ do_test ()
cp $srcdir/mk Makefile
$MAKE -k all VPATH=$srcdir
if test "$srcdir" != "."; then
- test ! -f $srcdir/bar && test ! -d $srcdir/bar || Exit 1
- test ! -f $srcdir/he && test ! -d $srcdir/he || Exit 1
+ test ! -f $srcdir/bar && test ! -d $srcdir/bar || exit 1
+ test ! -f $srcdir/he && test ! -d $srcdir/he || exit 1
fi
diff $srcdir/one.a one.b
diff $srcdir/two.a2 two.b2
diff --git a/t/spy-wildcard.sh b/t/spy-wildcard.sh
index 83ebde7..9a8e47d 100755
--- a/t/spy-wildcard.sh
+++ b/t/spy-wildcard.sh
@@ -17,7 +17,7 @@
# Check that the behaviour of the $(wildcard) builtin in corner cases
# matches the assumptions done in our recipes.
-. ./defs || Exit 1
+. ./defs || exit 1
mkdir dir
echo dummy > file
diff --git a/t/src-acsubst.sh b/t/src-acsubst.sh
index 97d536c..13531ac 100755
--- a/t/src-acsubst.sh
+++ b/t/src-acsubst.sh
@@ -16,7 +16,7 @@
# Test to make sure config substitution in _SOURCES fails.
-. ./defs || Exit 1
+. ./defs || exit 1
echo AC_PROG_CC >> configure.ac
diff --git a/t/stamph2.sh b/t/stamph2.sh
index 5346bfc..10c7d98 100755
--- a/t/stamph2.sh
+++ b/t/stamph2.sh
@@ -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
cat >> configure.ac << END
AC_CONFIG_HEADERS([1.h
@@ -57,12 +57,12 @@ rm -f stamp-h*
rm -f sdir1/stamp-h*
./config.status sdir1/7.h 2.h sdir1/4.h
-test ! -f stamp-h1
+test ! -e stamp-h1
test -f stamp-h2
-test ! -f stamp-h3
+test ! -e stamp-h3
test -f sdir1/stamp-h4
-test ! -f sdir1/stamp-h5
-test ! -f sdir1/stamp-h6
+test ! -e sdir1/stamp-h5
+test ! -e sdir1/stamp-h6
test -f sdir1/stamp-h7
:
diff --git a/t/stdinc-no-repeated.sh b/t/stdinc-no-repeated.sh
index 159cda5..afeb1fd 100755
--- a/t/stdinc-no-repeated.sh
+++ b/t/stdinc-no-repeated.sh
@@ -18,7 +18,7 @@
# compiler invocation.
required=cc
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
@@ -36,17 +36,17 @@ $AUTOMAKE --add-missing
mkdir build
cd build
../configure
-$MAKE V=1 > stdout || { cat stdout; Exit 1; }
+$MAKE V=1 > stdout || { cat stdout; exit 1; }
cat stdout
grep '.*-I *\. .*-I *\.\. ' stdout
-grep '.*-I *\. .*-I *\. ' stdout && Exit 1
+grep '.*-I *\. .*-I *\. ' stdout && exit 1
cd ..
# Test with $builddir = $srcdir
./configure
-$MAKE V=1 > stdout || { cat stdout; Exit 1; }
+$MAKE V=1 > stdout || { cat stdout; exit 1; }
cat stdout
grep '.*-I *\. ' stdout
-grep '.*-I *\..*-I *\.' stdout && Exit 1
+grep '.*-I *\..*-I *\.' stdout && exit 1
:
diff --git a/t/stdinc.sh b/t/stdinc.sh
index ec99483..d030e64 100755
--- a/t/stdinc.sh
+++ b/t/stdinc.sh
@@ -18,7 +18,7 @@
# Report by Kent Boortz.
required=cc
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
diff --git a/t/stdlib.sh b/t/stdlib.sh
index d2268d2..b3f458a 100755
--- a/t/stdlib.sh
+++ b/t/stdlib.sh
@@ -16,7 +16,7 @@
# Test "not a standard library" error.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
diff --git a/t/stdlib2.sh b/t/stdlib2.sh
index ce5158f..6cce916 100755
--- a/t/stdlib2.sh
+++ b/t/stdlib2.sh
@@ -17,7 +17,7 @@
# Check for AM_LDFLAGS = -module
# Report from Kevin P. Fleming.
required=libtool
-. ./defs || Exit 1
+. ./defs || exit 1
: > README
: > NEWS
diff --git a/t/strictness-override.sh b/t/strictness-override.sh
index 8c365f0..27e44dd 100755
--- a/t/strictness-override.sh
+++ b/t/strictness-override.sh
@@ -21,7 +21,7 @@
# been in place for quite a long time); see also Automake bug #7673.
# Update this test if the semantics are changed.
-. ./defs || Exit 1
+. ./defs || exit 1
# We want complete control over automake options.
AUTOMAKE=$am_original_AUTOMAKE
diff --git a/t/strictness-precedence.sh b/t/strictness-precedence.sh
index 6f5a143..ab70ee3 100755
--- a/t/strictness-precedence.sh
+++ b/t/strictness-precedence.sh
@@ -18,7 +18,7 @@
# strictness specified later should take precedence over strictness
# specified earlier.
-. ./defs || Exit 1
+. ./defs || exit 1
# We want complete control over automake options.
AUTOMAKE=$am_original_AUTOMAKE
diff --git a/t/strip.sh b/t/strip.sh
index abc2c86..6170627 100755
--- a/t/strip.sh
+++ b/t/strip.sh
@@ -17,7 +17,7 @@
# Test for install-strip.
required=cc
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
@@ -41,7 +41,7 @@ $ACLOCAL
$AUTOCONF
$AUTOMAKE -a
-prefix=$(cd install && pwd) || Exit 99
+prefix=$(cd install && pwd) || exit 99
./configure --prefix="$prefix"
$MAKE
$MAKE install-strip
diff --git a/t/strip2.sh b/t/strip2.sh
index 9c43496..2397545 100755
--- a/t/strip2.sh
+++ b/t/strip2.sh
@@ -18,7 +18,7 @@
# This test needs GNU binutils strip. See sister test 'strip3.sh'.
required='cc strip'
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
diff --git a/t/strip3.sh b/t/strip3.sh
index 8979016..543449d 100755
--- a/t/strip3.sh
+++ b/t/strip3.sh
@@ -19,7 +19,7 @@
# test 'strip2.sh'.
required='cc libtoolize strip'
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
diff --git a/t/subdir-ac-subst.sh b/t/subdir-ac-subst.sh
index 0ef238b..48b4b0d 100755
--- a/t/subdir-ac-subst.sh
+++ b/t/subdir-ac-subst.sh
@@ -18,7 +18,7 @@
# SUBDIRS + AC_SUBST setup from the manual.
# Lots of lines here are duplicated in subcond-am-cond.test.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >>configure.ac <<'END'
if test "$want_opt" = yes; then
diff --git a/t/subdir-add-pr46.sh b/t/subdir-add-pr46.sh
index a74c746..2a9049c 100755
--- a/t/subdir-add-pr46.sh
+++ b/t/subdir-add-pr46.sh
@@ -19,7 +19,7 @@
# 'subdir8.test' do it from a subdirectory.
# PR automake/46
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_OUTPUT
diff --git a/t/subdir-add2-pr46.sh b/t/subdir-add2-pr46.sh
index ee9e0b0..a4dca90 100755
--- a/t/subdir-add2-pr46.sh
+++ b/t/subdir-add2-pr46.sh
@@ -19,7 +19,7 @@
# when make is run from the top-level directory.
# PR automake/46
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
m4_include([confiles.m4])
diff --git a/t/subdir-am-cond.sh b/t/subdir-am-cond.sh
index 7f5e34a..7ad6059 100755
--- a/t/subdir-am-cond.sh
+++ b/t/subdir-am-cond.sh
@@ -18,7 +18,7 @@
# SUBDIRS + AM_CONDITIONAL setup from the manual.
# Lots of lines here are duplicated in subdir-ac-subst.test.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >>configure.ac <<'END'
AM_CONDITIONAL([COND_OPT], [test "$want_opt" = yes])
diff --git a/t/subdir-cond-err.sh b/t/subdir-cond-err.sh
index 1b5fcea..4eba4f8 100755
--- a/t/subdir-cond-err.sh
+++ b/t/subdir-cond-err.sh
@@ -16,7 +16,7 @@
# Check SUBDIRS set based on conditionals.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AM_CONDITIONAL([TEST], [true])
diff --git a/t/subdir-cond-gettext.sh b/t/subdir-cond-gettext.sh
index 459f639..f933f77 100755
--- a/t/subdir-cond-gettext.sh
+++ b/t/subdir-cond-gettext.sh
@@ -17,7 +17,7 @@
# It is ok to have a conditional SUBDIRS when using gettext.
required=gettext
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AM_GNU_GETTEXT
diff --git a/t/subdir-distclean.sh b/t/subdir-distclean.sh
index 191c018..25274fd 100755
--- a/t/subdir-distclean.sh
+++ b/t/subdir-distclean.sh
@@ -17,7 +17,7 @@
# Check that "./configure && make && make distclean" is actually a
# no-op, even when conditional SUBDIRS are involved.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_CONFIG_FILES([sub1/Makefile sub2/Makefile sub1/subsub/Makefile])
@@ -66,12 +66,12 @@ test -f sub1/run
touch sub2/oops sub1/subsub/oops
$MAKE distclean
-test ! -f sub1/run
-test ! -f sub2/oops
-test ! -f sub1/subsub/oops
-test ! -f sub1/Makefile
-test ! -f sub2/Makefile
-test ! -f sub1/subsub/Makefile
+test ! -e sub1/run
+test ! -e sub2/oops
+test ! -e sub1/subsub/oops
+test ! -e sub1/Makefile
+test ! -e sub2/Makefile
+test ! -e sub1/subsub/Makefile
mkdir build
cd build
@@ -88,12 +88,12 @@ test -f sub1/run
touch sub2/oops sub1/subsub/oops
$MAKE maintainer-clean
-test ! -f sub1/run
-test ! -f sub2/oops
-test ! -f sub1/subsub/oops
-test ! -f sub1/Makefile
-test ! -f sub2/Makefile
-test ! -f sub1/subsub/Makefile
+test ! -e sub1/run
+test ! -e sub2/oops
+test ! -e sub1/subsub/oops
+test ! -e sub1/Makefile
+test ! -e sub2/Makefile
+test ! -e sub1/subsub/Makefile
cd ..
diff --git a/t/subdir-order.sh b/t/subdir-order.sh
old mode 100644
new mode 100755
index 0321c25..5ea7b79
--- a/t/subdir-order.sh
+++ b/t/subdir-order.sh
@@ -16,7 +16,7 @@
# The $(SUDBIRS) entries are processed in the order they are specified.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_CONFIG_FILES([
@@ -124,14 +124,13 @@ all-local:
: > run
END
-
$ACLOCAL
$AUTOCONF
$AUTOMAKE -c --add-missing
./configure
-for j in '' -j12; do
+for j in '' '-j12'; do
$MAKE $j
test -f run
test -f sub0/run
@@ -140,7 +139,7 @@ for j in '' -j12; do
test -f sub3/a/run
test -f sub3/b/run
$MAKE clean
- find . | grep 'run$' && Exit 1
+ find . | grep 'run$' && exit 1
: # For shells with busted 'set -e'
done
diff --git a/t/subdir-subsub.sh b/t/subdir-subsub.sh
index 15f2f93..b8389dd 100755
--- a/t/subdir-subsub.sh
+++ b/t/subdir-subsub.sh
@@ -16,7 +16,7 @@
# Test to make sure sub-sub-dirs work correctly.
-. ./defs || Exit 1
+. ./defs || exit 1
mkdir one
mkdir one/two
diff --git a/t/subdir-with-slash.sh b/t/subdir-with-slash.sh
index eb9f4fe..0a3330b 100755
--- a/t/subdir-with-slash.sh
+++ b/t/subdir-with-slash.sh
@@ -16,7 +16,7 @@
# Test SUDBIRS with '/' in them.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_CONFIG_FILES([src/subdir/Makefile src/subdir2/Makefile])
@@ -50,6 +50,6 @@ test -f $distdir/src/subdir/foo
test -f $distdir/src/subdir2/foo
$MAKE clean
$MAKE distclean
-test ! -f src/subdir2/Makefile
+test ! -e src/subdir2/Makefile
:
diff --git a/t/subdir.sh b/t/subdir.sh
index 2ce68b8..fb1e246 100755
--- a/t/subdir.sh
+++ b/t/subdir.sh
@@ -16,7 +16,7 @@
# Test to make sure install-sh is correctly found in subdirs.
-. ./defs || Exit 1
+. ./defs || exit 1
mkdir zot
diff --git a/t/subdir10.sh b/t/subdir10.sh
index 4ba791a..396aecc 100755
--- a/t/subdir10.sh
+++ b/t/subdir10.sh
@@ -16,7 +16,7 @@
# SUDBIRS with $fail set in the environment.
-. ./defs || Exit 1
+. ./defs || exit 1
mkdir sub
diff --git a/t/subobj-c.sh b/t/subobj-c.sh
index 0bbeb2b..eafecaf 100755
--- a/t/subobj-c.sh
+++ b/t/subobj-c.sh
@@ -18,7 +18,7 @@
# Keep in sync with sister test 'subobj-cxx.sh'.
required=cc
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
@@ -69,14 +69,14 @@ int answer (void)
END
$ACLOCAL
-$AUTOMAKE --add-missing 2>stderr || { cat stderr >&2; Exit 1; }
+$AUTOMAKE --add-missing 2>stderr || { cat stderr >&2; exit 1; }
cat stderr >&2
# Make sure compile is installed, and that Automake says so.
grep 'install.*compile' stderr
test -f compile
-$EGREP '[^/](a|b|foo)\.\$(OBJEXT)' Makefile.in && Exit 1
+$EGREP '[^/](a|b|foo)\.\$(OBJEXT)' Makefile.in && exit 1
$AUTOCONF
diff --git a/t/subobj-clean-lt-pr10697.sh b/t/subobj-clean-lt-pr10697.sh
index b48a8ea..25bbace 100755
--- a/t/subobj-clean-lt-pr10697.sh
+++ b/t/subobj-clean-lt-pr10697.sh
@@ -22,7 +22,7 @@
# 'subobj-clean-pr10697.sh', which deals with the non-libtool case.
required='cc libtoolize'
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AM_PROG_AR
@@ -117,10 +117,10 @@ $MAKE mostlyclean
ls -l . sub1 sub2
for i in 1 2; do
for j in a b c d e f; do
- test ! -f sub$i/$j.o
- test ! -f sub$i/$j.obj
- test ! -f sub$i/$j.lo
- test -f sub$i/$j.c || Exit 99 # Sanity check
+ test ! -e sub$i/$j.o
+ test ! -e sub$i/$j.obj
+ test ! -e sub$i/$j.lo
+ test -f sub$i/$j.c || exit 99 # Sanity check
done
done
@@ -152,14 +152,14 @@ test -f sub2/a.$OBJEXT
# ... but they get removed by "make mostlyclean" ...
$MAKE mostlyclean
-test ! -f sub1/a.$OBJEXT
-test ! -f sub2/d.$OBJEXT
+test ! -e sub1/a.$OBJEXT
+test ! -e sub2/d.$OBJEXT
# ... and do not get rebuilt ...
$MAKE clean
$MAKE all
-test ! -f sub1/a.$OBJEXT
-test ! -f sub2/d.$OBJEXT
+test ! -e sub1/a.$OBJEXT
+test ! -e sub2/d.$OBJEXT
# ... while the non-stale files do.
test -f sub1/b.$OBJEXT
diff --git a/t/subobj-clean-pr10697.sh b/t/subobj-clean-pr10697.sh
index d7c6cbe..3a3adef 100755
--- a/t/subobj-clean-pr10697.sh
+++ b/t/subobj-clean-pr10697.sh
@@ -22,7 +22,7 @@
# 'subobj-clean-lt-pr10697.sh', which deals with the libtool case.
required=cc
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
@@ -113,9 +113,9 @@ $MAKE mostlyclean
ls -l . sub1 sub2
for i in 1 2; do
for j in a b c d e f; do
- test ! -f sub$i/$j.o
- test ! -f sub$i/$j.obj
- test -f sub$i/$j.c || Exit 99 # Sanity check
+ test ! -e sub$i/$j.o
+ test ! -e sub$i/$j.obj
+ test -f sub$i/$j.c || exit 99 # Sanity check
done
done
@@ -147,14 +147,14 @@ test -f sub2/a.$OBJEXT
# ... but they get removed by "make mostlyclean" ...
$MAKE mostlyclean
-test ! -f sub1/a.$OBJEXT
-test ! -f sub2/d.$OBJEXT
+test ! -e sub1/a.$OBJEXT
+test ! -e sub2/d.$OBJEXT
# ... and do not get rebuilt ...
$MAKE clean
$MAKE all
-test ! -f sub1/a.$OBJEXT
-test ! -f sub2/d.$OBJEXT
+test ! -e sub1/a.$OBJEXT
+test ! -e sub2/d.$OBJEXT
# ... while the non-stale files do.
test -f sub1/b.$OBJEXT
diff --git a/t/subobj-cxx-grep.sh b/t/subobj-cxx-grep.sh
index 1a03b16..b1f6980 100755
--- a/t/subobj-cxx-grep.sh
+++ b/t/subobj-cxx-grep.sh
@@ -17,7 +17,7 @@
# Grepping checks on the use of subdir objects with C++.
# See relate test 't/subobj-cxx-grep.sh' for semantic checks.
-. ./defs || Exit 1
+. ./defs || exit 1
echo AC_PROG_CXX >> configure.ac
@@ -31,7 +31,7 @@ $AUTOMAKE
$FGREP 'generic/a.$(OBJEXT)' Makefile.in
$FGREP 'generic/b.$(OBJEXT)' Makefile.in
-grep '[^/][ab]\.\$(OBJEXT)' Makefile.in && Exit 1
-grep '.*-c -o' Makefile.in
+grep '[^/][ab]\.\$(OBJEXT)' Makefile.in && exit 1
+grep '.* -c -o ' Makefile.in
:
diff --git a/t/subobj-cxx.sh b/t/subobj-cxx.sh
index ccb9e77..e72a4e7 100755
--- a/t/subobj-cxx.sh
+++ b/t/subobj-cxx.sh
@@ -18,7 +18,7 @@
# Keep in sync with sister test 'subobj-c.sh'.
required=c++
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CXX
@@ -79,7 +79,7 @@ END
$ACLOCAL
$AUTOMAKE -a
test ! -f compile # This is not needed by C++ support.
-$EGREP '[^/](a|b|foo)\.\$(OBJEXT)' Makefile.in && Exit 1
+$EGREP '[^/](a|b|foo)\.\$(OBJEXT)' Makefile.in && exit 1
$AUTOCONF
diff --git a/t/subobj-libtool.sh b/t/subobj-libtool.sh
index fc9f8c7..940e872 100755
--- a/t/subobj-libtool.sh
+++ b/t/subobj-libtool.sh
@@ -17,7 +17,7 @@
# Test of subdir objects with libtool.
required='cc libtoolize'
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
@@ -55,14 +55,14 @@ echo 'int three (void) { return 3; }' > sub/subsub/3.c
libtoolize
$ACLOCAL
-$AUTOMAKE --add-missing 2>stderr || { cat stderr >&2; Exit 1; }
+$AUTOMAKE --add-missing 2>stderr || { cat stderr >&2; exit 1; }
cat stderr >&2
# Make sure compile is installed, and that Automake says so.
grep 'install.*compile' stderr
test -f compile
-grep '[^/][123]\.lo' Makefile.in && Exit 1
+grep '[^/][123]\.lo' Makefile.in && exit 1
$AUTOCONF
diff --git a/t/subobj10.sh b/t/subobj10.sh
index e1d911a..55776a7 100755
--- a/t/subobj10.sh
+++ b/t/subobj10.sh
@@ -17,7 +17,7 @@
# PR 492: Test asm subdir objects.
required=gcc
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AM_PROG_AS
diff --git a/t/subobj11a.sh b/t/subobj11a.sh
index 6fea19a..25603ce 100755
--- a/t/subobj11a.sh
+++ b/t/subobj11a.sh
@@ -32,7 +32,7 @@
#
required=cc
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
diff --git a/t/subobj5.sh b/t/subobj5.sh
index c6e2e51..61f8f7f 100755
--- a/t/subobj5.sh
+++ b/t/subobj5.sh
@@ -18,7 +18,7 @@
# From Robert Collins.
required=cc
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_CONFIG_FILES([generic/Makefile])
diff --git a/t/subobj7.sh b/t/subobj7.sh
index 863cae0..1ce58ae 100755
--- a/t/subobj7.sh
+++ b/t/subobj7.sh
@@ -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
cat >> configure.ac << 'END'
AC_PROG_CC
@@ -33,6 +33,6 @@ END
$ACLOCAL
$AUTOMAKE --add-missing
-grep wish_CFLAGS Makefile.in && Exit 1
+grep wish_CFLAGS Makefile.in && exit 1
:
diff --git a/t/subobj8.sh b/t/subobj8.sh
index 6ab39d3..cd25f66 100755
--- a/t/subobj8.sh
+++ b/t/subobj8.sh
@@ -17,7 +17,7 @@
# Make sure 'compile' is included when subdir objects are used in a
# subdir.
-. ./defs || Exit 1
+. ./defs || exit 1
cat > configure.ac << END
AC_INIT([$me], [1.0])
diff --git a/t/subobj9.sh b/t/subobj9.sh
index 3743bc3..4b3c4d5 100755
--- a/t/subobj9.sh
+++ b/t/subobj9.sh
@@ -23,7 +23,7 @@
# forgets '.../<file>.o'.
required='c++ libtoolize'
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << END
AC_PROG_CXX
@@ -69,17 +69,17 @@ export AUTOCONF AUTOMAKE
# Opportunistically check that --tag=CXX is used when supported.
if ./libtool --help | grep tag=TAG; then
- $MAKE print >stdout || { cat stdout; Exit 1; }
+ $MAKE print >stdout || { cat stdout; exit 1; }
cat stdout
grep 'BEG1: .*--tag=CXX.*--mode=compile.* :1END' stdout
grep 'BEG2: .*--tag=CXX.*--mode=link.* :2END' stdout
fi
$MAKE
-$MAKE distcheck >output 2>&1 || { cat output; Exit 1; }
+$MAKE distcheck >output 2>&1 || { cat output; exit 1; }
cat output
# GNU Make used to complain that the Makefile contained two rules
# for 'src/.dirstamp' and './/src/.dirstamp'.
-grep 'overriding commands' output && Exit 1
+grep 'overriding commands' output && exit 1
:
diff --git a/t/subobjname.sh b/t/subobjname.sh
index 9d3b63d..7601664 100755
--- a/t/subobjname.sh
+++ b/t/subobjname.sh
@@ -18,7 +18,7 @@
# combinational explosion. (This test is named after the &subobjname
# sub in Automake).
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
diff --git a/t/subpkg-yacc.sh b/t/subpkg-yacc.sh
index 022e653..fe170ef 100755
--- a/t/subpkg-yacc.sh
+++ b/t/subpkg-yacc.sh
@@ -18,7 +18,7 @@
# properly, when a subpackage is involved.
required='cc yacc'
-. ./defs || Exit 1
+. ./defs || exit 1
cat > configure.ac <<'END'
AC_INIT([suya], [0.5a], address@hidden)
@@ -129,6 +129,6 @@ $MAKE
$MAKE distcheck
test -f lib-dist-hook-has-run # Sanity check
test -f subpack-1.tar.gz
-test ! -d subpack-1 # Make sure "distcheck" cleans up after itself.
+test ! -e subpack-1 # Make sure "distcheck" cleans up after itself.
:
diff --git a/t/subpkg.sh b/t/subpkg.sh
index 18d3e20..79c51da 100755
--- a/t/subpkg.sh
+++ b/t/subpkg.sh
@@ -17,7 +17,7 @@
# Check subpackage handling.
required=cc
-. ./defs || Exit 1
+. ./defs || exit 1
mkdir m4
@@ -107,13 +107,13 @@ $AUTOHEADER
$AUTOMAKE -Wno-override --add-missing
cd ..
-./configure >stdout || { cat stdout; Exit 1; }
+./configure >stdout || { cat stdout; exit 1; }
cat stdout
grep '^checking whether cc understands -c and -o together' stdout
$MAKE
$MAKE distcheck
-test ! -d subpack-1 # Make sure distcheck cleans up after itself.
+test ! -e subpack-1 # Make sure distcheck cleans up after itself.
test -f subpack-1.tar.gz
:
diff --git a/t/subpkg2.sh b/t/subpkg2.sh
index af89fc1..8afcc5a 100755
--- a/t/subpkg2.sh
+++ b/t/subpkg2.sh
@@ -17,7 +17,7 @@
# Try a DIST_SUBDIRS subpackage with no SUBDIRS.
# Report from Gary V. Vaughan.
-. ./defs || Exit 1
+. ./defs || exit 1
mkdir m4
diff --git a/t/subpkg3.sh b/t/subpkg3.sh
index 38dc455..6ebc4bd 100755
--- a/t/subpkg3.sh
+++ b/t/subpkg3.sh
@@ -16,7 +16,7 @@
# Make sure different subpackages may share files and directories.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >Makefile.am <<'END'
SUBDIRS = subpkg
diff --git a/t/subpkg4.sh b/t/subpkg4.sh
index f8e9a2c..97f452c 100755
--- a/t/subpkg4.sh
+++ b/t/subpkg4.sh
@@ -17,7 +17,7 @@
# Test to ensure 'distdir' fixes the mode of files and directories
# copied into '$(distdir)', even with sub-packages.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >Makefile.am <<'END'
SUBDIRS = subpkg
diff --git a/t/subst.sh b/t/subst.sh
index f46f2ed..db83d73 100755
--- a/t/subst.sh
+++ b/t/subst.sh
@@ -17,7 +17,7 @@
# Test that AC_SUBST($1) does something sensible. From Ulrich
# Drepper.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
dnl This test used to have the following lines, which cannot have
@@ -34,6 +34,6 @@ END
$ACLOCAL
$AUTOMAKE
-grep '^\$1' Makefile.in && Exit 1
+grep '^\$1' Makefile.in && exit 1
:
diff --git a/t/subst3.sh b/t/subst3.sh
index f201336..8ee3324 100755
--- a/t/subst3.sh
+++ b/t/subst3.sh
@@ -17,7 +17,7 @@
# Test installation with substitutions. This test is based on nobase.test.
required=cc
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac <<'EOF'
AC_PROG_CC
diff --git a/t/subst4.sh b/t/subst4.sh
index ab3631e..739b368 100755
--- a/t/subst4.sh
+++ b/t/subst4.sh
@@ -16,7 +16,7 @@
# Test AM_SUBST_NOTMAKE.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac <<'EOF'
myrule="\
diff --git a/t/subst5.sh b/t/subst5.sh
index 2fef1b9..f44b851 100755
--- a/t/subst5.sh
+++ b/t/subst5.sh
@@ -19,7 +19,7 @@
# Thus, we allow substitutions in bin_PROGRAMS, but then EXTRA_PROGRAMS
# needs to list possible values of that substitution, literally.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >>configure.ac <<'END'
AC_PROG_CC
@@ -34,7 +34,7 @@ END
$ACLOCAL
AUTOMAKE_fails
-grep 'bin_PROGRAMS.*contains configure substitution' stderr && Exit 1
+grep 'bin_PROGRAMS.*contains configure substitution' stderr && exit 1
grep 'EXTRA_PROGRAMS.*contains configure substitution' stderr
-Exit 0
+exit 0
diff --git a/t/substre2.sh b/t/substre2.sh
index a205c08..06fcdf1 100755
--- a/t/substre2.sh
+++ b/t/substre2.sh
@@ -17,7 +17,7 @@
# Test for bug in variable substitution references, where
# undefined variables break later substitutions.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_SUBST([CC], [whocares])
diff --git a/t/substref.sh b/t/substref.sh
index 6e9bb6f..d24bf13 100755
--- a/t/substref.sh
+++ b/t/substref.sh
@@ -18,7 +18,7 @@
# pattern is null.
# Report from Richard Boulton.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_SUBST([CC], [whocares])
@@ -48,7 +48,7 @@ $MAKE test
# 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. am__dist_sources should contain $(helldl_SOURCES).
-grep am__helldl_SOURCES_DIST Makefile && Exit 1
+grep am__helldl_SOURCES_DIST Makefile && exit 1
grep 'am__dist_sources.*\$(helldl_SOURCES)' Makefile
:
diff --git a/t/substtarg.sh b/t/substtarg.sh
index 5fd4f82..757885c 100755
--- a/t/substtarg.sh
+++ b/t/substtarg.sh
@@ -17,7 +17,7 @@
# Test that substitutions in variables work.
# From Lars J. Aas.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_CONFIG_SOURCE([fakelib.c])
diff --git a/t/suffix-chain.sh b/t/suffix-chain.sh
index e1f96b2..7ac4997 100755
--- a/t/suffix-chain.sh
+++ b/t/suffix-chain.sh
@@ -19,7 +19,7 @@
# See automake bug#7824 and bug#7670.
required=cc
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac <<'END'
AC_PROG_CC
diff --git a/t/suffix-custom-default-ext.sh b/t/suffix-custom-default-ext.sh
index 0bc7295..1736921 100755
--- a/t/suffix-custom-default-ext.sh
+++ b/t/suffix-custom-default-ext.sh
@@ -18,7 +18,7 @@
# and the use of AM_DEFAULT_SOURCE_EXT.
required=c++
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac <<'END'
AC_PROG_CXX
diff --git a/t/suffix-custom-link.sh b/t/suffix-custom-link.sh
index 1a3c013..8b1e505 100755
--- a/t/suffix-custom-link.sh
+++ b/t/suffix-custom-link.sh
@@ -19,7 +19,7 @@
# the Automake default (C linker) would be inappropriate.
required=c++
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac <<'END'
AC_PROG_CXX
diff --git a/t/suffix-custom-subobj.sh b/t/suffix-custom-subobj.sh
index 254ab79..070be74 100755
--- a/t/suffix-custom-subobj.sh
+++ b/t/suffix-custom-subobj.sh
@@ -18,7 +18,7 @@
# Originally reported by John Ratliff against suffix rules.
required=cc
-. ./defs || Exit 1
+. ./defs || exit 1
cat >>configure.ac <<EOF
AC_PROG_CC
diff --git a/t/suffix-custom.sh b/t/suffix-custom.sh
index 158be9c..010e55f 100755
--- a/t/suffix-custom.sh
+++ b/t/suffix-custom.sh
@@ -17,16 +17,14 @@
# Check that Automake support entries with user-defined extensions of
# files in _SOURCES, if there is a rule to turn files with that
# extension in object files.
-# See also related test 'suffix-custom-go.sh' for a check using a
-# real-world third party compiler (Go from Google).
required=cc
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac <<'END'
AC_CONFIG_HEADERS([config.h])
-AC_DEFINE([EXIT_OK], [0], [Exit status for success])
-AC_DEFINE([EXIT_KO], [1], [Exit status for failure])
+AC_DEFINE([EXIT_OK], [0], [The exit status for success])
+AC_DEFINE([EXIT_KO], [1], [The exit status for failure])
AC_PROG_CC
AC_OUTPUT
END
diff --git a/t/suffix-hdr.sh b/t/suffix-hdr.sh
index 67c7034..aced454 100755
--- a/t/suffix-hdr.sh
+++ b/t/suffix-hdr.sh
@@ -17,7 +17,7 @@
# Use of "custom" headers (with custom suffix).
required='cc native'
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
diff --git a/t/suffix-obj.sh b/t/suffix-obj.sh
index 41d70ee..38bf38f 100755
--- a/t/suffix-obj.sh
+++ b/t/suffix-obj.sh
@@ -16,7 +16,7 @@
# Test to make sure that '.o' and '.obj' are handled like '.$(OBJEXT)'.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
# $(LINK) is not defined automatically by Automake, since the *_SOURCES
diff --git a/t/suffix-rules-old-fashioned.sh b/t/suffix-rules-old-fashioned.sh
index 8de64ce..c0dd3d5 100755
--- a/t/suffix-rules-old-fashioned.sh
+++ b/t/suffix-rules-old-fashioned.sh
@@ -16,7 +16,7 @@
# Automake-NG still accepts old-fashioned suffix rules.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_CONFIG_FILES([sub/Makefile])
diff --git a/t/suffix.sh b/t/suffix.sh
index c60f734..eecf9a4 100755
--- a/t/suffix.sh
+++ b/t/suffix.sh
@@ -18,7 +18,7 @@
# only once.
# See also related test 'suffix2.test'.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
diff --git a/t/suffix10.sh b/t/suffix10.sh
index 243ed23..6f95391 100755
--- a/t/suffix10.sh
+++ b/t/suffix10.sh
@@ -19,7 +19,7 @@
# (related to PR/37)
required='cc libtoolize yacc'
-. ./defs || Exit 1
+. ./defs || exit 1
cat >>configure.ac <<EOF
AC_PROG_CC
diff --git a/t/suffix13.sh b/t/suffix13.sh
index 7917838..83e677d 100755
--- a/t/suffix13.sh
+++ b/t/suffix13.sh
@@ -18,7 +18,7 @@
# renamed objects and subdir objects. Reported by Florian Briegel.
required=cc
-. ./defs || Exit 1
+. ./defs || exit 1
cat >>configure.ac <<EOF
AC_PROG_CC
diff --git a/t/suffix2.sh b/t/suffix2.sh
index aa23b71..98d05e6 100755
--- a/t/suffix2.sh
+++ b/t/suffix2.sh
@@ -18,7 +18,7 @@
# and only once, even for libtool libraries.
# See also related test 'suffix.test'.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
diff --git a/t/suffix3.sh b/t/suffix3.sh
index bdf22cd..4688e53 100755
--- a/t/suffix3.sh
+++ b/t/suffix3.sh
@@ -17,7 +17,7 @@
# Test to make sure that suffix rules chain.
required=c++
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CXX
@@ -41,11 +41,10 @@ $AUTOMAKE
$FGREP 'foo.$(OBJEXT)' Makefile.in
# Finally, our dummy package doesn't use C in any way, so it the
# Makefile shouldn't contain stuff related to the C compiler.
-$FGREP '$(LINK)' Makefile.in && Exit 1
-$FGREP 'AM_CFLAGS' Makefile.in && Exit 1
-$FGREP '$(CFLAGS)' Makefile.in && Exit 1
-$FGREP '$(CC)' Makefile.in && Exit 1
-
+$FGREP '$(LINK)' Makefile.in && exit 1
+$FGREP 'AM_CFLAGS' Makefile.in && exit 1
+$FGREP '$(CFLAGS)' Makefile.in && exit 1
+$FGREP '$(CC)' Makefile.in && exit 1
$AUTOCONF
./configure
@@ -64,6 +63,6 @@ $MAKE distcheck
# Intermediate files should not be distributed.
$MAKE distdir
-test ! -r $me-1.0/foo.cc
+test ! -e $me-1.0/foo.cc
:
diff --git a/t/suffix5.sh b/t/suffix5.sh
index fb32ae1..fe8b95b 100755
--- a/t/suffix5.sh
+++ b/t/suffix5.sh
@@ -19,7 +19,7 @@
# Based on a report from Arkadiusz Miskiewicz <address@hidden>.
required='cc libtool'
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_SUBST([LINK], [:])
diff --git a/t/suffix8.sh b/t/suffix8.sh
index f4920ea..30bb6e4 100755
--- a/t/suffix8.sh
+++ b/t/suffix8.sh
@@ -19,7 +19,7 @@
# From PR/37.
required='cc libtoolize'
-. ./defs || Exit 1
+. ./defs || exit 1
cat >>configure.ac <<'END'
AM_PROG_AR
diff --git a/t/suffix9.sh b/t/suffix9.sh
index f6cdae9..18b10f3 100755
--- a/t/suffix9.sh
+++ b/t/suffix9.sh
@@ -17,7 +17,7 @@
# Make sure that Automake choose the shorter route between suffixes
# (related to PR/37)
-. ./defs || Exit 1
+. ./defs || exit 1
cat >>configure.ac << 'END'
AC_PROG_CC
diff --git a/t/symlink.sh b/t/symlink.sh
index b57f02a..ad7de70 100755
--- a/t/symlink.sh
+++ b/t/symlink.sh
@@ -18,7 +18,7 @@
# Reported by Joerg-Martin Schwarz.
am_create_testdir=empty
-. ./defs || Exit 1
+. ./defs || exit 1
: > Makefile.am
diff --git a/t/symlink2.sh b/t/symlink2.sh
index 46e26db..f1f9dc5 100755
--- a/t/symlink2.sh
+++ b/t/symlink2.sh
@@ -16,7 +16,7 @@
# Test to make sure that 'automake -a' redirects dangling symlinks.
-. ./defs || Exit 1
+. ./defs || exit 1
rm -f install-sh
ln -s Zardoz install-sh || skip_ "cannot create broken symlinks"
@@ -27,6 +27,6 @@ $ACLOCAL
$AUTOMAKE --add-missing
test -f install-sh
-test ! -r Zardoz
+test ! -e Zardoz
:
diff --git a/t/tags.sh b/t/tags.sh
index b1b95a2..8f38e6b 100755
--- a/t/tags.sh
+++ b/t/tags.sh
@@ -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
diff --git a/t/tags2.sh b/t/tags2.sh
index 7d4ee64..521d2ef 100755
--- a/t/tags2.sh
+++ b/t/tags2.sh
@@ -17,7 +17,7 @@
# TAGS_DEPENDENCIES only make sense if other tag-worthy things (such as
# sources) exist.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
@@ -37,6 +37,6 @@ bin_PROGRAMS = bar
END
AUTOMAKE_run
-grep 'define.*TAGS_DEPENDENCIES.*without' stderr && Exit 1
+grep 'define.*TAGS_DEPENDENCIES.*without' stderr && exit 1
:
diff --git a/t/tagsub.sh b/t/tagsub.sh
index 5915d46..9103805 100755
--- a/t/tagsub.sh
+++ b/t/tagsub.sh
@@ -18,7 +18,7 @@
# François Pinard, and later by Akim Demaille.
required=etags
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_CONFIG_FILES([sub/Makefile])
@@ -42,5 +42,7 @@ $FGREP sub/TAGS TAGS
$FGREP iguana.h sub/TAGS
$MAKE distclean
-test ! -f sub/TAGS
-test ! -f TAGS
+test ! -e sub/TAGS
+test ! -e TAGS
+
+:
diff --git a/t/tap-ambiguous-directive.sh b/t/tap-ambiguous-directive.sh
index 75a259c..74f258f 100755
--- a/t/tap-ambiguous-directive.sh
+++ b/t/tap-ambiguous-directive.sh
@@ -18,7 +18,7 @@
# - handling of "ambiguous" TODO and SKIP directives
# See also related test 'tap-todo-skip-together.test'.
-. ./defs || Exit 1
+. ./defs || exit 1
. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
@@ -32,7 +32,7 @@ ok 5 # SKIP SKIP
not ok 6 # TODO TODO
END
-$MAKE check >stdout && { cat stdout; Exit 1; }
+$MAKE check >stdout && { cat stdout; exit 1; }
cat stdout
count_test_results total=6 pass=2 fail=2 xpass=0 xfail=1 skip=1 error=0
diff --git a/t/tap-autonumber.sh b/t/tap-autonumber.sh
index 7c6aed0..74f7fac 100755
--- a/t/tap-autonumber.sh
+++ b/t/tap-autonumber.sh
@@ -20,7 +20,7 @@
# - test results without number get automatically numbered in the
# console progress output
-. ./defs || Exit 1
+. ./defs || exit 1
. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
@@ -44,7 +44,7 @@ not ok
ok
END
-$MAKE check TESTS=all.test >stdout && { cat stdout; Exit 1; }
+$MAKE check TESTS=all.test >stdout && { cat stdout; exit 1; }
cat stdout
count_test_results total=14 pass=6 fail=5 xpass=1 xfail=1 skip=1 error=0
diff --git a/t/tap-bad-prog.tap b/t/tap-bad-prog.tap
index ff7794a..46153df 100755
--- a/t/tap-bad-prog.tap
+++ b/t/tap-bad-prog.tap
@@ -18,7 +18,7 @@
# - missing, unreadable, or not-executable test scripts cause proper
# error reports
-. ./defs || Exit 1
+. ./defs || exit 1
fetch_tap_driver
@@ -99,7 +99,7 @@ else
for s in '"missing plan" message' 'results'; do
skip_ -r "IPC::Open3 not good enough" "no spurious $s"
done
- Exit 0
+ exit 0
fi
fi
diff --git a/t/tap-bailout-and-logging.sh b/t/tap-bailout-and-logging.sh
index e8e3756..5b49c33 100755
--- a/t/tap-bailout-and-logging.sh
+++ b/t/tap-bailout-and-logging.sh
@@ -18,7 +18,7 @@
# - even after a "Bail out!" directive, all input is still copied in
# the log file
-. ./defs || Exit 1
+. ./defs || exit 1
. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
@@ -31,7 +31,7 @@ non-TAP line after bailout
ok 1 - TAP result after bailout
END
-$MAKE check && { cat all.log; Exit 1; }
+$MAKE check && { cat all.log; exit 1; }
cat all.log
for rx in \
diff --git a/t/tap-bailout-leading-space.sh b/t/tap-bailout-leading-space.sh
index cfa6eee..2612cd2 100755
--- a/t/tap-bailout-leading-space.sh
+++ b/t/tap-bailout-leading-space.sh
@@ -21,7 +21,7 @@
# "more modern" behaviour in our awk TAP driver.
am_tap_implementation=shell
-. ./defs || Exit 1
+. ./defs || exit 1
. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
@@ -50,7 +50,7 @@ ERROR: b.test - Bail out!
ERROR: c.test - Bail out! FUBAR!
END
-$MAKE TESTS='a.test b.test c.test' check >stdout && { cat stdout; Exit 1; }
+$MAKE TESTS='a.test b.test c.test' check >stdout && { cat stdout; exit 1; }
cat stdout
count_test_results total=5 pass=1 fail=0 xpass=0 xfail=0 skip=1 error=3
diff --git a/t/tap-bailout-suppress-badexit.sh
b/t/tap-bailout-suppress-badexit.sh
index c7e55db..c83ba8a 100755
--- a/t/tap-bailout-suppress-badexit.sh
+++ b/t/tap-bailout-suppress-badexit.sh
@@ -18,7 +18,7 @@
# - A "Bail out!" directive causes the driver to ignore the exit
# status of the test script.
-. ./defs || Exit 1
+. ./defs || exit 1
tests='exit.test exit127.test sighup.test sigterm.test'
@@ -54,11 +54,11 @@ END
chmod a+x $tests
-$MAKE check >stdout && { cat stdout; Exit 1; }
+$MAKE check >stdout && { cat stdout; exit 1; }
cat stdout
count_test_results total=4 pass=0 fail=0 xpass=0 xfail=0 skip=0 error=4
for tst in $tests; do grep "^ERROR: $tst - Bail out!" stdout; done
-$EGREP "ERROR: .*(exit.*status|terminat.*signal)" stdout && Exit 1
+$EGREP "ERROR: .*(exit.*status|terminat.*signal)" stdout && exit 1
:
diff --git a/t/tap-bailout-suppress-later-diagnostic.sh
b/t/tap-bailout-suppress-later-diagnostic.sh
index bff4d64..69ac88f 100755
--- a/t/tap-bailout-suppress-later-diagnostic.sh
+++ b/t/tap-bailout-suppress-later-diagnostic.sh
@@ -18,7 +18,7 @@
# - A "Bail out!" directive causes the driver to ignore any TAP
# diagnostic message in the rest of the following TAP stream.
-. ./defs || Exit 1
+. ./defs || exit 1
. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
@@ -34,11 +34,11 @@ END
# Doing the sums above, we have:
-$MAKE check >stdout && { cat stdout; Exit 1; }
+$MAKE check >stdout && { cat stdout; exit 1; }
cat stdout
count_test_results total=2 pass=1 fail=0 xpass=0 xfail=0 skip=0 error=1
grep '# all.test: sanity check' stdout
-grep 'not seen' stdout && Exit 1
+grep 'not seen' stdout && exit 1
:
diff --git a/t/tap-bailout-suppress-later-errors.sh
b/t/tap-bailout-suppress-later-errors.sh
index f9f0062..5073959 100755
--- a/t/tap-bailout-suppress-later-errors.sh
+++ b/t/tap-bailout-suppress-later-errors.sh
@@ -18,7 +18,7 @@
# - A "Bail out!" directive causes the driver to ignore any TAP
# result or error in the rest of the following TAP stream.
-. ./defs || Exit 1
+. ./defs || exit 1
. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
@@ -53,7 +53,7 @@ ok 3
END
$MAKE TESTS='foo.test bar.test baz.test' check >stdout \
- && { cat stdout; Exit 1; }
+ && { cat stdout; exit 1; }
cat stdout
count_test_results total=5 pass=1 fail=0 xpass=0 xfail=0 skip=1 error=3
@@ -64,7 +64,7 @@ grep '^SKIP: bar\.test' stdout
grep '^ERROR: baz\.test - Bail out!$' stdout
grep '^PASS: baz\.test 1$' stdout
-$FGREP 'Not seen' stdout && Exit 1
+$FGREP 'Not seen' stdout && exit 1
test $($FGREP -c ': foo.test' stdout) -eq 1
test $($FGREP -c ': bar.test' stdout) -eq 2
diff --git a/t/tap-bailout.sh b/t/tap-bailout.sh
index d07d6c3..d8c6065 100755
--- a/t/tap-bailout.sh
+++ b/t/tap-bailout.sh
@@ -17,7 +17,7 @@
# Basic TAP test protocol support:
# - "Bail out!" magic
-. ./defs || Exit 1
+. ./defs || exit 1
. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
@@ -119,7 +119,7 @@ echo "ERROR: e.test - Bail out!" >> exp
test_counts='total=12 pass=3 fail=1 xpass=1 xfail=1 skip=1 error=5'
$MAKE TESTS='a.test b.test c.test d.test e.test' check >stdout \
- && { cat stdout; Exit 1; }
+ && { cat stdout; exit 1; }
cat stdout
count_test_results $test_counts
diff --git a/t/tap-basic.sh b/t/tap-basic.sh
index ad67f65..d107ef3 100755
--- a/t/tap-basic.sh
+++ b/t/tap-basic.sh
@@ -24,7 +24,7 @@
# Note that some of the features checked here are checked in other
# test cases too, usually in a more thorough and detailed way.
-. ./defs || Exit 1
+. ./defs || exit 1
fetch_tap_driver
@@ -87,7 +87,7 @@ $AUTOMAKE
# Basilar usage and testsuite progress output.
-$MAKE check >stdout && { cat stdout; Exit 1; }
+$MAKE check >stdout && { cat stdout; exit 1; }
cat stdout
count_test_results total=20 pass=4 fail=4 xpass=4 xfail=4 skip=4 error=0
@@ -134,37 +134,37 @@ Bail out!
ok 1
END
-$MAKE TESTS=bail.test check >stdout && { cat stdout; Exit 1; }
+$MAKE TESTS=bail.test check >stdout && { cat stdout; exit 1; }
cat stdout
count_test_results total=1 pass=0 fail=0 xpass=0 xfail=0 skip=0 error=1
-test ! -f success.log
+test ! -e success.log
test -f bail.log
test -f test-suite.log
grep '^ERROR: bail\.test - Bail out!' stdout
-grep '^PASS:' stdout && Exit 1
+grep '^PASS:' stdout && exit 1
test $($FGREP -c ': bail.test' stdout) -eq 1
-$FGREP 'success.test' stdout && Exit 1
+$FGREP 'success.test' stdout && exit 1
# Override TESTS from the command line, making it point to a test
# (ok.test) that has to be generated at make time.
rm -f *.log *.test
-$MAKE TESTS=ok check >stdout || { cat stdout; Exit 1; }
+$MAKE TESTS=ok check >stdout || { cat stdout; exit 1; }
cat stdout
count_test_results total=3 pass=1 fail=0 xpass=0 xfail=1 skip=1 error=0
test -f ok.test
test -f ok.log
-test ! -f success.log
-test ! -f bail.log
+test ! -e success.log
+test ! -e bail.log
test -f test-suite.log
-$EGREP '(bail|success)\.test' stdout && Exit 1
+$EGREP '(bail|success)\.test' stdout && exit 1
cat > exp << 'END'
PASS: ok.test 1
diff --git a/t/tap-color.sh b/t/tap-color.sh
index 6773b28..f60cc57 100755
--- a/t/tap-color.sh
+++ b/t/tap-color.sh
@@ -18,7 +18,7 @@
# - colorization of TAP results and diagnostic messages
required='grep-nonprint'
-. ./defs || Exit 1
+. ./defs || exit 1
# Escape '[' for grep, below.
red="$esc\[0;31m"
@@ -119,20 +119,20 @@ test_no_color ()
{
# Not a useless use of cat; see above comments "grep-nonprinting"
# requirement in 'test-init.sh'.
- cat stdout | grep "$esc" && Exit 1
- :
+ cat stdout | grep "$esc" && exit 1
+ : For 'set -e'.
}
# It should be possible to override AM_COLOR_TESTS also from the
# environment.
# Forced colorization should take place also with non-ANSI terminals;
# hence the "TERM=dumb" definition.
-TERM=dumb AM_COLOR_TESTS=always $MAKE check >stdout \
- && { cat stdout; Exit 1; }
+AM_COLOR_TESTS=always $MAKE TERM=dumb check >stdout \
+ && { cat stdout; exit 1; }
cat stdout
test_color
-$MAKE check TERM=ansi >stdout && { cat stdout; Exit 1; }
+$MAKE check TERM=ansi >stdout && { cat stdout; exit 1; }
cat stdout
test_no_color
diff --git a/t/tap-common-setup.sh b/t/tap-common-setup.sh
index f76ce3b..32a474a 100755
--- a/t/tap-common-setup.sh
+++ b/t/tap-common-setup.sh
@@ -16,7 +16,7 @@
# Auxiliary test to set up common data used by many tests on TAP support.
-. ./defs || Exit 1
+. ./defs || exit 1
echo AC_OUTPUT >> configure.ac
diff --git a/t/tap-deps.sh b/t/tap-deps.sh
index 9e52b79..60997b4 100755
--- a/t/tap-deps.sh
+++ b/t/tap-deps.sh
@@ -17,7 +17,7 @@
# Basic TAP test protocol support:
# - dependencies between test scripts
-. ./defs || Exit 1
+. ./defs || exit 1
cat > Makefile.am << 'END'
# The tests are *deliberately* listed in inverted order here.
@@ -62,7 +62,7 @@ END
chmod a+x *.test
-$MAKE check >stdout || { cat stdout; Exit 1; }
+$MAKE check >stdout || { cat stdout; exit 1; }
cat stdout
count_test_results total=5 pass=5 fail=0 xpass=0 xfail=0 skip=0 error=0
diff --git a/t/tap-diagnostic-custom.sh b/t/tap-diagnostic-custom.sh
index a67470d..d035105 100755
--- a/t/tap-diagnostic-custom.sh
+++ b/t/tap-diagnostic-custom.sh
@@ -18,7 +18,7 @@
# - option '--diagnostic-string' to customize the string introducing
# TAP diagnostics
-. ./defs || Exit 1
+. ./defs || exit 1
fetch_tap_driver
@@ -81,13 +81,13 @@ $AUTOMAKE -a
./configure
-$MAKE check >stdout || { cat stdout; Exit 1; }
+$MAKE check >stdout || { cat stdout; exit 1; }
cat stdout
count_test_results total=$i pass=$i fail=0 xpass=0 xfail=0 skip=0 error=0
cat later.mk >> Makefile
-$MAKE check >stdout || { cat stdout; Exit 1; }
+$MAKE check >stdout || { cat stdout; exit 1; }
cat stdout
-$FGREP 'blah blah' stdout && Exit 1
+$FGREP 'blah blah' stdout && exit 1
:
diff --git a/t/tap-diagnostic.sh b/t/tap-diagnostic.sh
index 058757c..340d69a 100755
--- a/t/tap-diagnostic.sh
+++ b/t/tap-diagnostic.sh
@@ -18,7 +18,7 @@
# - diagnostic messages (TAP lines with leading "#")
# - flags '--comments' and '--no-comments' of the TAP test driver
-. ./defs || Exit 1
+. ./defs || exit 1
. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
@@ -52,13 +52,13 @@ PASS: all.test 4 - zardoz
# all.test: Shell metacharacters here: $metacharacters
END
-$MAKE check >stdout || { cat stdout; Exit 1; }
+$MAKE check >stdout || { cat stdout; exit 1; }
cat stdout
-$EGREP "#.*all\\.test|a comment|(Tests|Shell) " stdout && Exit 1
+$EGREP "#.*all\\.test|a comment|(Tests|Shell) " stdout && exit 1
count_test_results total=4 pass=2 fail=0 xpass=0 xfail=1 skip=1 error=0
echo 'AM_TEST_LOG_DRIVER_FLAGS = --comments' >> Makefile
-$MAKE check >stdout || { cat stdout; Exit 1; }
+$MAKE check >stdout || { cat stdout; exit 1; }
cat stdout
$FGREP ' all.test' stdout > got
cat exp
@@ -67,9 +67,9 @@ diff exp got
count_test_results total=4 pass=2 fail=0 xpass=0 xfail=1 skip=1 error=0
$MAKE check TEST_LOG_DRIVER_FLAGS="--no-comments" >stdout \
- || { cat stdout; Exit 1; }
+ || { cat stdout; exit 1; }
cat stdout
-$EGREP "#.*all\\.test|a comment|(Tests|Shell) " stdout && Exit 1
+$EGREP "#.*all\\.test|a comment|(Tests|Shell) " stdout && exit 1
count_test_results total=4 pass=2 fail=0 xpass=0 xfail=1 skip=1 error=0
# The "#"-prepended lines here shouldn't be parsed as test results.
@@ -88,7 +88,7 @@ ok
#TODO
END
-$MAKE check >stdout || { cat stdout; Exit 1; }
+$MAKE check >stdout || { cat stdout; exit 1; }
cat stdout
count_test_results total=1 pass=1 fail=0 xpass=0 xfail=0 skip=0 error=0
@@ -109,7 +109,7 @@ ok 1
# ${tab} ${tab}${tab}foo bar${tab}baz ${tab}
END
-$MAKE check >stdout || { cat stdout; Exit 1; }
+$MAKE check >stdout || { cat stdout; exit 1; }
cat stdout
count_test_results total=1 pass=1 fail=0 xpass=0 xfail=0 skip=0 error=0
diff --git a/t/tap-doc.sh b/t/tap-doc.sh
index a241333..5055f85 100755
--- a/t/tap-doc.sh
+++ b/t/tap-doc.sh
@@ -17,7 +17,7 @@
# Check that an example given in the documentation really works.
# See section "Simple Tests" subsection "Script-based Testsuites".
-. ./defs || Exit 1
+. ./defs || exit 1
fetch_tap_driver
@@ -70,7 +70,7 @@ $AUTOMAKE -a
./configure
-$MAKE check >stdout || { cat stdout; Exit 1; }
+$MAKE check >stdout || { cat stdout; exit 1; }
cat stdout
cat > exp <<'END'
diff --git a/t/tap-doc2.sh b/t/tap-doc2.sh
index f42a687..9ce91c6 100755
--- a/t/tap-doc2.sh
+++ b/t/tap-doc2.sh
@@ -19,7 +19,7 @@
# with the Automake test harness".
am_create_testdir=empty
-. ./defs || Exit 1
+. ./defs || exit 1
cat > Makefile.am <<'END'
TEST_LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \
@@ -71,14 +71,14 @@ mkdir build-aux
cp "$am_scriptdir"/tap-driver.sh build-aux \
|| framework_failure_ "fetching the perl TAP driver"
-(export AUTOMAKE ACLOCAL AUTOCONF && $AUTORECONF -vi) || Exit 1
+(export AUTOMAKE ACLOCAL AUTOCONF && $AUTORECONF -vi) || exit 1
./configure --help # Sanity check.
./configure || skip_ "configure failed"
case $MAKE in *\ -j*) skip_ "can't work easily with concurrent make";; esac
-$MAKE check >stdout && { cat stdout; Exit 1; }
+$MAKE check >stdout && { cat stdout; exit 1; }
cat stdout
cat > exp <<'END'
@@ -104,7 +104,7 @@ grep '^Please report to address@hidden' stdout
$MAKE check \
TESTS='foo.test baz.test' \
TEST_LOG_DRIVER_FLAGS='--comments --ignore-exit' \
- > stdout || { cat stdout; Exit 1; }
+ > stdout || { cat stdout; exit 1; }
cat > exp <<'END'
PASS: foo.test 1 - Swallows fly
diff --git a/t/tap-driver-stderr.sh b/t/tap-driver-stderr.sh
index bb54ebf..b1d9227 100755
--- a/t/tap-driver-stderr.sh
+++ b/t/tap-driver-stderr.sh
@@ -19,7 +19,7 @@
required=non-root
am_create_testdir=empty
-. ./defs || Exit 1
+. ./defs || exit 1
fetch_tap_driver
@@ -41,7 +41,7 @@ for suf in trs log; do
cat $tst.trs || :
test $st -eq 0
- $FGREP 'Hello, World!' stderr stdout && Exit 1
+ $FGREP 'Hello, World!' stderr stdout && exit 1
$FGREP $tst.$suf stderr
done
diff --git a/t/tap-empty-diagnostic.sh b/t/tap-empty-diagnostic.sh
index e3f1e15..c92a152 100755
--- a/t/tap-empty-diagnostic.sh
+++ b/t/tap-empty-diagnostic.sh
@@ -17,7 +17,7 @@
# TAP support:
# - empty diagnostic messages are discarder
-. ./defs || Exit 1
+. ./defs || exit 1
. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
@@ -30,11 +30,11 @@ ok 1$
# ${tab} $tab${tab}$
END
-$MAKE check >stdout || { cat stdout; Exit 1; }
+$MAKE check >stdout || { cat stdout; exit 1; }
cat stdout
grep '^PASS:.*all\.test' stdout # Sanity check.
-grep '#.*all\.test' stdout && Exit 1
-grep "all\.test[ $tab]*:[ $tab]*$" stdout && Exit 1
+grep '#.*all\.test' stdout && exit 1
+grep "all\.test[ $tab]*:[ $tab]*$" stdout && exit 1
:
diff --git a/t/tap-empty.sh b/t/tap-empty.sh
index bad40ed..976656d 100755
--- a/t/tap-empty.sh
+++ b/t/tap-empty.sh
@@ -18,7 +18,7 @@
# - empty TAP input
# - blank TAP input
-. ./defs || Exit 1
+. ./defs || exit 1
. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
@@ -45,7 +45,7 @@ END
for input in empty blank white white2; do
cp $input.test all.test
- $MAKE check >stdout && { cat stdout; Exit 1; }
+ $MAKE check >stdout && { cat stdout; exit 1; }
cat stdout
count_test_results total=1 pass=0 fail=0 xpass=0 xfail=0 skip=0 error=1
grep '^ERROR: all\.test - missing test plan$' stdout
diff --git a/t/tap-escape-directive-2.sh b/t/tap-escape-directive-2.sh
index 1c72f79..3080663 100755
--- a/t/tap-escape-directive-2.sh
+++ b/t/tap-escape-directive-2.sh
@@ -17,7 +17,7 @@
# TAP support:
# - "escape" TODO and SKIP directives (by escaping the "#" character)
-. ./defs || Exit 1
+. ./defs || exit 1
. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
@@ -37,7 +37,7 @@ not ok \\\\\\\\\\# TODO
ok \\\\\\\\\\# SKIP
END
-$MAKE check >stdout || { cat stdout; Exit 1; }
+$MAKE check >stdout || { cat stdout; exit 1; }
cat stdout
count_test_results total=8 pass=2 fail=0 xpass=0 xfail=3 skip=3 error=0
diff --git a/t/tap-escape-directive.sh b/t/tap-escape-directive.sh
index 6067af2..2fb1ad9 100755
--- a/t/tap-escape-directive.sh
+++ b/t/tap-escape-directive.sh
@@ -17,7 +17,7 @@
# TAP support:
# - "escape" TODO and SKIP directives (by escaping the "#" character)
-. ./defs || Exit 1
+. ./defs || exit 1
. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
@@ -27,7 +27,7 @@ ok \# TODO
ok \# SKIP
END
-$MAKE check >stdout || { cat stdout; Exit 1; }
+$MAKE check >stdout || { cat stdout; exit 1; }
cat stdout
count_test_results total=2 pass=2 fail=0 xpass=0 xfail=0 skip=0 error=0
diff --git a/t/tap-exit.sh b/t/tap-exit.sh
index 2717976..0949384 100755
--- a/t/tap-exit.sh
+++ b/t/tap-exit.sh
@@ -19,7 +19,7 @@
# - the '--ignore-exit' option causes the TAP test driver to ignore
# exit statuses of the test scripts.
-. ./defs || Exit 1
+. ./defs || exit 1
echo TESTS = > Makefile.am
for st in 1 2 77 99; do
@@ -36,7 +36,7 @@ chmod a+x *.test
. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
-$MAKE check >stdout && { cat stdout; Exit 1; }
+$MAKE check >stdout && { cat stdout; exit 1; }
cat stdout
count_test_results total=8 pass=4 fail=0 xpass=0 xfail=0 skip=0 error=4
@@ -46,7 +46,7 @@ grep '^ERROR: exit77\.test - exited with status 77$' stdout
grep '^ERROR: exit99\.test - exited with status 99$' stdout
echo TEST_LOG_DRIVER_FLAGS = --ignore-exit >> Makefile
-$MAKE check >stdout || { cat stdout; Exit 1; }
+$MAKE check >stdout || { cat stdout; exit 1; }
cat stdout
count_test_results total=4 pass=4 fail=0 xpass=0 xfail=0 skip=0 error=0
diff --git a/t/tap-fancy.sh b/t/tap-fancy.sh
index e17cc78..f879cce 100755
--- a/t/tap-fancy.sh
+++ b/t/tap-fancy.sh
@@ -17,7 +17,7 @@
# TAP support: some unusual forms for valid TAP input.
# See also related test 'tap-fancy2.test'.
-. ./defs || Exit 1
+. ./defs || exit 1
. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
@@ -68,7 +68,7 @@ not ok!#TODO?
ok~#TODO
END
-$MAKE check >stdout && { cat stdout; Exit 1; }
+$MAKE check >stdout && { cat stdout; exit 1; }
cat stdout
count_test_results total=21 pass=6 fail=6 xfail=4 xpass=1 skip=4 error=0
@@ -91,7 +91,7 @@ ok $weirdchars # SKIP
Bail out! $weirdchars
END
-$MAKE check >stdout && { cat stdout; Exit 1; }
+$MAKE check >stdout && { cat stdout; exit 1; }
cat stdout
count_test_results total=6 pass=1 fail=1 xfail=1 xpass=1 skip=1 error=1
@@ -118,7 +118,7 @@ ok # SKIP $bs
Bail out! $bs
END
-$MAKE check >stdout && { cat stdout; Exit 1; }
+$MAKE check >stdout && { cat stdout; exit 1; }
cat stdout
count_test_results total=6 pass=1 fail=1 xfail=1 xpass=1 skip=1 error=1
diff --git a/t/tap-fancy2.sh b/t/tap-fancy2.sh
index 4bf014f..88ef412 100755
--- a/t/tap-fancy2.sh
+++ b/t/tap-fancy2.sh
@@ -17,7 +17,7 @@
# TAP support: more unusual forms for valid TAP input.
# See also related test 'tap-fancy.test'.
-. ./defs || Exit 1
+. ./defs || exit 1
. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
@@ -125,11 +125,11 @@ total=$(($total + 3))
# And add the test plan!
echo 1..$total >> all.test
-$MAKE check >stdout && { cat stdout; Exit 1; }
+$MAKE check >stdout && { cat stdout; exit 1; }
cat stdout
-$EGREP '^(PASS|FAIL|SKIP).*#.*TODO' stdout && Exit 1
-$EGREP '^X?(PASS|FAIL).*#.*SKIP' stdout && Exit 1
+$EGREP '^(PASS|FAIL|SKIP).*#.*TODO' stdout && exit 1
+$EGREP '^X?(PASS|FAIL).*#.*SKIP' stdout && exit 1
count_test_results total=$total pass=$pass fail=$fail skip=$skip \
xpass=$xpass xfail=$xfail error=$error
diff --git a/t/tap-global-log.sh b/t/tap-global-log.sh
index 3d4663c..9fd851e 100755
--- a/t/tap-global-log.sh
+++ b/t/tap-global-log.sh
@@ -17,7 +17,7 @@
# TAP support:
# - which log files get copied in the global log?
-. ./defs || Exit 1
+. ./defs || exit 1
. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
@@ -105,7 +105,7 @@ END
$MAKE TESTS="$(echo *.test)" check || :
cat test-suite.log
-grep ':.*ok|not seen' test-suite.log && Exit 1
+grep ':.*ok|not seen' test-suite.log && exit 1
for s in skip todo fail xpass bail error; do
$FGREP "::$s::" test-suite.log
@@ -117,7 +117,7 @@ test_suite_contents=$(cat test-suite.log)
hodgepodge_contents=$(cat hodgepodge)
case $test_suite_contents in
*"$hodgepodge_contents"*) ;;
- *) Exit 1;;
+ *) exit 1;;
esac
:
diff --git a/t/tap-global-result.sh b/t/tap-global-result.sh
index e5ca64b..9d69564 100755
--- a/t/tap-global-result.sh
+++ b/t/tap-global-result.sh
@@ -18,7 +18,7 @@
# - which global test result derives from different test results
# mixed in a single script?
-. ./defs || Exit 1
+. ./defs || exit 1
. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
@@ -140,7 +140,7 @@ END
tests=$(echo *.test) # Also required later.
-$MAKE TESTS="$tests" check >stdout && { cat stdout; Exit 1; }
+$MAKE TESTS="$tests" check >stdout && { cat stdout; exit 1; }
cat stdout
# Dirty trick required here.
@@ -149,7 +149,7 @@ for tst in $(echo " $tests " | sed 's/\.test / /'); do
done
rm -f test-suite.log
-$MAKE TESTS="$tests" test-suite.log && Exit 1
+$MAKE TESTS="$tests" test-suite.log && exit 1
cat test-suite.log
have_rst_section ()
diff --git a/t/tap-lazy-check.sh b/t/tap-lazy-check.sh
index 408646a..44befac 100755
--- a/t/tap-lazy-check.sh
+++ b/t/tap-lazy-check.sh
@@ -16,7 +16,7 @@
# TAP support: AM_LAZY_CHECK
-. ./defs || Exit 1
+. ./defs || exit 1
cat > Makefile.am << 'END'
TEST_LOG_COMPILER = cat
@@ -57,21 +57,21 @@ grep_summary ()
grep '^# ERROR: *1$' stdout
}
-$MAKE check && Exit 1
+$MAKE check && exit 1
test -f foo.log
test -f bar.log
test -f baz.log
rm -f foo.log bar.log
-$MAKE AM_LAZY_CHECK=yes check > stdout && { cat stdout; Exit 1; }
+$MAKE AM_LAZY_CHECK=yes check > stdout && { cat stdout; exit 1; }
cat stdout
test -f foo.log
test -f bar.log
grep '^PASS: foo\.test 1$' stdout
grep '^PASS: foo\.test 2$' stdout
grep '^FAIL: bar\.test 1$' stdout
-grep 'baz\.test' stdout && Exit 1
+grep 'baz\.test' stdout && exit 1
grep_summary
$sleep
@@ -79,28 +79,28 @@ touch foo.test
# We re-run only a successful test, but the tests that failed in the
# previous run should still be taken into account, and cause an overall
# failure.
-$MAKE AM_LAZY_CHECK=yes check > stdout && { cat stdout; Exit 1; }
+$MAKE AM_LAZY_CHECK=yes check > stdout && { cat stdout; exit 1; }
cat stdout
grep '^PASS: foo\.test 1$' stdout
grep '^PASS: foo\.test 2$' stdout
-grep 'ba[rz]\.test' stdout && Exit 1
+grep 'ba[rz]\.test' stdout && exit 1
is_newest foo.log foo.test
grep_summary
$sleep
touch zardoz
-$MAKE AM_LAZY_CHECK=yes check > stdout && { cat stdout; Exit 1; }
+$MAKE AM_LAZY_CHECK=yes check > stdout && { cat stdout; exit 1; }
cat stdout
grep '^ERROR: baz\.test' stdout
-$EGREP '(foo|bar)\.test' stdout && Exit 1
+$EGREP '(foo|bar)\.test' stdout && exit 1
is_newest baz.log zardoz
grep_summary
# Now, explicitly retry with all test logs already updated, and ensure
# that the summary is still displayed.
-$MAKE AM_LAZY_CHECK=yes check > stdout && { cat stdout; Exit 1; }
+$MAKE AM_LAZY_CHECK=yes check > stdout && { cat stdout; exit 1; }
cat stdout
-$EGREP '(foo|bar|baz)\.test' stdout && Exit 1
+$EGREP '(foo|bar|baz)\.test' stdout && exit 1
grep_summary
:
diff --git a/t/tap-log.sh b/t/tap-log.sh
index c5bcf0c..d39965a 100755
--- a/t/tap-log.sh
+++ b/t/tap-log.sh
@@ -22,7 +22,7 @@
# - VERBOSE environment variable support
# Keep in sync with 'test-log.test'.
-. ./defs || Exit 1
+. ./defs || exit 1
cat > Makefile.am << 'END'
TESTS = pass.test skip.test xfail.test fail.test xpass.test error.test
@@ -85,10 +85,10 @@ END
chmod a+x *.test
-$MAKE check TEST_SUITE_LOG=my.log && Exit 1
+$MAKE check TEST_SUITE_LOG=my.log && exit 1
ls -l # For debugging.
-test ! -f test-suite.log
-test ! -f global.log
+test ! -e test-suite.log
+test ! -e global.log
test -f my.log
st=0
for result in pass fail xfail xpass skip error; do
@@ -96,7 +96,7 @@ for result in pass fail xfail xpass skip error; do
$FGREP "$pmarker $result $pmarker" $result.log || st=1
$FGREP "$cmarker $result $cmarker" $result.log || st=1
done
-test $st -eq 0 || Exit 1
+test $st -eq 0 || exit 1
cat my.log # For debugging.
for result in xfail fail xpass skip error; do
cat $result.log # For debugging.
@@ -107,7 +107,7 @@ test $($FGREP -c "$pmarker" my.log) -eq 5
test $($FGREP -c "$cmarker" my.log) -eq 5
# Passed test scripts shouldn't be mentioned in the global log.
-$EGREP '(^pass|[^x]pass)\.test' my.log && Exit 1
+$EGREP '(^pass|[^x]pass)\.test' my.log && exit 1
# But failing (expectedly or not) and skipped ones should.
$FGREP 'xfail.test' my.log
$FGREP 'skip.test' my.log
@@ -118,13 +118,13 @@ $FGREP 'error.test' my.log
touch error2.log test-suite.log global.log
$MAKE mostlyclean TEST_SUITE_LOG=my.log
ls -l # For debugging.
-test ! -f my.log
-test ! -f pass.log
-test ! -f fail.log
-test ! -f xfail.log
-test ! -f xpass.log
-test ! -f skip.log
-test ! -f error.log
+test ! -e my.log
+test ! -e pass.log
+test ! -e fail.log
+test ! -e xfail.log
+test ! -e xpass.log
+test ! -e skip.log
+test ! -e error.log
# "make mostlyclean" shouldn't remove unrelated log files.
test -f error2.log
test -f test-suite.log
@@ -132,27 +132,27 @@ test -f global.log
rm -f *.log
-VERBOSE=yes $MAKE check >stdout && { cat stdout; Exit 1; }
+VERBOSE=yes $MAKE check >stdout && { cat stdout; exit 1; }
cat stdout
cat global.log
-test ! -f my.log
-test ! -f test-suite.log
+test ! -e my.log
+test ! -e test-suite.log
# Check that VERBOSE causes the global testsuite log to be
# emitted on stdout.
out=$(cat stdout)
log=$(cat global.log)
-case $out in *"$log"*) ;; *) Exit 1;; esac
+case $out in *"$log"*) ;; *) exit 1;; esac
touch error2.log test-suite.log my.log
$MAKE clean
ls -l # For debugging.
-test ! -f global.log
-test ! -f pass.log
-test ! -f fail.log
-test ! -f xfail.log
-test ! -f xpass.log
-test ! -f skip.log
-test ! -f error.log
+test ! -e global.log
+test ! -e pass.log
+test ! -e fail.log
+test ! -e xfail.log
+test ! -e xpass.log
+test ! -e skip.log
+test ! -e error.log
# "make clean" shouldn't remove unrelated log files.
test -f error2.log
test -f test-suite.log
diff --git a/t/tap-merge-stdout-stderr.sh b/t/tap-merge-stdout-stderr.sh
index 6b9995a..38a5f74 100755
--- a/t/tap-merge-stdout-stderr.sh
+++ b/t/tap-merge-stdout-stderr.sh
@@ -18,7 +18,7 @@
# - The Automake TAP driver has an option that instruct it to read TAP
# input also from the stderr of the test command, not only its stdout.
-. ./defs || Exit 1
+. ./defs || exit 1
fetch_tap_driver
@@ -40,7 +40,7 @@ echo "# foo foo foo" >&2
END
chmod a+x all.test
-$MAKE check >stdout || { cat stdout; Exit 1; }
+$MAKE check >stdout || { cat stdout; exit 1; }
cat stdout
count_test_results total=4 pass=2 fail=0 xpass=0 xfail=1 skip=1 error=0
@@ -53,7 +53,7 @@ echo ok 1
echo 'Bail out!' >&2
END
-$MAKE check >stdout && { cat stdout; Exit 1; }
+$MAKE check >stdout && { cat stdout; exit 1; }
cat stdout
count_test_results total=2 pass=1 fail=0 xpass=0 xfail=0 skip=0 error=1
@@ -61,7 +61,7 @@ count_test_results total=2 pass=1 fail=0 xpass=0 xfail=0
skip=0 error=1
# See that the option '--no-merge' can override the effect of '--merge'.
$MAKE check TEST_LOG_DRIVER_FLAGS=--no-merge >stdout \
- || { cat stdout; Exit 1; }
+ || { cat stdout; exit 1; }
cat stdout
count_test_results total=1 pass=1 fail=0 xpass=0 xfail=0 skip=0 error=0
diff --git a/t/tap-missing-plan-and-bad-exit.sh
b/t/tap-missing-plan-and-bad-exit.sh
index 31a702c..ddd74c8 100755
--- a/t/tap-missing-plan-and-bad-exit.sh
+++ b/t/tap-missing-plan-and-bad-exit.sh
@@ -19,7 +19,7 @@
# plan, then the driver reports both "missing plan" and "exited with
# non-zero status" errors.
-. ./defs || Exit 1
+. ./defs || exit 1
cat > foo.test <<END
#!/bin/sh
@@ -32,7 +32,7 @@ chmod a+x foo.test
. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
-$MAKE check >stdout && { cat stdout; Exit 1; }
+$MAKE check >stdout && { cat stdout; exit 1; }
cat stdout
count_test_results total=2 pass=0 fail=0 xpass=0 xfail=0 skip=0 error=2
diff --git a/t/tap-more.sh b/t/tap-more.sh
index c04adff..6b45d20 100755
--- a/t/tap-more.sh
+++ b/t/tap-more.sh
@@ -24,7 +24,7 @@
# correct test script(s)
# - "make distcheck" works
-. ./defs || Exit 1
+. ./defs || exit 1
fetch_tap_driver
@@ -117,11 +117,8 @@ for try in 0 1; do
# Success.
# Use append mode here to avoid dropping output. See automake bug#11413.
- # Also, use 'echo' here to "nullify" the previous contents of 'stdout',
- # since Solaris 10 /bin/sh would try to optimize a ':' away after the
- # first iteration, even if it is redirected.
- echo " " >stdout
- $run_make check >>stdout || { cat stdout; Exit 1; }
+ : >stdout
+ $run_make check >>stdout || { cat stdout; exit 1; }
cat stdout
count_test_results total=6 pass=4 fail=0 xpass=0 xfail=1 skip=1 error=0
grep '^PASS: 1\.test 1 - mu$' stdout
@@ -137,16 +134,11 @@ for try in 0 1; do
# Failure.
- # Use 'echo' here, since Solaris 10 /bin/sh would try to optimize
- # a ':' away after the first iteration, even if it is redirected.
- echo dummy > not-skip
- echo dummy > bail-out
+ : > not-skip
+ : > bail-out
# Use append mode here to avoid dropping output. See automake bug#11413.
- # Also, use 'echo' here to "nullify" the previous contents of 'stdout',
- # since Solaris 10 /bin/sh would try to optimize a ':' away after the
- # first iteration, even if it is redirected.
- echo " " >stdout
- $run_make check >>stdout && { cat stdout; Exit 1; }
+ : >stdout
+ $run_make check >>stdout && { cat stdout; exit 1; }
cat stdout
count_test_results total=7 pass=4 fail=1 xpass=0 xfail=1 skip=0 error=1
grep '^PASS: 1\.test 1 - mu$' stdout
diff --git a/t/tap-more2.sh b/t/tap-more2.sh
index 9ac5c11..d1355ed 100755
--- a/t/tap-more2.sh
+++ b/t/tap-more2.sh
@@ -20,7 +20,7 @@
# - interactions with 'check_*' variables
required='cc native'
-. ./defs || Exit 1
+. ./defs || exit 1
fetch_tap_driver
@@ -82,7 +82,7 @@ $AUTOMAKE --add-missing
./configure
for target in check distcheck; do
- $MAKE $target >stdout || { cat stdout; Exit 1; }
+ $MAKE $target >stdout || { cat stdout; exit 1; }
cat stdout
count_test_results total=3 pass=1 fail=0 xpass=0 xfail=1 skip=1 error=0
done
diff --git a/t/tap-msg0-bailout.sh b/t/tap-msg0-bailout.sh
index 09b232f..2faf679 100755
--- a/t/tap-msg0-bailout.sh
+++ b/t/tap-msg0-bailout.sh
@@ -19,14 +19,14 @@
# of a "plan with skip" TAP plan
# generally true!
-. ./defs || Exit 1
+. ./defs || exit 1
. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
echo 'Bail out! 0' > a.test
echo 'Bail out! 0.0' > b.test
-$MAKE TESTS='a.test b.test' check >stdout && { cat stdout; Exit 1; }
+$MAKE TESTS='a.test b.test' check >stdout && { cat stdout; exit 1; }
cat stdout
count_test_results total=2 pass=0 fail=0 xpass=0 xfail=0 skip=0 error=2
diff --git a/t/tap-msg0-directive.sh b/t/tap-msg0-directive.sh
index cbd2fce..9859e72 100755
--- a/t/tap-msg0-directive.sh
+++ b/t/tap-msg0-directive.sh
@@ -17,7 +17,7 @@
# TAP support:
# - literal string "0" as a TODO or SKIP message
-. ./defs || Exit 1
+. ./defs || exit 1
. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
@@ -28,7 +28,7 @@ not ok 2 # TODO 0
ok 3 # SKIP 0
END
-$MAKE check >stdout && { cat stdout; Exit 1; }
+$MAKE check >stdout && { cat stdout; exit 1; }
cat stdout
count_test_results total=3 pass=0 fail=0 xpass=1 xfail=1 skip=1 error=0
diff --git a/t/tap-msg0-misc.sh b/t/tap-msg0-misc.sh
index 06f400b..166b785 100755
--- a/t/tap-msg0-misc.sh
+++ b/t/tap-msg0-misc.sh
@@ -18,7 +18,7 @@
# - literal "0" and "0.0" in a test description and a TODO/SKIP message
# at the same time
-. ./defs || Exit 1
+. ./defs || exit 1
. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
@@ -45,7 +45,7 @@ ok 14 0.0 # SKIP 0.0
END
-$MAKE check >stdout && { cat stdout; Exit 1; }
+$MAKE check >stdout && { cat stdout; exit 1; }
cat stdout
count_test_results total=14 pass=2 fail=0 xpass=4 xfail=4 skip=4 error=0
diff --git a/t/tap-msg0-planskip.sh b/t/tap-msg0-planskip.sh
index c965ab2..7502a46 100755
--- a/t/tap-msg0-planskip.sh
+++ b/t/tap-msg0-planskip.sh
@@ -18,14 +18,14 @@
# - literal strings "0" and "0.0" as the reason of the skip in a "TAP
# plan with skip" (i.e., "1..0 # SKIP ...").
-. ./defs || Exit 1
+. ./defs || exit 1
. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
echo '1..0 # SKIP 0' > a.test
echo '1..0 # SKIP 0.0' > b.test
-$MAKE TESTS='a.test b.test' check >stdout || { cat stdout; Exit 1; }
+$MAKE TESTS='a.test b.test' check >stdout || { cat stdout; exit 1; }
cat stdout
count_test_results total=2 pass=0 fail=0 xpass=0 xfail=0 skip=2 error=0
diff --git a/t/tap-msg0-result.sh b/t/tap-msg0-result.sh
index a2cc0a5..a1174bc 100755
--- a/t/tap-msg0-result.sh
+++ b/t/tap-msg0-result.sh
@@ -17,7 +17,7 @@
# TAP support:
# - the string "0" as a test description
-. ./defs || Exit 1
+. ./defs || exit 1
. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
@@ -35,7 +35,7 @@ ok 9 0 # SKIP
ok - 0 # SKIP
END
-$MAKE check >stdout && { cat stdout; Exit 1; }
+$MAKE check >stdout && { cat stdout; exit 1; }
cat stdout
count_test_results total=10 pass=2 fail=2 xpass=2 xfail=2 skip=2 error=0
diff --git a/t/tap-negative-numbers.sh b/t/tap-negative-numbers.sh
index 11661a1..765442a 100755
--- a/t/tap-negative-numbers.sh
+++ b/t/tap-negative-numbers.sh
@@ -18,7 +18,7 @@
# - don't spuriously recognize negative TAP result numbers, but correctly
# interpret them as test descriptions instead
-. ./defs || Exit 1
+. ./defs || exit 1
. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
@@ -33,7 +33,7 @@ ok -121
not ok -50000
END
-$MAKE check >stdout && { cat stdout; Exit 1; }
+$MAKE check >stdout && { cat stdout; exit 1; }
cat stdout
count_test_results total=7 pass=2 fail=2 xpass=1 xfail=1 skip=1 error=0
diff --git a/t/tap-no-disable-hard-error.sh b/t/tap-no-disable-hard-error.sh
index 5fa587d..e9a1091 100755
--- a/t/tap-no-disable-hard-error.sh
+++ b/t/tap-no-disable-hard-error.sh
@@ -18,7 +18,7 @@
# - "Bail out!" magic and TAP parse errors are not disabled nor turned
# into simple failures by the definition DISABLE_HARD_ERRORS.
-. ./defs || Exit 1
+. ./defs || exit 1
cat > Makefile.am << 'END'
DISABLE_HARD_ERRORS = yes
@@ -41,7 +41,7 @@ cat > noplan.test <<END
# nothing here
END
-$MAKE check >stdout && { cat stdout; Exit 1; }
+$MAKE check >stdout && { cat stdout; exit 1; }
cat stdout
count_test_results total=3 pass=0 fail=0 xpass=0 xfail=0 skip=0 error=3
diff --git a/t/tap-no-merge-stdout-stderr.sh b/t/tap-no-merge-stdout-stderr.sh
index eb6b080..e82b26b 100755
--- a/t/tap-no-merge-stdout-stderr.sh
+++ b/t/tap-no-merge-stdout-stderr.sh
@@ -18,7 +18,7 @@
# - By default, TAP input is only from the stdout (and not the stderr)
# of the test command.
-. ./defs || Exit 1
+. ./defs || exit 1
cat > Makefile.am << 'END'
TEST_LOG_DRIVER_FLAGS = --comments
@@ -42,11 +42,11 @@ END
chmod a+x all.test
-$MAKE check >stdout || { cat stdout; Exit 1; }
+$MAKE check >stdout || { cat stdout; exit 1; }
cat stdout
count_test_results total=2 pass=1 fail=0 xpass=0 xfail=0 skip=1 error=0
$FGREP 'foo foo foo' stdout
-$FGREP 'bar bar bar' stdout && Exit 1
+$FGREP 'bar bar bar' stdout && exit 1
:
diff --git a/t/tap-no-spurious-numbers.sh b/t/tap-no-spurious-numbers.sh
index 0c07510..3f99498 100755
--- a/t/tap-no-spurious-numbers.sh
+++ b/t/tap-no-spurious-numbers.sh
@@ -18,7 +18,7 @@
# - we shouldn't spuriously recognize as TAP result numbers what it
# not, even if it seems pretty close
-. ./defs || Exit 1
+. ./defs || exit 1
. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
diff --git a/t/tap-no-spurious.sh b/t/tap-no-spurious.sh
index ea2993d..ebb58cf 100755
--- a/t/tap-no-spurious.sh
+++ b/t/tap-no-spurious.sh
@@ -18,7 +18,7 @@
# - don't spuriously recognize lines that are "almost" TAP lines as
# real TAP lines
-. ./defs || Exit 1
+. ./defs || exit 1
. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
@@ -105,7 +105,7 @@ cat all.test \
&& test $(grep -c '^not ok1$' all.test) -eq 1 \
|| framework_failure_ "creating all.test"
-$MAKE check >stdout || { cat stdout; Exit 1; }
+$MAKE check >stdout || { cat stdout; exit 1; }
cat stdout
count_test_results total=5 pass=5 fail=0 xpass=0 xfail=0 skip=0 error=0
diff --git a/t/tap-not-ok-skip.sh b/t/tap-not-ok-skip.sh
index f52127c..f73bb03 100755
--- a/t/tap-not-ok-skip.sh
+++ b/t/tap-not-ok-skip.sh
@@ -18,7 +18,7 @@
# - a "not ok # SKIP" line should count as a failure, for consistency
# with the prove(1) utility.
-. ./defs || Exit 1
+. ./defs || exit 1
. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
@@ -30,7 +30,7 @@ not ok - foo # SKIP
not ok 4 - bar # SKIP
END
-$MAKE check >stdout && { cat stdout; Exit 1; }
+$MAKE check >stdout && { cat stdout; exit 1; }
cat stdout
count_test_results total=4 pass=0 fail=4 skip=0 xpass=0 xfail=0 error=0
diff --git a/t/tap-number-wordboundary.sh b/t/tap-number-wordboundary.sh
index bd1bf8d..219a159 100755
--- a/t/tap-number-wordboundary.sh
+++ b/t/tap-number-wordboundary.sh
@@ -18,7 +18,7 @@
# - TAP result numbers terminated by a non-whitespace "word boundary"
# character are recognized
-. ./defs || Exit 1
+. ./defs || exit 1
. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
@@ -31,7 +31,7 @@ not ok 4?&%$ foo4 # TODO
ok 5"`!! foo5 # TODO
END
-$MAKE check >stdout && { cat stdout; Exit 1; }
+$MAKE check >stdout && { cat stdout; exit 1; }
cat stdout
count_test_results total=5 pass=1 fail=1 skip=1 xpass=1 xfail=1 error=0
@@ -49,7 +49,7 @@ not ok 1!
ok 476$ # SKIP
END
-$MAKE check >stdout && { cat stdout; Exit 1; }
+$MAKE check >stdout && { cat stdout; exit 1; }
cat stdout
count_test_results total=3 pass=0 fail=0 skip=0 xpass=0 xfail=0 error=3
@@ -102,7 +102,7 @@ cat all.test
# Sanity check.
grep "^ok 1'$" all.test || framework_failure_ "creating all.test"
-$MAKE check >stdout || { cat stdout; Exit 1; }
+$MAKE check >stdout || { cat stdout; exit 1; }
cat stdout
count_test_results total=$planned pass=$planned \
diff --git a/t/tap-numbers-leading-zero.sh b/t/tap-numbers-leading-zero.sh
index bbd0d0e..fd1c3b6 100755
--- a/t/tap-numbers-leading-zero.sh
+++ b/t/tap-numbers-leading-zero.sh
@@ -17,13 +17,13 @@
# TAP support:
# - how does TAP result numbers with leading zero fares?
-. ./defs || Exit 1
+. ./defs || exit 1
. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
do_checks ()
{
- $MAKE check >stdout && { cat stdout; Exit 1; }
+ $MAKE check >stdout && { cat stdout; exit 1; }
cat stdout
count_test_results "$@"
# Allow some normalization of leading zeros, without forcing it.
diff --git a/t/tap-numeric-description.sh b/t/tap-numeric-description.sh
index cd220a7..60292a7 100755
--- a/t/tap-numeric-description.sh
+++ b/t/tap-numeric-description.sh
@@ -16,7 +16,7 @@
# TAP result lines whose description is a number.
-. ./defs || Exit 1
+. ./defs || exit 1
. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
@@ -53,7 +53,7 @@ XPASS: all.test 9 ${x9} # TODO
XPASS: all.test 10 - ${x10} # TODO
END
-$MAKE check >stdout && { cat stdout; Exit 1; }
+$MAKE check >stdout && { cat stdout; exit 1; }
cat stdout
count_test_results total=10 pass=2 fail=2 xpass=2 xfail=2 skip=2 error=0
diff --git a/t/tap-out-of-order.sh b/t/tap-out-of-order.sh
index eec90b3..0e3ffb2 100755
--- a/t/tap-out-of-order.sh
+++ b/t/tap-out-of-order.sh
@@ -17,7 +17,7 @@
# TAP support:
# - out-of-order test results
-. ./defs || Exit 1
+. ./defs || exit 1
. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
@@ -58,7 +58,7 @@ ok 17
END
$MAKE TESTS='a.test b.test c.test d.test' check >stdout \
- && { cat stdout; Exit 1; }
+ && { cat stdout; exit 1; }
cat stdout
count_test_results total=17 pass=8 fail=0 xpass=0 xfail=1 skip=0 error=8
diff --git a/t/tap-passthrough-exit.sh b/t/tap-passthrough-exit.sh
index a397252..617f89c 100755
--- a/t/tap-passthrough-exit.sh
+++ b/t/tap-passthrough-exit.sh
@@ -19,7 +19,7 @@
# log file
# See also related test 'tap-passthrough.test'.
-. ./defs || Exit 1
+. ./defs || exit 1
cat > Makefile.am << 'END'
TEST_LOG_COMPILER = $(SHELL)
@@ -44,7 +44,7 @@ st=0
$MAKE check || st=$?
for e in $exit_statuses; do cat exit-$e.log; done
cat test-suite.log
-test $st -gt 0 || Exit 1
+test $st -gt 0 || exit 1
for e in $exit_statuses; do
for log in exit-$e.log test-suite.log; do
@@ -53,6 +53,6 @@ for e in $exit_statuses; do
done
$MAKE check TEST_LOG_DRIVER_FLAGS='--ignore-exit'
-$FGREP ".test - exited with status" *.log && Exit 1
+$FGREP ".test - exited with status" *.log && exit 1
:
diff --git a/t/tap-passthrough.sh b/t/tap-passthrough.sh
index 77bb2f0..380548f 100755
--- a/t/tap-passthrough.sh
+++ b/t/tap-passthrough.sh
@@ -20,7 +20,7 @@
# - TAP errors are reported in the log file too
# See also related test 'tap-passthrough-exit.test'.
-. ./defs || Exit 1
+. ./defs || exit 1
weirdchars=\''"address@hidden&()[]<>#;,:.^?*/'
@@ -46,7 +46,7 @@ ok # SKIP who cares?
$weirdchars
END
-$MAKE TESTS=ok.test check || { cat ok.log; Exit 1; }
+$MAKE TESTS=ok.test check || { cat ok.log; exit 1; }
cat ok.log
for rx in \
@@ -123,7 +123,7 @@ cat ko.log
cat bail.log
cat skip.log
cat err.log
-test $st -gt 0 || Exit 1
+test $st -gt 0 || exit 1
grep '^1\.\.1$' tiny.log
grep '^ok$' tiny.log
diff --git a/t/tap-plan-corner.sh b/t/tap-plan-corner.sh
index fcd26a5..044258e 100755
--- a/t/tap-plan-corner.sh
+++ b/t/tap-plan-corner.sh
@@ -17,7 +17,7 @@
# TAP support:
# - some corner cases for TAP plan
-. ./defs || Exit 1
+. ./defs || exit 1
. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
@@ -37,7 +37,7 @@ END
for pos in leading trailing; do
$MAKE TESTS="$pos-repeated.test" check >stdout \
- && { cat stdout; Exit 1; }
+ && { cat stdout; exit 1; }
cat stdout
count_test_results total=2 pass=1 fail=0 xpass=0 xfail=0 skip=0 error=1
grep "^ERROR: $pos-repeated\\.test - multiple test plans$" stdout
@@ -60,13 +60,13 @@ ok 2
END
$MAKE TESTS="leading-repeated.test trailing-repeated.test" check >stdout \
- && { cat stdout; Exit 1; }
+ && { cat stdout; exit 1; }
cat stdout
count_test_results total=6 pass=3 fail=0 xpass=0 xfail=0 skip=0 error=3
grep "^ERROR: leading-repeated\\.test - multiple test plans$" stdout
grep "^ERROR: trailing-repeated\\.test - multiple test plans$" stdout
grep "^ERROR: trailing-repeated\\.test 2 # AFTER LATE PLAN$" stdout
-grep "leading .*AFTER LATE PLAN" stdout && Exit 1
+grep "leading .*AFTER LATE PLAN" stdout && exit 1
# -------------------------------------------------------------------------
@@ -91,7 +91,7 @@ cat > 4.test <<END
END
$MAKE TESTS="1.test 2.test 3.test 4.test" check >stdout \
- && { cat stdout; Exit 1; }
+ && { cat stdout; exit 1; }
cat stdout
count_test_results total=8 pass=0 fail=0 xpass=0 xfail=0 skip=4 error=4
for i in 1 2 3 4; do
@@ -112,7 +112,7 @@ ok 4
ok 5
END
-$MAKE check >stdout && { cat stdout; Exit 1; }
+$MAKE check >stdout && { cat stdout; exit 1; }
cat stdout
count_test_results total=8 pass=5 fail=0 xpass=0 xfail=0 skip=0 error=3
@@ -143,7 +143,7 @@ ok 2
ok 3
END
-$MAKE check >stdout && { cat stdout; Exit 1; }
+$MAKE check >stdout && { cat stdout; exit 1; }
cat stdout
count_test_results total=5 pass=2 fail=0 xpass=0 xfail=0 skip=0 error=3
@@ -174,7 +174,7 @@ ok 4
ok 5
END
-$MAKE check >stdout && { cat stdout; Exit 1; }
+$MAKE check >stdout && { cat stdout; exit 1; }
cat stdout
count_test_results total=7 pass=3 fail=0 xpass=0 xfail=0 skip=0 error=4
diff --git a/t/tap-plan-errors.sh b/t/tap-plan-errors.sh
index e0f6272..21fd013 100755
--- a/t/tap-plan-errors.sh
+++ b/t/tap-plan-errors.sh
@@ -23,7 +23,7 @@
# and 'tap-skip-whole-badcount.test'. More checks about corner-cases
# in TAP plans are performed in 'tap-plan-corner.test'.
-. ./defs || Exit 1
+. ./defs || exit 1
. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
@@ -32,7 +32,7 @@ my_check ()
cat > all.test
test -n "$err" || fatal_ "\$err not set before calling my_check"
cat all.test # For debugging.
- $MAKE check >stdout && { cat stdout; Exit 1; }
+ $MAKE check >stdout && { cat stdout; exit 1; }
cat stdout
count_test_results "$@"
grep "^ERROR: all\\.test $err$" stdout
diff --git a/t/tap-plan-leading-zero.sh b/t/tap-plan-leading-zero.sh
index a3b78a5..ce6477d 100755
--- a/t/tap-plan-leading-zero.sh
+++ b/t/tap-plan-leading-zero.sh
@@ -19,7 +19,7 @@
# - TAP "SKIP" plans with multiple zeroes, as in "1..00 # SKIP"
# This is consistent with the behaviour of the 'prove' utility.
-. ./defs || Exit 1
+. ./defs || exit 1
. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
@@ -48,7 +48,7 @@ echo 1..00 > e.test
echo '1..000 # SKIP' > f.test
$MAKE TESTS='a.test b.test c.test d.test e.test f.test' check >stdout \
- || { cat stdout; Exit 1; }
+ || { cat stdout; exit 1; }
cat stdout
count_test_results total=115 pass=113 xfail=0 skip=2 fail=0 xpass=0 error=0
diff --git a/t/tap-plan-malformed.sh b/t/tap-plan-malformed.sh
index 274b07c..b89aa94 100755
--- a/t/tap-plan-malformed.sh
+++ b/t/tap-plan-malformed.sh
@@ -17,7 +17,7 @@
# TAP support: a malformed TAP plan is not recognized. The checks in
# here should be consistent with the behaviour of the 'prove' utility.
-. ./defs || Exit 1
+. ./defs || exit 1
. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
@@ -47,7 +47,7 @@ END
tests_list=$(echo *.test)
-$MAKE TESTS="$tests_list" check >stdout && { cat stdout; Exit 1; }
+$MAKE TESTS="$tests_list" check >stdout && { cat stdout; exit 1; }
cat stdout
count_test_results total=9 pass=2 fail=0 xpass=0 xfail=2 skip=0 error=5
diff --git a/t/tap-plan-middle.sh b/t/tap-plan-middle.sh
index b3b2cef..2538623 100755
--- a/t/tap-plan-middle.sh
+++ b/t/tap-plan-middle.sh
@@ -17,7 +17,7 @@
# TAP support:
# - test plan preceding and/or following non-result TAP lines
-. ./defs || Exit 1
+. ./defs || exit 1
. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
@@ -74,7 +74,7 @@ tests=$(echo *.test)
for tap_flags in "" "--comments"; do
$MAKE check TEST_LOG_DRIVER_FLAGS="$tap_flags" TESTS="$tests" >stdout \
- || { cat stdout; Exit 1; }
+ || { cat stdout; exit 1; }
cat stdout
count_test_results total=12 pass=7 xfail=2 skip=3 fail=0 xpass=0 error=0
done
diff --git a/t/tap-plan-whitespace.sh b/t/tap-plan-whitespace.sh
index b1c1f2f..122ff2f 100755
--- a/t/tap-plan-whitespace.sh
+++ b/t/tap-plan-whitespace.sh
@@ -17,7 +17,7 @@
# TAP support:
# - plan line with trailing whitespace is recognized and handled correctly
-. ./defs || Exit 1
+. ./defs || exit 1
. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
@@ -32,7 +32,7 @@ cat > bar.test <<END
ok 1
END
-$MAKE TESTS='foo.test bar.test' check >stdout || { cat stdout; Exit 1; }
+$MAKE TESTS='foo.test bar.test' check >stdout || { cat stdout; exit 1; }
cat stdout
count_test_results total=3 pass=3 fail=0 error=0 xpass=0 xfail=0 skip=0
diff --git a/t/tap-plan.sh b/t/tap-plan.sh
index 5a707fa..8106251 100755
--- a/t/tap-plan.sh
+++ b/t/tap-plan.sh
@@ -18,7 +18,7 @@
# - test scripts with the test plan at the beginning
# - test scripts with the test plan at the end
-. ./defs || Exit 1
+. ./defs || exit 1
. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
@@ -42,7 +42,7 @@ END
for tap_flags in "" "--comments"; do
$MAKE TEST_LOG_DRIVER_FLAGS="$tap_flags" TESTS="top.test bot.test" \
- check >stdout || { cat stdout; Exit 1; }
+ check >stdout || { cat stdout; exit 1; }
cat stdout
count_test_results total=7 pass=5 xfail=1 skip=1 fail=0 xpass=0 error=0
done
diff --git a/t/tap-planskip-and-logging.sh b/t/tap-planskip-and-logging.sh
index ce79129..3b999d1 100755
--- a/t/tap-planskip-and-logging.sh
+++ b/t/tap-planskip-and-logging.sh
@@ -18,7 +18,7 @@
# - interactions between "TAP plan with SKIP" and logging of earlier or
# later TAP or non-TAP text
-. ./defs || Exit 1
+. ./defs || exit 1
. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
@@ -46,7 +46,7 @@ a later non-TAP line
END
$MAKE TESTS='foo.test foo2.test bar.test' check >stdout \
- || { cat stdout; Exit 1; }
+ || { cat stdout; exit 1; }
cat stdout
count_test_results total=3 pass=0 fail=0 xpass=0 xfail=0 skip=3 error=0
diff --git a/t/tap-planskip-badexit.sh b/t/tap-planskip-badexit.sh
index 58ce0e7..1b20864 100755
--- a/t/tap-planskip-badexit.sh
+++ b/t/tap-planskip-badexit.sh
@@ -18,7 +18,7 @@
# - an exit status != 0 of a test script causes an hard error, even if
# the last line of output is a "SKIP plan" (e.g., "1..0 # SKIP").
-. ./defs || Exit 1
+. ./defs || exit 1
echo TESTS = one.test two.test > Makefile.am
@@ -38,7 +38,7 @@ END
chmod a+x one.test two.test
-$MAKE check >stdout && { cat stdout; Exit 1; }
+$MAKE check >stdout && { cat stdout; exit 1; }
cat stdout
# The 'prove' utility reports both the skip and the non-zero exit status,
diff --git a/t/tap-planskip-bailout.sh b/t/tap-planskip-bailout.sh
index 351aaba..255443d 100755
--- a/t/tap-planskip-bailout.sh
+++ b/t/tap-planskip-bailout.sh
@@ -18,7 +18,7 @@
# - a "Bail out!" directive causes an hard error, even if coming after
# a "SKIP plan" (e.g., "1..0 # SKIP").
-. ./defs || Exit 1
+. ./defs || exit 1
. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
@@ -27,7 +27,7 @@ cat > all.test <<END
Bail out!
END
-$MAKE check >stdout && { cat stdout; Exit 1; }
+$MAKE check >stdout && { cat stdout; exit 1; }
cat stdout
count_test_results total=2 pass=0 fail=0 xpass=0 xfail=0 skip=1 error=1
grep '^ERROR: all\.test - Bail out!' stdout
diff --git a/t/tap-planskip-case-insensitive.sh
b/t/tap-planskip-case-insensitive.sh
index f278e3d..61f1ea0 100755
--- a/t/tap-planskip-case-insensitive.sh
+++ b/t/tap-planskip-case-insensitive.sh
@@ -17,7 +17,7 @@
# TAP support:
# - "SKIP" keyword in a TAP plan is case-insensitive
-. ./defs || Exit 1
+. ./defs || exit 1
. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
@@ -32,7 +32,7 @@ for c4 in p P; do
echo "1..0 # $c1$c2$c3$c4 foobar" > $j.test
done; done; done; done
-$MAKE TESTS="$(echo *.test)" check >stdout || { cat stdout; Exit 1; }
+$MAKE TESTS="$(echo *.test)" check >stdout || { cat stdout; exit 1; }
cat stdout
count_test_results total=16 pass=0 fail=0 xpass=0 xfail=0 skip=16 error=0
diff --git a/t/tap-planskip-late.sh b/t/tap-planskip-late.sh
index 6f73bc2..50d74a9 100755
--- a/t/tap-planskip-late.sh
+++ b/t/tap-planskip-late.sh
@@ -18,7 +18,7 @@
# - the special "plan with SKIP" can also be used "late" in the TAP
# stream, i.e., preceded by non-TAP output or TAP diagnostic.
-. ./defs || Exit 1
+. ./defs || exit 1
. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
@@ -32,7 +32,7 @@ cat > bar.test <<END
1..0
END
-$MAKE TESTS='foo.test bar.test' check >stdout || { cat stdout; Exit 1; }
+$MAKE TESTS='foo.test bar.test' check >stdout || { cat stdout; exit 1; }
cat stdout
grep '^SKIP: foo\.test .* from the last line$' stdout
diff --git a/t/tap-planskip-later-errors.sh b/t/tap-planskip-later-errors.sh
index f216f88..3a403c7 100755
--- a/t/tap-planskip-later-errors.sh
+++ b/t/tap-planskip-later-errors.sh
@@ -17,7 +17,7 @@
# TAP support:
# - TAP errors following a "TAP plan with SKIP" are still diagnosed.
-. ./defs || Exit 1
+. ./defs || exit 1
. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
@@ -30,7 +30,7 @@ a non-TAP line
1..1
END
-$MAKE check >stdout && { cat stdout; Exit 1; }
+$MAKE check >stdout && { cat stdout; exit 1; }
cat stdout
count_test_results total=4 pass=0 fail=0 xpass=0 xfail=0 skip=1 error=3
diff --git a/t/tap-planskip-unplanned-corner.sh
b/t/tap-planskip-unplanned-corner.sh
index bebd398..98dd349 100755
--- a/t/tap-planskip-unplanned-corner.sh
+++ b/t/tap-planskip-unplanned-corner.sh
@@ -18,7 +18,7 @@
# - test results seen in a TAP stream that has a "plan with SKIP" are
# flagged as errors, even if all of them are "SKIP" results.
-. ./defs || Exit 1
+. ./defs || exit 1
. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
@@ -32,7 +32,7 @@ ok 1 # SKIP
1..0 # SKIP
END
-$MAKE TESTS='foo.test bar.test' check >stdout && { cat stdout; Exit 1; }
+$MAKE TESTS='foo.test bar.test' check >stdout && { cat stdout; exit 1; }
cat stdout
count_test_results total=5 pass=0 fail=0 xpass=0 xfail=0 skip=2 error=3
diff --git a/t/tap-planskip-unplanned.sh b/t/tap-planskip-unplanned.sh
index cfb1c60..01e5895 100755
--- a/t/tap-planskip-unplanned.sh
+++ b/t/tap-planskip-unplanned.sh
@@ -19,7 +19,7 @@
# been seen is an error
# - any test result following a "plan with skip" is an error.
-. ./defs || Exit 1
+. ./defs || exit 1
. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
@@ -27,7 +27,7 @@ cat > all.test <<END
ok 1
1..0 # SKIP too late
END
-$MAKE check >stdout && { cat stdout; Exit 1; }
+$MAKE check >stdout && { cat stdout; exit 1; }
cat stdout
count_test_results total=2 pass=1 fail=0 xpass=0 xfail=0 skip=0 error=1
grep '^ERROR: all\.test - too many tests run (expected 0, got 1)$' stdout
@@ -38,7 +38,7 @@ ok 2 # SKIP
not ok 3 # TODO
1..0 # SKIP too late
END
-$MAKE check >stdout && { cat stdout; Exit 1; }
+$MAKE check >stdout && { cat stdout; exit 1; }
cat stdout
count_test_results total=4 pass=1 fail=0 xpass=0 xfail=1 skip=1 error=1
grep '^ERROR: all\.test - too many tests run (expected 0, got 3)$' stdout
@@ -47,7 +47,7 @@ cat > all.test <<END
1..0 # SKIP falsified later
ok 1
END
-$MAKE check >stdout && { cat stdout; Exit 1; }
+$MAKE check >stdout && { cat stdout; exit 1; }
cat stdout
count_test_results total=3 pass=0 fail=0 xpass=0 xfail=0 skip=1 error=2
grep '^ERROR: all\.test 1 # UNPLANNED$' stdout
@@ -60,7 +60,7 @@ ok 2 # SKIP
not ok 3
not ok 4 # TODO
END
-$MAKE check >stdout && { cat stdout; Exit 1; }
+$MAKE check >stdout && { cat stdout; exit 1; }
cat stdout
count_test_results total=6 pass=0 fail=0 xpass=0 xfail=0 skip=1 error=5
grep '^ERROR: all\.test 1 # UNPLANNED$' stdout
diff --git a/t/tap-planskip-whitespace.sh b/t/tap-planskip-whitespace.sh
index 5822911..ca29d1a 100755
--- a/t/tap-planskip-whitespace.sh
+++ b/t/tap-planskip-whitespace.sh
@@ -18,7 +18,7 @@
# - normalization of whitespace in console testsuite progress associated
# with a SKIP directive in the TAP plan
-. ./defs || Exit 1
+. ./defs || exit 1
. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
@@ -35,7 +35,7 @@ cat > baz.test <<END
END
$MAKE TESTS='foo.test bar.test baz.test' check > stdout \
- || { cat stdout; Exit 1; }
+ || { cat stdout; exit 1; }
cat stdout
count_test_results total=3 pass=0 fail=0 error=0 xpass=0 xfail=0 skip=3
diff --git a/t/tap-planskip.sh b/t/tap-planskip.sh
index b762245..b160e48 100755
--- a/t/tap-planskip.sh
+++ b/t/tap-planskip.sh
@@ -17,7 +17,7 @@
# Basic TAP test protocol support:
# - special plan format to skip all the tests in a script
-. ./defs || Exit 1
+. ./defs || exit 1
. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
@@ -57,14 +57,14 @@ cat > mu.test <<END
END
$MAKE TESTS='foo.test bar.test baz.test wget.test curl.test mu.test' \
- check >stdout || { cat stdout; Exit 1; }
+ check >stdout || { cat stdout; exit 1; }
cat stdout
count_test_results total=6 pass=0 fail=0 xpass=0 xfail=0 skip=6 error=0
# Look for a regression where the "1..0" wasn't being stripped from the
# SKIP message.
-$FGREP '1..0' stdout && Exit 1
+$FGREP '1..0' stdout && exit 1
grep '^SKIP: foo\.test$' stdout
grep '^SKIP: bar\.test$' stdout
diff --git a/t/tap-realtime.sh b/t/tap-realtime.sh
index bca8f70..e3cac34 100755
--- a/t/tap-realtime.sh
+++ b/t/tap-realtime.sh
@@ -22,7 +22,7 @@
# children, and is pretty hacky and complex; is there a better way to
# accomplish the checks done here?
-. ./defs || Exit 1
+. ./defs || exit 1
cat >expect-check <<'END'
eval spawn $env(SHELL) -c ":"
@@ -30,7 +30,7 @@ expect eof
END
expect -f expect-check || {
echo "$me: failed to find a working expect program" >&2
- Exit 77
+ exit 77
}
rm -f expect-check
diff --git a/t/tap-recheck.sh b/t/tap-recheck.sh
index e689c2c..b158555 100755
--- a/t/tap-recheck.sh
+++ b/t/tap-recheck.sh
@@ -17,7 +17,7 @@
# Test the 'recheck' target for TAP test protocol.
# Keep in sync with 'test-driver-custom-multitest-recheck.test'.
-. ./defs || Exit 1
+. ./defs || exit 1
fetch_tap_driver
@@ -91,7 +91,7 @@ do_recheck ()
*) fatal_ "invalid usage of function 'do_recheck'";;
esac
rm -f *.run
- eval "\$MAKE recheck >stdout $on_bad_rc { cat stdout; ls -l; Exit 1; }; :"
+ eval "\$MAKE recheck >stdout $on_bad_rc { cat stdout; ls -l; exit 1; }; :"
cat stdout; ls -l
}
@@ -109,18 +109,18 @@ for vpath in : false; do
: A "make recheck" in a clean tree should run no tests.
do_recheck --pass
cat test-suite.log
- test ! -r a.run
- test ! -r a.log
- test ! -r b.run
- test ! -r b.log
- test ! -r c.run
- test ! -r c.log
- test ! -r d.run
- test ! -r d.log
+ test ! -e a.run
+ test ! -e a.log
+ test ! -e b.run
+ test ! -e b.log
+ test ! -e c.run
+ test ! -e c.log
+ test ! -e d.run
+ test ! -e d.log
count_test_results total=0 pass=0 fail=0 xpass=0 xfail=0 skip=0 error=0
: Run the tests for the first time.
- $MAKE check >stdout && { cat stdout; Exit 1; }
+ $MAKE check >stdout && { cat stdout; exit 1; }
cat stdout
ls -l
# All the test scripts should have run.
@@ -135,7 +135,7 @@ for vpath in : false; do
do_recheck --fail
# a.test has been successful the first time, so no need to re-run it.
# Similar considerations apply to similar checks, below.
- test ! -r a.run
+ test ! -e a.run
test -f b.run
test -f c.run
test -f d.run
@@ -144,8 +144,8 @@ for vpath in : false; do
: Let us make the first part of c.test pass.
echo OK > c.pass
do_recheck --fail
- test ! -r a.run
- test ! -r b.run
+ test ! -e a.run
+ test ! -e b.run
test -f c.run
test -f d.run
count_test_results total=5 pass=1 fail=1 xpass=1 xfail=1 skip=1 error=0
@@ -153,8 +153,8 @@ for vpath in : false; do
: Let us make also the second part of c.test pass.
echo KO > c.xfail
do_recheck --fail
- test ! -r a.run
- test ! -r b.run
+ test ! -e a.run
+ test ! -e b.run
test -f c.run
test -f d.run
count_test_results total=5 pass=1 fail=1 xpass=0 xfail=2 skip=1 error=0
@@ -162,9 +162,9 @@ for vpath in : false; do
: Nothing changed, so only d.test should be run.
for i in 1 2; do
do_recheck --fail
- test ! -r a.run
- test ! -r b.run
- test ! -r c.run
+ test ! -e a.run
+ test ! -e b.run
+ test ! -e c.run
test -f d.run
count_test_results total=2 pass=0 fail=1 xpass=0 xfail=0 skip=1 error=0
done
@@ -184,9 +184,9 @@ for vpath in : false; do
echo 'Bail out!'
END
do_recheck --fail
- test ! -r a.run
- test ! -r b.run
- test ! -r c.run
+ test ! -e a.run
+ test ! -e b.run
+ test ! -e c.run
test -f d.run
count_test_results total=11 pass=2 fail=4 xpass=1 xfail=0 skip=2 error=2
@@ -194,18 +194,18 @@ END
echo 'test_count=1' > d.count
echo : > d.extra
do_recheck --pass
- test ! -r a.run
- test ! -r b.run
- test ! -r c.run
+ test ! -e a.run
+ test ! -e b.run
+ test ! -e c.run
test -f d.run
count_test_results total=1 pass=0 fail=0 xpass=0 xfail=0 skip=1 error=0
: All tests have been successful or skipped, nothing should be re-run.
do_recheck --pass
- test ! -r a.run
- test ! -r b.run
- test ! -r c.run
- test ! -r d.run
+ test ! -e a.run
+ test ! -e b.run
+ test ! -e c.run
+ test ! -e d.run
count_test_results total=0 pass=0 fail=0 xpass=0 xfail=0 skip=0 error=0
cd $srcdir
diff --git a/t/tap-result-comment.sh b/t/tap-result-comment.sh
index 21bc810..4290751 100755
--- a/t/tap-result-comment.sh
+++ b/t/tap-result-comment.sh
@@ -17,7 +17,7 @@
# TAP support:
# - non-directive comments in TAP results are kept verbatim
-. ./defs || Exit 1
+. ./defs || exit 1
. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
@@ -30,7 +30,7 @@ not ok # TOD${tab}
ok 5 # ${tab}${tab}TOOD${tab}${sp}${sp}
END
-$MAKE check >stdout && { cat stdout; Exit 1; }
+$MAKE check >stdout && { cat stdout; exit 1; }
cat stdout
count_test_results total=5 pass=3 fail=2 xpass=0 xfail=0 skip=0 error=0
diff --git a/t/tap-signal.tap b/t/tap-signal.tap
index 43522cc..c969d10 100755
--- a/t/tap-signal.tap
+++ b/t/tap-signal.tap
@@ -17,7 +17,7 @@
# TAP support:
# - a test script terminated by a signal causes an hard error
-. ./defs || Exit 1
+. ./defs || exit 1
fetch_tap_driver
diff --git a/t/tap-test-number-0.sh b/t/tap-test-number-0.sh
index 7eb5e2e..e611edc 100755
--- a/t/tap-test-number-0.sh
+++ b/t/tap-test-number-0.sh
@@ -18,7 +18,7 @@
# - a test result numbered as 0 is to be considered out-of-order
# This is consistent with the behaviour of the 'prove' utility.
-. ./defs || Exit 1
+. ./defs || exit 1
if test $am_tap_implementation = perl; then
$PERL -MTAP::Parser -e 1 \
@@ -71,7 +71,7 @@ ok 0 # TODO
END
$MAKE TESTS='a.test b.test c.test d.test e.test' check >stdout \
- && { cat stdout; Exit 1; }
+ && { cat stdout; exit 1; }
cat stdout
count_test_results total=5 pass=0 fail=0 xpass=0 xfail=0 skip=0 error=5
diff --git a/t/tap-todo-skip-together.sh b/t/tap-todo-skip-together.sh
index 31580ca..b54013a 100755
--- a/t/tap-todo-skip-together.sh
+++ b/t/tap-todo-skip-together.sh
@@ -18,7 +18,7 @@
# - TODO and SKIP directives on the same line: the first one wins
# See also related test 'tap-ambiguous-directive.test'.
-. ./defs || Exit 1
+. ./defs || exit 1
. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
@@ -28,7 +28,7 @@ ok 1 # SKIP TODO
not ok 2 # TODO SKIP
END
-$MAKE check >stdout || { cat stdout; Exit 1; }
+$MAKE check >stdout || { cat stdout; exit 1; }
cat stdout
count_test_results total=2 pass=0 fail=0 xpass=0 xfail=1 skip=1 error=0
diff --git a/t/tap-todo-skip-whitespace.sh b/t/tap-todo-skip-whitespace.sh
index d36aa13..b9c8825 100755
--- a/t/tap-todo-skip-whitespace.sh
+++ b/t/tap-todo-skip-whitespace.sh
@@ -18,7 +18,7 @@
# - normalization of whitespace in console testsuite progress associated
# with TODO and SKIP directives
-. ./defs || Exit 1
+. ./defs || exit 1
. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
diff --git a/t/tap-todo-skip.sh b/t/tap-todo-skip.sh
index e03dc4e..368bd8e 100755
--- a/t/tap-todo-skip.sh
+++ b/t/tap-todo-skip.sh
@@ -23,7 +23,7 @@
# - the reasons for TODO and SKIP, if present, are nicely printed in
# the testsuite progress output
-. ./defs || Exit 1
+. ./defs || exit 1
. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
@@ -60,7 +60,7 @@ done; done; done; done; done >> all.test
cat all.test # For debugging.
-$MAKE check >stdout || { cat stdout; Exit 1; }
+$MAKE check >stdout || { cat stdout; exit 1; }
cat stdout
count_test_results total=256 pass=0 fail=0 xpass=0 xfail=128 skip=128 error=0
@@ -82,7 +82,7 @@ ok 8 - SKIP
ok 9
END
-$MAKE check >stdout || { cat stdout; Exit 1; }
+$MAKE check >stdout || { cat stdout; exit 1; }
cat stdout
count_test_results total=9 pass=9 fail=0 xpass=0 xfail=0 skip=0 error=0
diff --git a/t/tap-unplanned.sh b/t/tap-unplanned.sh
index ac7a266..262c801 100755
--- a/t/tap-unplanned.sh
+++ b/t/tap-unplanned.sh
@@ -17,7 +17,7 @@
# TAP support:
# - unplanned tests are properly reported as errors
-. ./defs || Exit 1
+. ./defs || exit 1
. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
@@ -26,7 +26,7 @@ cat > all.test <<END
ok 1
ok 2
END
-$MAKE check >stdout && { cat stdout; Exit 1; }
+$MAKE check >stdout && { cat stdout; exit 1; }
cat stdout
count_test_results total=3 pass=1 fail=0 xpass=0 xfail=0 skip=0 error=2
grep '^ERROR: all\.test - too many tests run (expected 1, got 2)$' stdout
@@ -38,7 +38,7 @@ ok 1
ok 2
ok 3
END
-$MAKE check >stdout && { cat stdout; Exit 1; }
+$MAKE check >stdout && { cat stdout; exit 1; }
cat stdout
count_test_results total=4 pass=2 fail=0 xpass=0 xfail=0 skip=0 error=2
grep '^ERROR: all\.test - too many tests run (expected 2, got 3)$' stdout
@@ -53,7 +53,7 @@ ok 3
not ok 4
ok 5 # SKIP
END
-$MAKE XFAIL_TESTS=all.test check >stdout && { cat stdout; Exit 1; }
+$MAKE XFAIL_TESTS=all.test check >stdout && { cat stdout; exit 1; }
cat stdout
count_test_results total=6 pass=0 fail=0 xpass=0 xfail=1 skip=1 error=4
grep '^ERROR: all\.test - too many tests run (expected 2, got 5)$' stdout
@@ -120,7 +120,7 @@ cat > t <<END
END
-$MAKE check >stdout && { cat stdout; Exit 1; }
+$MAKE check >stdout && { cat stdout; exit 1; }
cat stdout
count_test_results total=22 pass=1 fail=0 xpass=0 xfail=0 skip=0 error=21
@@ -146,7 +146,7 @@ for x in 'ok' 'ok 3' 'not ok' 'not ok # TODO' 'ok # TODO'
'ok # SKIP'; do
$x
1..2
END
- $MAKE check >stdout && { cat stdout; Exit 1; }
+ $MAKE check >stdout && { cat stdout; exit 1; }
cat stdout
test $($FGREP -c ': all.test' stdout) -eq 4
$EGREP '^PASS: all\.test 1($| )' stdout
diff --git a/t/tap-whitespace-normalization.sh
b/t/tap-whitespace-normalization.sh
index 3108fc6..2b1f627 100755
--- a/t/tap-whitespace-normalization.sh
+++ b/t/tap-whitespace-normalization.sh
@@ -20,7 +20,7 @@
# force us to tweak dozens of other tests (hopefully).
# See also related test 'tap-todo-skip-whitespace.test'.
-. ./defs || Exit 1
+. ./defs || exit 1
cat > Makefile.am << 'END'
TEST_LOG_COMPILER = cat
diff --git a/t/tap-with-and-without-number.sh b/t/tap-with-and-without-number.sh
index 82889c2..c69a40a 100755
--- a/t/tap-with-and-without-number.sh
+++ b/t/tap-with-and-without-number.sh
@@ -19,7 +19,7 @@
# - tests without explicit number get automatically numbered in the
# testsuite progress output on console
-. ./defs || Exit 1
+. ./defs || exit 1
. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
@@ -34,7 +34,7 @@ ok 6 # SKIP
ok zardoz
END
-$MAKE check >stdout || { cat stdout; Exit 1; }
+$MAKE check >stdout || { cat stdout; exit 1; }
cat stdout
count_test_results total=7 pass=4 fail=0 xpass=0 xfail=2 skip=1 error=0
diff --git a/t/tap-xfail-tests.sh b/t/tap-xfail-tests.sh
index 27c1804..aa86dca 100755
--- a/t/tap-xfail-tests.sh
+++ b/t/tap-xfail-tests.sh
@@ -17,7 +17,7 @@
# TAP and $(XFAIL_TESTS): test results without directives are turned from
# PASS to XPASS and from FAIL to XFAIL; other results are unchanged.
-. ./defs || Exit 1
+. ./defs || exit 1
. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
@@ -36,7 +36,7 @@ not ok 6 # SKIP
Bail out!
END
-$MAKE check >stdout && { cat stdout; Exit 1; }
+$MAKE check >stdout && { cat stdout; exit 1; }
cat stdout
count_test_results total=7 pass=0 fail=0 xpass=2 xfail=3 skip=1 error=1
@@ -59,7 +59,7 @@ ok 2 # SKIP
not ok 3 # TODO
END
-$MAKE check >stdout || { cat stdout; Exit 1; }
+$MAKE check >stdout || { cat stdout; exit 1; }
cat stdout
count_test_results total=3 pass=0 fail=0 xpass=0 xfail=2 skip=1 error=0
diff --git a/t/tar-override.sh b/t/tar-override.sh
index 0bf8ac7..c35234e 100755
--- a/t/tar-override.sh
+++ b/t/tar-override.sh
@@ -19,7 +19,7 @@
# FIXME: currently this works only when the tar format used is 'v7'
# FIXME: (which is the default one).
-. ./defs || Exit 1
+. ./defs || exit 1
cwd=$(pwd) || fatal_ "getting current working directory"
@@ -46,7 +46,7 @@ $AUTOMAKE
$MAKE dist
test -f $me-1.0.tar.gz
-ls | grep has-run && Exit 1
+ls | grep has-run && exit 1
rm -f *.tar.* *has-run*
diff --git a/t/tar.sh b/t/tar.sh
index 263049a..db3e489 100755
--- a/t/tar.sh
+++ b/t/tar.sh
@@ -16,7 +16,7 @@
# Check the tar-ustar option.
-. ./defs || Exit 1
+. ./defs || exit 1
cat > configure.ac << 'END'
AC_INIT([tar], [1.0])
diff --git a/t/tar2.sh b/t/tar2.sh
index f9cc000..5d49cc3 100755
--- a/t/tar2.sh
+++ b/t/tar2.sh
@@ -16,7 +16,7 @@
# Check the tar-pax option.
-. ./defs || Exit 1
+. ./defs || exit 1
cat > configure.ac << 'END'
AC_INIT([tar2], [1.0])
diff --git a/t/tar3.sh b/t/tar3.sh
index 65997b1..c09aa6f 100755
--- a/t/tar3.sh
+++ b/t/tar3.sh
@@ -16,7 +16,7 @@
# Check the tar options diagnostics.
-. ./defs || Exit 1
+. ./defs || exit 1
cat > configure.ac << 'END'
AC_INIT([tar2], [1.0])
diff --git a/t/target-cflags.sh b/t/target-cflags.sh
index 97a95d8..9b975d5 100755
--- a/t/target-cflags.sh
+++ b/t/target-cflags.sh
@@ -18,7 +18,7 @@
# Assar Westerlund <address@hidden>
required=cc
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
diff --git a/t/targetclash.sh b/t/targetclash.sh
index 43e227d..031cbc1 100755
--- a/t/targetclash.sh
+++ b/t/targetclash.sh
@@ -16,7 +16,7 @@
# Check that target clashes are diagnosed.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
diff --git a/t/test-driver-acsubst.sh b/t/test-driver-acsubst.sh
index 06c9a11..01ee259 100755
--- a/t/test-driver-acsubst.sh
+++ b/t/test-driver-acsubst.sh
@@ -17,7 +17,7 @@
# parallel-tests:
# - LOG_DRIVER variables can be AC_SUBST'd
-. ./defs || Exit 1
+. ./defs || exit 1
mkdir test-drivers
@@ -66,7 +66,7 @@ $AUTOCONF
cat > foo <<'END'
#!/bin/sh
echo "PASS: from $0"
-exit 1 # Exit status should be ignored by the trivial-test-driver.
+exit 1 # exit status should be ignored by the trivial-test-driver.
END
cat > bar.test <<'END'
@@ -88,7 +88,7 @@ cat test-suite.log
cat foo.log
cat bar.log
cat baz.log
-test $st -eq 0 || Exit 1
+test $st -eq 0 || exit 1
count_test_results total=3 pass=1 fail=0 skip=1 xfail=1 xpass=0 error=0
:
diff --git a/t/test-driver-cond.sh b/t/test-driver-cond.sh
index 3b941ed..cd90337 100755
--- a/t/test-driver-cond.sh
+++ b/t/test-driver-cond.sh
@@ -18,7 +18,7 @@
# - Automake can correctly handle conditionals contents for the
# LOG_DRIVER variables.
-. ./defs || Exit 1
+. ./defs || exit 1
cp "$am_testauxdir"/trivial-test-driver . \
|| fatal_ "failed to fetch auxiliary script trivial-test-driver"
@@ -58,7 +58,7 @@ cat > foo <<'END'
#!/bin/sh
echo "PASS: from $0"
echo "SKIP: from $0"
-exit 1 # Exit status should be ignored by the trivial-test-driver.
+exit 1 # exit status should be ignored by the trivial-test-driver.
END
cat > bar.test <<'END'
@@ -101,10 +101,10 @@ cat test-suite.log
cat foo.log
cat bar.log
cat baz.log
-test $st -eq 0 || Exit 1
+test $st -eq 0 || exit 1
do_count
-$MAKE distcheck >stdout || { cat stdout; Exit 1; }
+$MAKE distcheck >stdout || { cat stdout; exit 1; }
cat stdout
do_count
diff --git a/t/test-driver-create-log-dir.sh b/t/test-driver-create-log-dir.sh
index b789870..049a364 100755
--- a/t/test-driver-create-log-dir.sh
+++ b/t/test-driver-create-log-dir.sh
@@ -18,7 +18,7 @@
# e.g., 'sub/foo.log'), the Automake test harness must ensure that
# directory exists before calling any custom test driver.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_OUTPUT
diff --git a/t/test-driver-custom-multitest-recheck.sh
b/t/test-driver-custom-multitest-recheck.sh
index 504666e..04b3c54 100755
--- a/t/test-driver-custom-multitest-recheck.sh
+++ b/t/test-driver-custom-multitest-recheck.sh
@@ -22,7 +22,7 @@
# and 'parallel-tests-recheck-override.test'.
# Keep in sync with 'tap-recheck.test'.
-. ./defs || Exit 1
+. ./defs || exit 1
cp "$am_testauxdir"/trivial-test-driver . \
|| fatal_ "failed to fetch auxiliary script trivial-test-driver"
@@ -91,7 +91,7 @@ do_recheck ()
*) fatal_ "invalid usage of function 'do_recheck'";;
esac
rm -f *.run
- eval "\$MAKE recheck >stdout $on_bad_rc { cat stdout; ls -l; Exit 1; }; :"
+ eval "\$MAKE recheck >stdout $on_bad_rc { cat stdout; ls -l; exit 1; }; :"
cat stdout; ls -l
}
@@ -109,18 +109,18 @@ for vpath in : false; do
: A "make recheck" in a clean tree should run no tests.
do_recheck --pass
cat test-suite.log
- test ! -r a.run
- test ! -r a.log
- test ! -r b.run
- test ! -r b.log
- test ! -r c.run
- test ! -r c.log
- test ! -r d.run
- test ! -r d.log
+ test ! -e a.run
+ test ! -e a.log
+ test ! -e b.run
+ test ! -e b.log
+ test ! -e c.run
+ test ! -e c.log
+ test ! -e d.run
+ test ! -e d.log
count_test_results total=0 pass=0 fail=0 xpass=0 xfail=0 skip=0 error=0
: Run the tests for the first time.
- $MAKE check >stdout && { cat stdout; Exit 1; }
+ $MAKE check >stdout && { cat stdout; exit 1; }
cat stdout
ls -l
# All the test scripts should have run.
@@ -135,7 +135,7 @@ for vpath in : false; do
do_recheck --fail
# a.test has been successful the first time, so no need to re-run it.
# Similar considerations apply to similar checks, below.
- test ! -r a.run
+ test ! -e a.run
test -f b.run
test -f c.run
test -f d.run
@@ -144,8 +144,8 @@ for vpath in : false; do
: Let us make the first part of c.test pass.
echo OK > c.pass
do_recheck --fail
- test ! -r a.run
- test ! -r b.run
+ test ! -e a.run
+ test ! -e b.run
test -f c.run
test -f d.run
count_test_results total=5 pass=1 fail=1 xpass=1 xfail=1 skip=1 error=0
@@ -153,8 +153,8 @@ for vpath in : false; do
: Let us make also the second part of c.test pass.
echo KO > c.xfail
do_recheck --fail
- test ! -r a.run
- test ! -r b.run
+ test ! -e a.run
+ test ! -e b.run
test -f c.run
test -f d.run
count_test_results total=5 pass=1 fail=1 xpass=0 xfail=2 skip=1 error=0
@@ -162,9 +162,9 @@ for vpath in : false; do
: Nothing changed, so only d.test should be run.
for i in 1 2; do
do_recheck --fail
- test ! -r a.run
- test ! -r b.run
- test ! -r c.run
+ test ! -e a.run
+ test ! -e b.run
+ test ! -e c.run
test -f d.run
count_test_results total=2 pass=0 fail=1 xpass=0 xfail=0 skip=1 error=0
done
@@ -183,27 +183,27 @@ for vpath in : false; do
echo ERROR: e 2
END
do_recheck --fail
- test ! -r a.run
- test ! -r b.run
- test ! -r c.run
+ test ! -e a.run
+ test ! -e b.run
+ test ! -e c.run
test -f d.run
count_test_results total=11 pass=2 fail=4 xpass=1 xfail=0 skip=2 error=2
: Let us finally make d.test pass.
echo : > d.extra
do_recheck --pass
- test ! -r a.run
- test ! -r b.run
- test ! -r c.run
+ test ! -e a.run
+ test ! -e b.run
+ test ! -e c.run
test -f d.run
count_test_results total=1 pass=0 fail=0 xpass=0 xfail=0 skip=1 error=0
: All tests have been successful or skipped, nothing should be re-run.
do_recheck --pass
- test ! -r a.run
- test ! -r b.run
- test ! -r c.run
- test ! -r d.run
+ test ! -e a.run
+ test ! -e b.run
+ test ! -e c.run
+ test ! -e d.run
count_test_results total=0 pass=0 fail=0 xpass=0 xfail=0 skip=0 error=0
cd $srcdir
diff --git a/t/test-driver-custom-multitest-recheck2.sh
b/t/test-driver-custom-multitest-recheck2.sh
index 00be33d..a622c23 100755
--- a/t/test-driver-custom-multitest-recheck2.sh
+++ b/t/test-driver-custom-multitest-recheck2.sh
@@ -19,7 +19,7 @@
# check that this still works when we override $(TESTS) at make runtime.
# See also related tests 'test-driver-custom-multitest-recheck.test'.
-. ./defs || Exit 1
+. ./defs || exit 1
cp "$am_testauxdir"/trivial-test-driver . \
|| fatal_ "failed to fetch auxiliary script trivial-test-driver"
@@ -70,6 +70,7 @@ $AUTOCONF
$AUTOMAKE -a
for vpath in : false; do
+
if $vpath; then
mkdir build
cd build
@@ -81,7 +82,7 @@ for vpath in : false; do
$srcdir/configure
: Run the tests for the first time.
- $MAKE check >stdout && { cat stdout; Exit 1; }
+ $MAKE check >stdout && { cat stdout; exit 1; }
cat stdout
# All the test scripts should have run.
test -f a.run
@@ -92,57 +93,55 @@ for vpath in : false; do
rm -f *.run
: An empty '$(TESTS)' means that no test should be run.
- $MAKE TESTS= recheck >stdout || { cat stdout; Exit 1; }
+ $MAKE TESTS= recheck >stdout || { cat stdout; exit 1; }
cat stdout
count_test_results total=0 pass=0 fail=0 xpass=0 xfail=0 skip=0 error=0
- test ! -r a.run
- test ! -r b.run
- test ! -r c.run
+ test ! -e a.run
+ test ! -e b.run
+ test ! -e c.run
: a.test was successful the first time, no need to re-run it.
- $MAKE TESTS=a.test recheck >stdout || { cat stdout; Exit 1; }
+ $MAKE TESTS=a.test recheck >stdout || { cat stdout; exit 1; }
cat stdout
count_test_results total=0 pass=0 fail=0 xpass=0 xfail=0 skip=0 error=0
- test ! -r a.run
- test ! -r b.run
- test ! -r c.run
+ test ! -e a.run
+ test ! -e b.run
+ test ! -e c.run
: b.test failed, it should be re-run. And make it pass this time.
echo OK > b.ok
- $MAKE TESTS=b recheck >stdout || { cat stdout; Exit 1; }
+ $MAKE TESTS=b recheck >stdout || { cat stdout; exit 1; }
cat stdout
- test ! -r a.run
+ test ! -e a.run
test -f b.run
- test ! -r c.run
+ test ! -e c.run
count_test_results total=2 pass=0 fail=0 xpass=0 xfail=1 skip=1 error=0
rm -f *.run
: No need to re-run a.test or b.test anymore.
- $MAKE TESTS=b recheck >stdout || { cat stdout; Exit 1; }
+ $MAKE TESTS=b recheck >stdout || { cat stdout; exit 1; }
cat stdout
count_test_results total=0 pass=0 fail=0 xpass=0 xfail=0 skip=0 error=0
- test ! -r a.run
- test ! -r b.run
- test ! -r c.run
- $MAKE TESTS='a.test b.test' recheck >stdout || { cat stdout; Exit 1; }
+ test ! -e a.run
+ test ! -e b.run
+ test ! -e c.run
+ $MAKE TESTS='a.test b.test' recheck >stdout || { cat stdout; exit 1; }
cat stdout
count_test_results total=0 pass=0 fail=0 xpass=0 xfail=0 skip=0 error=0
- test ! -r a.run
- test ! -r b.run
- test ! -r c.run
+ test ! -e a.run
+ test ! -e b.run
+ test ! -e c.run
: No need to re-run a.test anymore, but c.test should be rerun,
: as it contained an XPASS. And this time, make it fail with
: an hard error.
- # Use 'echo' here, since Solaris 10 /bin/sh would try to optimize
- # a ':' away after the first iteration, even if it is redirected.
echo dummy > c.err
- $MAKE TESTS='a.test c' recheck >stdout && { cat stdout; Exit 1; }
+ $MAKE TESTS='a.test c' recheck >stdout && { cat stdout; exit 1; }
cat stdout
count_test_results total=1 pass=0 fail=0 xpass=0 xfail=0 skip=0 error=1
- test ! -r a.run
- test ! -r b.run
+ test ! -e a.run
+ test ! -e b.run
test -f c.run
rm -f *.run *.err
@@ -151,23 +150,23 @@ for vpath in : false; do
: This time, make it pass
# Use 'echo', not ':'; see comments above for why.
echo dummy > c.ok
- $MAKE TESTS='c.test a.test' recheck >stdout || { cat stdout; Exit 1; }
+ $MAKE TESTS='c.test a.test' recheck >stdout || { cat stdout; exit 1; }
cat stdout
count_test_results total=1 pass=1 fail=0 xpass=0 xfail=0 skip=0 error=0
- test ! -r a.run
- test ! -r b.run
+ test ! -e a.run
+ test ! -e b.run
test -f c.run
rm -f *.run *.err *.ok
: Nothing should be rerun anymore, as all tests have been eventually
: successful.
- $MAKE recheck >stdout || { cat stdout; Exit 1; }
+ $MAKE recheck >stdout || { cat stdout; exit 1; }
cat stdout
count_test_results total=0 pass=0 fail=0 xpass=0 xfail=0 skip=0 error=0
- test ! -r a.run
- test ! -r b.run
- test ! -r c.run
+ test ! -e a.run
+ test ! -e b.run
+ test ! -e c.run
cd $srcdir
diff --git a/t/test-driver-custom-multitest.sh
b/t/test-driver-custom-multitest.sh
index ed65c29..8d5c31a 100755
--- a/t/test-driver-custom-multitest.sh
+++ b/t/test-driver-custom-multitest.sh
@@ -19,7 +19,7 @@
# only checks implementation details in Automake's custom test drivers
# support, but also serves as a "usability test" for our APIs.
-. ./defs || Exit 1
+. ./defs || exit 1
cp "$am_testauxdir"/trivial-test-driver . \
|| fatal_ "failed to fetch auxiliary script trivial-test-driver"
@@ -128,14 +128,14 @@ for vpath in : false; do
$srcdir/configure
- $MAKE check >stdout && { cat stdout; cat test-suite.log; Exit 1; }
+ $MAKE check >stdout && { cat stdout; cat test-suite.log; exit 1; }
cat stdout
cat test-suite.log
# Couple of sanity checks. These might need to be updated if the
# 'trivial-test-driver' script is changed.
- $FGREP INVALID.NAME stdout test-suite.log && Exit 1
- test -f BAD.LOG && Exit 1
- test -f BAD.TRS && Exit 1
+ $FGREP INVALID.NAME stdout test-suite.log && exit 1
+ test -f BAD.LOG && exit 1
+ test -f BAD.TRS && exit 1
# These log files must all have been created by the testsuite.
cat pass.log
cat fail.log
@@ -168,7 +168,7 @@ for vpath in : false; do
test $(grep -c '%% ' test-suite.log) -eq 4
$MAKE TESTS='pass.t pass3-skip2-xfail.t' check >stdout \
- || { cat stdout; cat test-suite.log; Exit 1; }
+ || { cat stdout; cat test-suite.log; exit 1; }
cat test-suite.log
cat stdout
count_test_results total=7 pass=4 fail=0 skip=2 xfail=1 xpass=0 error=0
diff --git a/t/test-driver-custom-xfail-tests.sh
b/t/test-driver-custom-xfail-tests.sh
index 4a9e613..1da717f 100755
--- a/t/test-driver-custom-xfail-tests.sh
+++ b/t/test-driver-custom-xfail-tests.sh
@@ -16,7 +16,7 @@
# Custom test drivers: "abstract" XFAIL_TESTS support.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac <<'END'
AC_SUBST([nihil], [])
@@ -139,7 +139,7 @@ $AUTOMAKE --add-missing
./configure
-$MAKE check >stdout || { cat stdout; Exit 1; }
+$MAKE check >stdout || { cat stdout; exit 1; }
cat stdout
test $(grep -c '^PASS:' stdout) -eq 3
test $(grep -c '^XFAIL:' stdout) -eq 13
@@ -148,7 +148,7 @@ for dir in sub1 sub2; do
cd $dir
cp pass.test x1.test
cp x2.test pass.test
- $MAKE check >stdout && { cat stdout; Exit 1; }
+ $MAKE check >stdout && { cat stdout; exit 1; }
cat stdout
test "$(cat pass.trs)" = ":test-result: FAIL"
test "$(cat x1.trs)" = ":test-result: XPASS"
diff --git a/t/test-driver-custom.sh b/t/test-driver-custom.sh
index 2cc0886..15561a1 100755
--- a/t/test-driver-custom.sh
+++ b/t/test-driver-custom.sh
@@ -16,7 +16,7 @@
# Custom test drivers: per-extension test drivers.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_OUTPUT
@@ -131,8 +131,8 @@ $MAKE
VERBOSE=yes $MAKE check
ls -l . sub
-test ! -r BAD.log
-test ! -r BAD.trs
+test ! -e BAD.log
+test ! -e BAD.trs
echo 'chk-wrapper 1.chk --am-chk --chk' > 1.exp
echo 'test-wrapper 2.test -am-test -test' > 2.exp
@@ -147,4 +147,4 @@ for x in 1 2 3 4.c 5.suf sub/test; do
diff $x.exp $x.log || st=1
done
-Exit $st
+exit $st
diff --git a/t/test-driver-fail.sh b/t/test-driver-fail.sh
index 1a4f59b..5294a43 100755
--- a/t/test-driver-fail.sh
+++ b/t/test-driver-fail.sh
@@ -22,7 +22,7 @@
# (like our dummy one in this test) might leave around a test log even
# in case of internal failures.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac <<'END'
AC_OUTPUT
@@ -47,8 +47,8 @@ $AUTOMAKE -a
./configure
# The testsuite driver does not exist.
-$MAKE check && Exit 1
-test ! -f test-suite.log
+$MAKE check && exit 1
+test ! -e test-suite.log
# The testsuite driver exists and create the test log files, but fails.
@@ -60,7 +60,7 @@ exit 1
END
chmod a+x oops
-$MAKE check && Exit 1
-test ! -f test-suite.log
+$MAKE check && exit 1
+test ! -e test-suite.log
:
diff --git a/t/test-driver-is-distributed.sh b/t/test-driver-is-distributed.sh
index 44c5c1d..6e725c2 100755
--- a/t/test-driver-is-distributed.sh
+++ b/t/test-driver-is-distributed.sh
@@ -19,7 +19,7 @@
# defined in a subdir Makefile
am_create_testdir=empty
-. ./defs || Exit 1
+. ./defs || exit 1
ocwd=$(pwd) || fatal_ "getting current working directory"
diff --git a/t/test-driver-strip-vpath.sh b/t/test-driver-strip-vpath.sh
index b4bc4de..ddd04d2 100755
--- a/t/test-driver-strip-vpath.sh
+++ b/t/test-driver-strip-vpath.sh
@@ -17,7 +17,7 @@
# Custom test drivers: check that the test name passed to the test
# driver has any VPATH prefix stripped.
-. ./defs || Exit 1
+. ./defs || exit 1
ocwd=$(pwd) || fatal_ "cannot get current working directory"
diff --git a/t/test-extensions-cond.sh b/t/test-extensions-cond.sh
index d7f78db..73f617b 100755
--- a/t/test-extensions-cond.sh
+++ b/t/test-extensions-cond.sh
@@ -16,7 +16,7 @@
# Conditional definition of TEST_EXTENSIONS is supported.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_CONFIG_FILES([sub/Makefile])
diff --git a/t/test-extensions-dynamic.sh b/t/test-extensions-dynamic.sh
index e2dbc7d..b04dcca 100755
--- a/t/test-extensions-dynamic.sh
+++ b/t/test-extensions-dynamic.sh
@@ -16,7 +16,7 @@
# TEST_EXTENSIONS with contents dynamically determined at make time
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_SUBST([suf], [.tap])
diff --git a/t/test-extensions-funny-chars.sh b/t/test-extensions-funny-chars.sh
index e016112..5abc31d 100755
--- a/t/test-extensions-funny-chars.sh
+++ b/t/test-extensions-funny-chars.sh
@@ -17,7 +17,7 @@
# Make sure that Automake can handle "funny chars" in TEST_EXTENSIONS,
# as long as they can be used in GNU make variable names.
-. ./defs || Exit 1
+. ./defs || exit 1
fetch_tap_driver
@@ -93,8 +93,8 @@ cat baz.log
grep '@K @K @K' baz.log
cat bar.log
cat zardoz.log
-grep 'Hello Zardoz' zardoz.log && Exit 1
-test $st -eq 0 || Exit 1
+grep 'Hello Zardoz' zardoz.log && exit 1
+test $st -eq 0 || exit 1
count_all
$MAKE clean
@@ -114,18 +114,18 @@ test ! -f bar.log
test ! -f baz.log
cat zardoz.log
grep 'Hello Zardoz' zardoz.log
-test $st -gt 0 || Exit 1
+test $st -gt 0 || exit 1
-$MAKE recheck >stdout || { cat stdout; Exit 1; }
+$MAKE recheck >stdout || { cat stdout; exit 1; }
cat stdout
count_test_results total=1 pass=0 fail=0 skip=0 xfail=1 xpass=0 error=0
grep '^XFAIL: zardoz.l!Nu\.x$' stdout
-$MAKE recheck >stdout || { cat stdout; Exit 1; }
+$MAKE recheck >stdout || { cat stdout; exit 1; }
cat stdout
count_test_results total=0 pass=0 fail=0 skip=0 xfail=0 xpass=0 error=0
-$MAKE distcheck >stdout || { cat stdout; Exit 1; }
+$MAKE distcheck >stdout || { cat stdout; exit 1; }
cat stdout
count_all
diff --git a/t/test-extensions-invalid.sh b/t/test-extensions-invalid.sh
index 74058c6..ebc3c75 100755
--- a/t/test-extensions-invalid.sh
+++ b/t/test-extensions-invalid.sh
@@ -17,7 +17,7 @@
# Make sure that invalid entries in TEST_EXTENSIONS are diagnosed at
# make runtime. See automake bug#9400.
-. ./defs || Exit 1
+. ./defs || exit 1
echo AC_OUTPUT >> configure.ac
@@ -32,7 +32,7 @@ $AUTOMAKE -a
./configure
-$MAKE 2>stderr && { cat stderr >&2; Exit 1; }
+$MAKE 2>stderr && { cat stderr >&2; exit 1; }
cat stderr >&2
for suf in mu x1 _ x2; do
$FGREP "invalid test extension: '$suf'" stderr
@@ -40,6 +40,6 @@ done
# Verify that we don't report valid suffixes, even if intermixed
# with invalid ones.
-grep 'invalid.*extension.*foo' stderr && Exit 1
+grep 'invalid.*extension.*foo' stderr && exit 1
:
diff --git a/t/test-harness-vpath-rewrite.sh b/t/test-harness-vpath-rewrite.sh
index 0058b6d..85e4bbb 100755
--- a/t/test-harness-vpath-rewrite.sh
+++ b/t/test-harness-vpath-rewrite.sh
@@ -17,7 +17,7 @@
# Check that our concurrent test harness is not subject to spurious VPATH
# rewrites.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_OUTPUT
@@ -51,7 +51,7 @@ test -f bar.trs
test -f baz.log
test -f baz.trs
# We don't want VPATH rewrites, really.
-$MAKE check -n | $EGREP '\.\./(foo|bar|baz)( |$)' && Exit 1
+$MAKE check -n | $EGREP '\.\./(foo|bar|baz)( |$)' && exit 1
$MAKE distcheck
:
diff --git a/t/test-log.sh b/t/test-log.sh
index d0ed987..84a7b15 100755
--- a/t/test-log.sh
+++ b/t/test-log.sh
@@ -22,7 +22,7 @@
# - VERBOSE environment variable support
# Keep in sync with 'tap-log.test'.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac <<END
AC_OUTPUT
@@ -88,10 +88,10 @@ $AUTOMAKE -a
./configure
-$MAKE TEST_SUITE_LOG=my.log check && Exit 1
+$MAKE TEST_SUITE_LOG=my.log check && exit 1
ls -l # For debugging.
-test ! -f test-suite.log
-test ! -f global.log
+test ! -e test-suite.log
+test ! -e global.log
test -f my.log
st=0
for result in pass fail xfail xpass skip error; do
@@ -99,7 +99,7 @@ for result in pass fail xfail xpass skip error; do
$FGREP "$pmarker $result $pmarker" $result.log || st=1
$FGREP "$cmarker $result $cmarker" $result.log || st=1
done
-test $st -eq 0 || Exit 1
+test $st -eq 0 || exit 1
cat my.log # For debugging.
for result in xfail fail xpass skip error; do
cat $result.log # For debugging.
@@ -121,7 +121,7 @@ have_rst_section ()
}
# Passed test scripts shouldn't be mentioned in the global log.
-$EGREP ':.*[^x]pass' my.log && Exit 1
+$EGREP ':.*[^x]pass' my.log && exit 1
# But failing (expectedly or not) and skipped ones should.
have_rst_section 'SKIP: skip' my.log
have_rst_section 'FAIL: fail' my.log
@@ -132,13 +132,13 @@ have_rst_section 'ERROR: error' my.log
touch error2.log test-suite.log global.log
$MAKE TEST_SUITE_LOG=my.log mostlyclean
ls -l # For debugging.
-test ! -f my.log
-test ! -f pass.log
-test ! -f fail.log
-test ! -f xfail.log
-test ! -f xpass.log
-test ! -f skip.log
-test ! -f error.log
+test ! -e my.log
+test ! -e pass.log
+test ! -e fail.log
+test ! -e xfail.log
+test ! -e xpass.log
+test ! -e skip.log
+test ! -e error.log
# "make mostlyclean" shouldn't remove unrelated log files.
test -f error2.log
test -f test-suite.log
@@ -146,27 +146,27 @@ test -f global.log
rm -f *.log
-VERBOSE=yes $MAKE check >stdout && { cat stdout; Exit 1; }
+VERBOSE=yes $MAKE check >stdout && { cat stdout; exit 1; }
cat stdout
cat global.log
-test ! -f my.log
-test ! -f test-suite.log
+test ! -e my.log
+test ! -e test-suite.log
# Check that VERBOSE causes the global testsuite log to be
# emitted on stdout.
out=$(cat stdout)
log=$(cat global.log)
-case $out in *"$log"*) ;; *) Exit 1;; esac
+case $out in *"$log"*) ;; *) exit 1;; esac
touch error2.log test-suite.log my.log
$MAKE clean
ls -l # For debugging.
-test ! -f global.log
-test ! -f pass.log
-test ! -f fail.log
-test ! -f xfail.log
-test ! -f xpass.log
-test ! -f skip.log
-test ! -f error.log
+test ! -e global.log
+test ! -e pass.log
+test ! -e fail.log
+test ! -e xfail.log
+test ! -e xpass.log
+test ! -e skip.log
+test ! -e error.log
# "make clean" shouldn't remove unrelated log files.
test -f error2.log
test -f test-suite.log
diff --git a/t/test-logs-repeated.sh b/t/test-logs-repeated.sh
index 30aefca..881f67f 100755
--- a/t/test-logs-repeated.sh
+++ b/t/test-logs-repeated.sh
@@ -20,7 +20,7 @@
# different test scripts don't end up sharing the same log file.
# (Automake itself is such a project, BTW ;-)
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac <<END
AC_OUTPUT
diff --git a/t/test-metadata-global-log.sh b/t/test-metadata-global-log.sh
index 7faeb50..2fd00ad 100755
--- a/t/test-metadata-global-log.sh
+++ b/t/test-metadata-global-log.sh
@@ -20,7 +20,7 @@
# with the use of the reStructuredText field ':copy-in-global-log:' in
# the associated '.trs' files.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_OUTPUT
@@ -141,6 +141,6 @@ grep '^seen corn 1$' test-suite.log
grep '^seen corn 2$' test-suite.log
grep '^seen corn 31$' test-suite.log
grep '^seen corn 32$' test-suite.log
-$FGREP 'not seen' test-suite.log && Exit 1
+$FGREP 'not seen' test-suite.log && exit 1
:
diff --git a/t/test-metadata-global-result.sh b/t/test-metadata-global-result.sh
index 9633dbd..c93c2c8 100755
--- a/t/test-metadata-global-result.sh
+++ b/t/test-metadata-global-result.sh
@@ -18,7 +18,7 @@
# "global test result" in '*.trs' files, as documented in the automake
# manual.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_OUTPUT
@@ -142,7 +142,7 @@ cat > mu << 'END'
:test-result: PASS
END
-$MAKE check && Exit 1
+$MAKE check && exit 1
cat test-suite.log
have_result <<END
@@ -169,7 +169,7 @@ END
: > zar-doz.x
: > mu
-$MAKE check && Exit 1
+$MAKE check && exit 1
cat test-suite.log
have_result <<END
diff --git a/t/test-metadata-recheck.sh b/t/test-metadata-recheck.sh
index b8e4652..0fe67d4 100755
--- a/t/test-metadata-recheck.sh
+++ b/t/test-metadata-recheck.sh
@@ -17,7 +17,7 @@
# Test the "make recheck" semantics for custom test drivers, as documented
# in the Automake manual.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_OUTPUT
@@ -144,7 +144,7 @@ $AUTOMAKE -a
# The ':test-result:' fields should be ignored by "make recheck",
# but should cause the testsuite report to detect errors.
-$MAKE check && Exit 1
+$MAKE check && exit 1
ls -l
for t in $tests; do test -f $t.run; done
rm -f *.run
@@ -156,7 +156,7 @@ for iteration in 1 2; do
$MAKE recheck
ls -l
for t in $rechecked; do test -f $t.run; done
- find . -name 'n-*.run' | grep . && Exit 1
+ find . -name 'n-*.run' | grep . && exit 1
: For shells with busted 'set -e'.
done
diff --git a/t/test-metadata-results.sh b/t/test-metadata-results.sh
index 6fcdbb3..4435658 100755
--- a/t/test-metadata-results.sh
+++ b/t/test-metadata-results.sh
@@ -17,7 +17,7 @@
# Parallel testsuite harness: check APIs for the registering of test
# results in '*.trs' files, as documented in the automake manual.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_OUTPUT
@@ -54,10 +54,10 @@ mk_check ()
$MAKE check >stdout || st=$?
cat stdout
# Our dummy driver make no testsuite progress report.
- grep ': .*\.test' stdout && Exit 1
+ grep ': .*\.test' stdout && exit 1
# Nor it writes to the log files.
- test -s foo.log && Exit 1
- test -s bar.log && Exit 1
+ test -s foo.log && exit 1
+ test -s bar.log && exit 1
return $st
}
@@ -75,7 +75,7 @@ count_test_results ()
grep "^# FAIL: *$fail$" stdout || rc=1
grep "^# XPASS: *$xpass$" stdout || rc=1
grep "^# ERROR: *$error$" stdout || rc=1
- test $st -eq 0 || Exit 1
+ test $st -eq 0 || exit 1
}
$ACLOCAL
@@ -100,7 +100,7 @@ cat > bar <<END
:test-result: SKIP
:test-global-result: ERROR
END
-mk_check && Exit 1
+mk_check && exit 1
count_test_results total=2 pass=0 fail=1 xpass=0 xfail=0 skip=1 error=0
cat > foo.test <<END
@@ -119,7 +119,7 @@ END
cat > bar <<END
:test-global-result: PASS
END
-mk_check && Exit 1
+mk_check && exit 1
count_test_results total=1 pass=0 fail=1 xpass=0 xfail=0 skip=0 error=0
cat > foo.test <<END
@@ -148,11 +148,11 @@ cat > foo.test <<END
:test-result: ERROR
END
: > bar
-mk_check && Exit 1
+mk_check && exit 1
count_test_results total=6 pass=1 fail=1 xpass=1 xfail=1 skip=1 error=1
cp foo.test bar
-mk_check && Exit 1
+mk_check && exit 1
count_test_results total=12 pass=2 fail=2 xpass=2 xfail=2 skip=2 error=2
# Check that we are liberal w.r.t. whitespace use.
@@ -170,7 +170,7 @@ END
done
cat foo.test # For debugging.
cat bar # Likewise.
-mk_check && Exit 1
+mk_check && exit 1
count_test_results total=30 pass=5 fail=5 xpass=5 xfail=5 skip=5 error=5
:
diff --git a/t/test-missing.sh b/t/test-missing.sh
index 115aed9..fb7974c 100755
--- a/t/test-missing.sh
+++ b/t/test-missing.sh
@@ -16,7 +16,7 @@
# parallel-tests: non-existent scripts listed in TESTS get diagnosed.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_OUTPUT
@@ -35,22 +35,22 @@ $AUTOMAKE -a
./configure
-$MAKE check >stdout 2>stderr && { cat stdout; cat stderr >&2; Exit 1; }
+$MAKE check >stdout 2>stderr && { cat stdout; cat stderr >&2; exit 1; }
cat stdout; cat stderr >&2
test -f ok.log
grep '^PASS: ok\.test' stdout
$FGREP 'zardoz.log' stderr
-test ! -f test-suite.log
+test ! -e test-suite.log
-$MAKE TESTS='zardoz2.test' check 2>stderr && { cat stderr >&2; Exit 1; }
+$MAKE TESTS='zardoz2.test' check 2>stderr && { cat stderr >&2; exit 1; }
cat stderr
$FGREP 'zardoz2.log' stderr
-test ! -f test-suite.log
+test ! -e test-suite.log
-$MAKE TESTS='zardoz3' check 2>stderr && { cat stderr >&2; Exit 1; }
+$MAKE TESTS='zardoz3' check 2>stderr && { cat stderr >&2; exit 1; }
cat stderr >&2
$FGREP 'zardoz3.log' stderr
-test ! -f test-suite.log
+test ! -e test-suite.log
# The errors should persist even after 'test-suite.log'
# has been created.
@@ -59,9 +59,9 @@ test ! -f test-suite.log
$MAKE check
rm -f zardoz.test
-$MAKE check 2>stderr && { cat stderr >&2; Exit 1; }
+$MAKE check 2>stderr && { cat stderr >&2; exit 1; }
cat stderr >&2
$FGREP 'zardoz.log' stderr
-test ! -f test-suite.log
+test ! -e test-suite.log
:
diff --git a/t/test-trs-basic.sh b/t/test-trs-basic.sh
index fb614a3..7947e63 100755
--- a/t/test-trs-basic.sh
+++ b/t/test-trs-basic.sh
@@ -18,7 +18,7 @@
# - creation and removal of '.trs' auxiliary files
# - check some internals regarding the use of '.trs' files.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac <<END
AC_OUTPUT
@@ -92,22 +92,22 @@ test -f foo.trs
test -f bar.trs
test -f sub/zardoz.trs
$MAKE clean
-test ! -f foo.trs
-test ! -f bar.trs
-test ! -f sub/zardoz.trs
+test ! -e foo.trs
+test ! -e bar.trs
+test ! -e sub/zardoz.trs
# Unrelated '.trs' files shouldn't be removed.
test -f unrelated.trs
test -f sub/foo.trs
# The files should be properly created in case of testsuite failure too.
-FOO_STATUS=1 $MAKE check && Exit 1
+FOO_STATUS=1 $MAKE check && exit 1
test -f foo.trs
test -f bar.trs
test -f sub/zardoz.trs
$MAKE mostlyclean
-test ! -f foo.trs
-test ! -f bar.trs
-test ! -f sub/zardoz.trs
+test ! -e foo.trs
+test ! -e bar.trs
+test ! -e sub/zardoz.trs
# Unrelated '.trs' files shouldn't be removed.
test -f unrelated.trs
test -f sub/foo.trs
@@ -118,18 +118,18 @@ test -f sub/foo.trs
$MAKE TESTS=foo.test check
test -f foo.trs
-test ! -f bar.trs
-test ! -f sub/zardoz.trs
+test ! -e bar.trs
+test ! -e sub/zardoz.trs
$MAKE clean
-test ! -f foo.trs
+test ! -e foo.trs
$MAKE TESTS='foo.test bar.sh' check
test -f foo.trs
test -f bar.trs
-test ! -f sub/zardoz.trs
+test ! -e sub/zardoz.trs
# "make clean" shouldn't remove '.trs' files for tests not in $(TESTS).
$MAKE TESTS=bar.sh clean
test -f foo.trs
-test ! -f bar.trs
+test ! -e bar.trs
$MAKE clean
@@ -138,20 +138,20 @@ $MAKE clean
#
$MAKE TESTS=sub/zardoz check
-test ! -f foo.trs
-test ! -f bar.trs
+test ! -e foo.trs
+test ! -e bar.trs
test -f sub/zardoz.trs
$MAKE clean
-test ! -f sub/zardoz.trs
+test ! -e sub/zardoz.trs
$MAKE TESTS='foo bar' check
test -f foo.trs
test -f bar.trs
-test ! -f sub/zardoz.trs
+test ! -e sub/zardoz.trs
# "make clean" shouldn't remove '.trs' files for tests that are not
# in is not in $(TESTS).
$MAKE TESTS=foo clean
-test ! -f foo.trs
+test ! -e foo.trs
test -f bar.trs
-test ! -f sub/zardoz.trs
+test ! -e sub/zardoz.trs
:
diff --git a/t/test-trs-recover-parallel.sh b/t/test-trs-recover-parallel.sh
index fd8d183..bc8b51d 100755
--- a/t/test-trs-recover-parallel.sh
+++ b/t/test-trs-recover-parallel.sh
@@ -17,7 +17,7 @@
# Check parallel harness features:
# - recovery from deleted '.log' and '.trs' files, with parallel make
-. ./defs || Exit 1
+. ./defs || exit 1
all= log= trs=
for i in 1 2 3 4 5 6 7 8 9 10 11 12; do
diff --git a/t/test-trs-recover.sh b/t/test-trs-recover.sh
index e09d7f8..c782b91 100755
--- a/t/test-trs-recover.sh
+++ b/t/test-trs-recover.sh
@@ -19,7 +19,7 @@
# This test is complex and tricky, but that's acceptable since we are
# testing semantics that are potentially complex and tricky.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac <<END
AC_OUTPUT
@@ -30,9 +30,8 @@ TESTS = foo.test bar.test baz.test
TEST_LOG_COMPILER = $(SHELL)
END
-# Creative quoting below to please maintainer-check.
-echo exit '$TEST_STATUS' > foo.test
-echo exit '$TEST_STATUS' > bar.test
+echo 'exit $TEST_STATUS' > foo.test
+echo 'exit $TEST_STATUS' > bar.test
: > baz.test
TEST_STATUS=0; export TEST_STATUS
@@ -54,25 +53,25 @@ $MAKE check
rm -f foo.trs bar.trs baz.trs
$MAKE foo.trs
test -f foo.trs
-test ! -f bar.trs
-test ! -f baz.trs
+test ! -e bar.trs
+test ! -e baz.trs
: Recreate by hand, several at the same time.
rm -f foo.trs bar.trs baz.trs
$MAKE foo.trs bar.trs
test -f foo.trs
test -f bar.trs
-test ! -f baz.trs
+test ! -e baz.trs
: Recreate by hand, with a failing test.
rm -f foo.trs bar.trs
-TEST_STATUS=1 $MAKE bar.trs baz.trs >stdout || { cat stdout; Exit 1; }
+TEST_STATUS=1 $MAKE bar.trs baz.trs >stdout || { cat stdout; exit 1; }
cat stdout
-test ! -f foo.trs
+test ! -e foo.trs
test -f bar.trs
test -f baz.trs
grep '^FAIL: bar\.test' stdout
-$EGREP '^(baz|foo)\.test' stdout && Exit 1
+$EGREP '^(baz|foo)\.test' stdout && exit 1
: Recreate with a sweeping "make check", and ensure that also up-to-date
: '.trs' files are remade.
@@ -87,7 +86,7 @@ is_newest baz.trs stamp
: ensure that also up-to-date '.trs' files are remade -- this time we
: grep the "make check" output verify that.
rm -f foo.trs bar.trs
-TEST_STATUS=1 $MAKE check >stdout && { cat stdout; Exit 1; }
+TEST_STATUS=1 $MAKE check >stdout && { cat stdout; exit 1; }
test -f foo.trs
test -f bar.trs
grep '^FAIL: foo\.test' stdout
@@ -98,27 +97,27 @@ grep '^PASS: baz\.test' stdout
rm -f foo.trs bar.trs baz.trs
$MAKE TESTS=foo.test check
test -f foo.trs
-test ! -f bar.trs
-test ! -f baz.trs
+test ! -e bar.trs
+test ! -e baz.trs
: Recreate with a "make check" with redefined suffix-less TESTS.
rm -f foo.trs bar.trs baz.trs
$MAKE TESTS=bar check
-test ! -f foo.trs
+test ! -e foo.trs
test -f bar.trs
-test ! -f baz.trs
+test ! -e baz.trs
: Interactions with "make recheck" are OK.
rm -f foo.trs bar.trs baz.log baz.trs
-$MAKE recheck >stdout || { cat stdout; Exit 1; }
+$MAKE recheck >stdout || { cat stdout; exit 1; }
cat stdout
test -f foo.trs
test -f bar.trs
-test ! -f baz.trs
-test ! -f baz.log
+test ! -e baz.trs
+test ! -e baz.log
grep '^PASS: foo\.test' stdout
grep '^PASS: bar\.test' stdout
-grep 'baz\.test' stdout && Exit 1
+grep 'baz\.test' stdout && exit 1
count_test_results total=2 pass=2 fail=0 xpass=0 xfail=0 skip=0 error=0
: Setup for the next check.
@@ -131,11 +130,11 @@ test -f baz.trs
: '.trs' files are *not* remade.
update_stamp
rm -f foo.trs bar.trs test-suite.log
-$MAKE test-suite.log >stdout || { cat stdout; Exit 1; }
+$MAKE test-suite.log >stdout || { cat stdout; exit 1; }
cat stdout
grep '^PASS: foo\.test' stdout
grep '^PASS: bar\.test' stdout
-grep 'baz\.test' stdout && Exit 1
+grep 'baz\.test' stdout && exit 1
stat *.trs *.log stamp || : # For debugging.
# Check that make has updated what it needed to, but no more.
test -f foo.trs
@@ -153,7 +152,7 @@ test -f baz.trs
rm -f foo.trs
update_stamp
touch bar.test
-$MAKE AM_LAZY_CHECK=yes check >stdout || { cat stdout; Exit 1; }
+$MAKE AM_LAZY_CHECK=yes check >stdout || { cat stdout; exit 1; }
cat stdout
# Check that make has updated what it needed to, but no more.
test -f foo.trs
@@ -161,6 +160,6 @@ is_newest bar.trs bar.test
is_newest stamp baz.trs
grep '^PASS: foo\.test' stdout
grep '^PASS: bar\.test' stdout
-grep 'baz\.test' stdout && Exit 1
+grep 'baz\.test' stdout && exit 1
:
diff --git a/t/tests-environment-and-log-compiler.sh
b/t/tests-environment-and-log-compiler.sh
index 65855ce..9184a5e 100755
--- a/t/tests-environment-and-log-compiler.sh
+++ b/t/tests-environment-and-log-compiler.sh
@@ -18,7 +18,7 @@
# by TESTS_ENVIRONMENT and AM_TESTS_ENVIRONMENT in LOG_COMPILER and
# LOG_FLAGS (for tests both with and without registered extensions).
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_OUTPUT
diff --git a/t/tests-environment-backcompat.sh
b/t/tests-environment-backcompat.sh
index db370ab..a82f297 100755
--- a/t/tests-environment-backcompat.sh
+++ b/t/tests-environment-backcompat.sh
@@ -20,7 +20,7 @@
# for this). The behaviour tested here is also documented in the manual.
am_serial_tests=yes
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac <<END
AC_SUBST([PERL], ['$PERL'])
diff --git a/t/tests-environment-fd-redirect.sh
b/t/tests-environment-fd-redirect.sh
index 6c42fd4..5780e57 100755
--- a/t/tests-environment-fd-redirect.sh
+++ b/t/tests-environment-fd-redirect.sh
@@ -26,7 +26,7 @@
# and the following CC:ed thread on bug-autoconf list:
# <http://lists.gnu.org/archive/html/bug-autoconf/2011-06/msg00002.html>
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_OUTPUT
@@ -79,13 +79,13 @@ for sh in "$SHELL" "$bin_ksh"; do
END
$AUTOMAKE -a
CONFIG_SHELL="$sh" $sh ./configure CONFIG_SHELL="$sh"
- VERBOSE=y $MAKE check >stdout || { cat stdout; Exit 1; }
+ VERBOSE=y $MAKE check >stdout || { cat stdout; exit 1; }
cat stdout
grep '[ /]foo\.test: foofoofoo$' stdout
grep '[ /]foo\.test: barbarbar$' stdout
grep '[ /]bar\.test: 8888$' stdout
grep '[ /]bar\.test: 9999$' stdout
- $EGREP '(foofoofoo|barbarbar|8888|9999)' foo.log && Exit 1
+ $EGREP '(foofoofoo|barbarbar|8888|9999)' foo.log && exit 1
: # For shells with buggy 'set -e'.
done
done
diff --git a/t/tests-environment.sh b/t/tests-environment.sh
index 62ca4ee..d6f219d 100755
--- a/t/tests-environment.sh
+++ b/t/tests-environment.sh
@@ -17,7 +17,7 @@
# "Simple Tests" testsuite driver: check TESTS_ENVIRONMENT support.
am_serial_tests=yes
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_OUTPUT
@@ -41,6 +41,6 @@ $AUTOMAKE -a
./configure
FOO=bad TESTS_ENVIRONMENT='FOO=ok' $MAKE check
-FOO=ok TESTS_ENVIRONMENT='FOO=bad' $MAKE check && Exit 1
+FOO=ok TESTS_ENVIRONMENT='FOO=bad' $MAKE check && exit 1
:
diff --git a/t/testsuite-summary-color.sh b/t/testsuite-summary-color.sh
index 0f00708..c73ca45 100755
--- a/t/testsuite-summary-color.sh
+++ b/t/testsuite-summary-color.sh
@@ -16,12 +16,12 @@
# Check coloring of the testsuite summary.
-. ./defs-static || Exit 1
+. ./defs-static || exit 1
use_colors=yes
use_vpath=no
-. "$am_testauxdir"/testsuite-summary-checks.sh || Exit 99
+. "$am_testauxdir"/testsuite-summary-checks.sh || exit 99
./configure
diff --git a/t/testsuite-summary-count-many.sh
b/t/testsuite-summary-count-many.sh
index b101206..938c91e 100755
--- a/t/testsuite-summary-count-many.sh
+++ b/t/testsuite-summary-count-many.sh
@@ -19,7 +19,7 @@
# Incidentally, this test also checks that the testsuite summary doesn't
# give any bug-report address if it's not defined.
-. ./defs || Exit 1
+. ./defs || exit 1
for s in trivial-test-driver extract-testsuite-summary.pl; do
cp "$am_testauxdir/$s" . || fatal_ "failed to fetch auxiliary script $s"
@@ -97,6 +97,6 @@ test -f make.fail
$PERL extract-testsuite-summary.pl stdout > summary.got
cat summary.exp
cat summary.got
-diff summary.exp summary.got || Exit 1
+diff summary.exp summary.got || exit 1
:
diff --git a/t/testsuite-summary-count.sh b/t/testsuite-summary-count.sh
index 8d2ce74..265eebf 100755
--- a/t/testsuite-summary-count.sh
+++ b/t/testsuite-summary-count.sh
@@ -16,12 +16,12 @@
# Check test counts in the testsuite summary.
-. ./defs-static || Exit 1
+. ./defs-static || exit 1
use_colors=no
use_vpath=no
-. "$am_testauxdir"/testsuite-summary-checks.sh || Exit 99
+. "$am_testauxdir"/testsuite-summary-checks.sh || exit 99
./configure
diff --git a/t/testsuite-summary-reference-log.sh
b/t/testsuite-summary-reference-log.sh
index 85049be..5b84c17 100755
--- a/t/testsuite-summary-reference-log.sh
+++ b/t/testsuite-summary-reference-log.sh
@@ -17,7 +17,7 @@
# Check that the global testsuite log file referenced in the testsuite
# summary and in the global testsuite log itself is correct.
-. ./defs || Exit 1
+. ./defs || exit 1
mv configure.ac configure.stub
@@ -45,12 +45,12 @@ cd build
../configure
-$MAKE check >stdout && { cat stdout; Exit 1; }
+$MAKE check >stdout && { cat stdout; exit 1; }
cat stdout
grep '^See \./my_test_suite\.log$' stdout
mkdir bar
-$MAKE TEST_SUITE_LOG=bar/bar.log check >stdout && { cat stdout; Exit 1; }
+$MAKE TEST_SUITE_LOG=bar/bar.log check >stdout && { cat stdout; exit 1; }
cat stdout
grep '^See \./bar/bar\.log$' stdout
@@ -71,16 +71,16 @@ $AUTOCONF --force
$AUTOMAKE
./configure
-$MAKE check >stdout && { cat stdout; Exit 1; }
+$MAKE check >stdout && { cat stdout; exit 1; }
cat stdout
grep '^See sub/test-suite\.log$' stdout
cd sub
-$MAKE check >stdout && { cat stdout; Exit 1; }
+$MAKE check >stdout && { cat stdout; exit 1; }
cat stdout
grep '^See sub/test-suite\.log$' stdout
cd ..
-$MAKE TEST_SUITE_LOG=foo.log check >stdout && { cat stdout; Exit 1; }
+$MAKE TEST_SUITE_LOG=foo.log check >stdout && { cat stdout; exit 1; }
cat stdout
grep '^See sub/foo\.log$' stdout
diff --git a/t/transform.sh b/t/transform.sh
index 6a89862..aa07970 100755
--- a/t/transform.sh
+++ b/t/transform.sh
@@ -17,7 +17,7 @@
# Make sure that --program-transform works.
required=cc
-. ./defs || Exit 1
+. ./defs || exit 1
cat >>configure.ac <<'END'
AC_PROG_CC
diff --git a/t/transform2.sh b/t/transform2.sh
index 357e6b7..cab5f1a 100755
--- a/t/transform2.sh
+++ b/t/transform2.sh
@@ -18,7 +18,7 @@
# collapsed.
required=cc
-. ./defs || Exit 1
+. ./defs || exit 1
cat >>configure.ac <<'END'
AC_PROG_CC
diff --git a/t/transform3.sh b/t/transform3.sh
index b549825..156e46d 100755
--- a/t/transform3.sh
+++ b/t/transform3.sh
@@ -18,7 +18,7 @@
# stuff (in particular, pgklibdir, pkgdatadir and pkglibexecdir).
required=cc
-. ./defs || Exit 1
+. ./defs || exit 1
cat > configure.ac <<'END'
AC_INIT([foo], [1.0])
diff --git a/t/txinfo-include.sh b/t/txinfo-include.sh
index dd4d633..9b609bd 100755
--- a/t/txinfo-include.sh
+++ b/t/txinfo-include.sh
@@ -18,7 +18,7 @@
# and VPATH builds, and both top-level and subdir input.
required='makeinfo tex texi2dvi'
-. ./defs || Exit 1
+. ./defs || exit 1
echo AC_OUTPUT >> configure.ac
diff --git a/t/txinfo-no-clutter.sh b/t/txinfo-no-clutter.sh
index 43b83da..558f8e1 100755
--- a/t/txinfo-no-clutter.sh
+++ b/t/txinfo-no-clutter.sh
@@ -14,19 +14,28 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-# The pdf, ps and dvi targets shouldn't let clutter in the build directory.
-# Related to automake bug#11146.
+# The info, html, pdf, ps and dvi targets shouldn't let clutter in the
+# build directory. Related to automake bug#11146.
required='makeinfo tex texi2dvi dvips'
-. ./defs || Exit 1
+. ./defs || exit 1
-mkdir sub
-
-echo AC_OUTPUT >> configure.ac
+cat >> configure.ac <<'END'
+AC_CONFIG_FILES([sub/Makefile])
+AC_OUTPUT
+END
cat > Makefile.am << 'END'
-all-local: ps pdf dvi html
-info_TEXINFOS = foo.texi sub/bar.texi
+all-local: ps pdf dvi html # For "make distcheck".
+info_TEXINFOS = foo.texi doc/bar.texi baz.texi
+SUBDIRS = sub
+END
+
+mkdir sub doc
+
+cat > sub/Makefile.am << 'END'
+all-local: ps pdf dvi html # For "make distcheck".
+info_TEXINFOS = baz.texi
END
cat > foo.texi << 'END'
@@ -39,7 +48,7 @@ Hello walls.
@bye
END
-cat > sub/bar.texi << 'END'
+cat > doc/bar.texi << 'END'
\input texinfo
@setfilename bar.info
@settitle bar
@@ -53,15 +62,6 @@ cat > baz.texi << 'END'
\input texinfo
@setfilename baz.info
@settitle baz
address@hidden Top
-Hello walls.
address@hidden
-END
-
-cat > baz.texi << 'END'
-\input texinfo
address@hidden baz.info
address@hidden baz
@defindex au
@defindex sa
@defindex sb
@@ -81,6 +81,8 @@ sb
@bye
END
+cp baz.texi sub
+
$ACLOCAL
$AUTOMAKE --add-missing
$AUTOCONF
@@ -91,11 +93,53 @@ $AUTOCONF
# clean up potential cruft left by earlier ones.
for fmt in info pdf ps dvi html all; do
$MAKE $fmt
- ls -l . sub # For debugging.
- ls -d foo* baz* sub/bar* > lst
- $EGREP -v '^(foo|sub/bar|baz)\.(texi|dvi|ps|pdf|html|info|t2[dp])$' \
- lst && Exit 1
- $MAKE clean
+ # For debugging.
+ ls -l . doc sub
+ # Sanity check.
+ case $fmt in
+ html)
+ test -e foo.html
+ test -e doc/bar.html
+ test -e baz.html
+ test -e sub/baz.html
+ ;;
+ all)
+ for x in info pdf ps dvi; do
+ test -f foo.$x
+ test -f doc/bar.$x
+ test -f baz.$x
+ test -f sub/baz.$x
+ done
+ test -e foo.html
+ test -e doc/bar.html
+ test -e baz.html
+ test -e sub/baz.html
+ ;;
+ *)
+ test -f foo.$fmt
+ test -f doc/bar.$fmt
+ test -f baz.$fmt
+ test -f sub/baz.$fmt
+ ;;
+ esac
+ # Real test.
+ ls -d foo* baz* sub/baz* doc/bar* > lst
+ basename_rx='(foo|doc/bar|baz|sub/baz)'
+ case $fmt in
+ pdf) extension_rx="(texi|pdf|t2p)";;
+ dvi) extension_rx="(texi|dvi|t2d)";;
+ ps) extension_rx="(texi|ps|dvi|t2d)";;
+ info) extension_rx="(texi|info)";;
+ html) extension_rx="(texi|html)";;
+ all) extension_rx="(texi|html|info|pdf|ps|dvi|t2[pd])";;
+ *) fatal_ "unreachable code reached";;
+ esac
+ $EGREP -v "^$basename_rx\.$extension_rx$" lst && exit 1
+ # Cleanup for checks on the next format.
+ case $fmt in
+ info) rm -f *.info doc/*.info sub/*.info;;
+ *) $MAKE clean;;
+ esac
done
$MAKE distcheck
diff --git a/t/txinfo-rules-once.sh b/t/txinfo-rules-once.sh
index c35ce9a..12e8a84 100755
--- a/t/txinfo-rules-once.sh
+++ b/t/txinfo-rules-once.sh
@@ -16,7 +16,7 @@
# Some grepping checks on Texinfo support.
-. ./defs || Exit 1
+. ./defs || exit 1
echo AC_OUTPUT >> configure.ac
diff --git a/t/txinfo-unrecognized-extension-2.sh
b/t/txinfo-unrecognized-extension-2.sh
index aef97a9..ac52e4a 100755
--- a/t/txinfo-unrecognized-extension-2.sh
+++ b/t/txinfo-unrecognized-extension-2.sh
@@ -17,7 +17,7 @@
# Test that automake complains properly when texinfo input files
# specify output info files with an invalid extension.
-. ./defs || Exit 1
+. ./defs || exit 1
cat > Makefile.am << 'END'
info_TEXINFOS = foo.texi bar.texi baz.texi
diff --git a/t/txinfo-unrecognized-extension.sh
b/t/txinfo-unrecognized-extension.sh
index 2516580..96b5f91 100755
--- a/t/txinfo-unrecognized-extension.sh
+++ b/t/txinfo-unrecognized-extension.sh
@@ -17,7 +17,7 @@
# Test that automake complains properly when the files with unrecognized
# extensions are passed to the TEXINFOS primary.
-. ./defs || Exit 1
+. ./defs || exit 1
cat > Makefile.am << 'END'
info_TEXINFOS = foobar.foo bazquux.tex zardoz.c
diff --git a/t/txinfo.sh b/t/txinfo.sh
index 66d925f..3c73ecd 100755
--- a/t/txinfo.sh
+++ b/t/txinfo.sh
@@ -18,7 +18,7 @@
# Jim Meyering.
required=makeinfo
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac <<'END'
AC_OUTPUT
diff --git a/t/txinfo10.sh b/t/txinfo10.sh
index 6908ab8..903d6f5 100755
--- a/t/txinfo10.sh
+++ b/t/txinfo10.sh
@@ -17,7 +17,7 @@
# Make sure dvi target recurses into subdir.
# Reported by Pavel Roskin.
-. ./defs || Exit 1
+. ./defs || exit 1
cat > Makefile.am << 'END'
SUBDIRS = sub
diff --git a/t/txinfo13.sh b/t/txinfo13.sh
index d3a7079..a98254c 100755
--- a/t/txinfo13.sh
+++ b/t/txinfo13.sh
@@ -19,7 +19,7 @@
# from Vincent Lefevre).
required='makeinfo tex texi2dvi'
-. ./defs || Exit 1
+. ./defs || exit 1
echo AC_OUTPUT >> configure.ac
@@ -61,5 +61,7 @@ cd build
../configure
$MAKE distcheck
test -f ../subdir/main.info
-test ! -f subdir/main.info
+test ! -e subdir/main.info
test -f ../subdir/main.info.bak
+
+:
diff --git a/t/txinfo16.sh b/t/txinfo16.sh
index 173a87a..f4c1cee 100755
--- a/t/txinfo16.sh
+++ b/t/txinfo16.sh
@@ -18,7 +18,7 @@
# not in $(builddir).
required='makeinfo tex texi2dvi'
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_OUTPUT
@@ -47,11 +47,11 @@ cd build
../configure
$MAKE
test -f ../main.info
-test ! -f main.info
+test ! -e main.info
test -f ../stamp-vti
-test ! -f stamp-vti
+test ! -e stamp-vti
test -f ../version.texi
-test ! -f version.texi
+test ! -e version.texi
cd ..
rm -rf build make.info* stamp-vti version.texi
@@ -82,7 +82,7 @@ $MAKE
# stamp-vti is newer than version.texi, the 'version.texi: stamp-vti'
# rule is always triggered. Still that's not a reason for 'make'
# to think 'version.texi' has been created...
-test ! -f main.info
+test ! -e main.info
$MAKE dvi
test -f main.dvi
diff --git a/t/txinfo17.sh b/t/txinfo17.sh
index f743853..20c7ecc 100755
--- a/t/txinfo17.sh
+++ b/t/txinfo17.sh
@@ -17,7 +17,7 @@
# Make sure Automake uses the _first_ @setfilname it sees.
# Report from Karl Berry.
-. ./defs || Exit 1
+. ./defs || exit 1
cat > Makefile.am << 'END'
info_TEXINFOS = texinfo.texi
@@ -35,7 +35,7 @@ END
$ACLOCAL
$AUTOMAKE --add-missing
-grep 'foobar' Makefile.in && Exit 1
+grep 'foobar' Makefile.in && exit 1
grep 'texinfo\.info:' Makefile.in
:
diff --git a/t/txinfo2.sh b/t/txinfo2.sh
index 70a9e94..78a4271 100755
--- a/t/txinfo2.sh
+++ b/t/txinfo2.sh
@@ -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
cat >> configure.ac << 'END'
AC_OUTPUT
diff --git a/t/txinfo20.sh b/t/txinfo20.sh
index 98c044e..6faba38 100755
--- a/t/txinfo20.sh
+++ b/t/txinfo20.sh
@@ -17,7 +17,7 @@
# Make sure info files survive makeinfo errors.
required=makeinfo
-. ./defs || Exit 1
+. ./defs || exit 1
echo AC_OUTPUT >> configure.ac
@@ -62,16 +62,16 @@ 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.info
test -f main.info-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.info
-test ! -f main.info-1
+test ! -e main.info-1
test -f sub/main.info
test -f sub/main.info-1
diff --git a/t/txinfo21.sh b/t/txinfo21.sh
index 636f6c9..001d134 100755
--- a/t/txinfo21.sh
+++ b/t/txinfo21.sh
@@ -18,7 +18,7 @@
# install-DOC flavors.
required='makeinfo tex texi2dvi'
-. ./defs || Exit 1
+. ./defs || exit 1
cat >>configure.ac <<\EOF
AC_CONFIG_FILES([rec/Makefile])
@@ -34,6 +34,7 @@ AC_OUTPUT
EOF
cat > Makefile.am << 'END'
+check-local: ps pdf dvi html # For "make distcheck".
SUBDIRS = rec
info_TEXINFOS = main.texi sub/main2.texi
END
@@ -75,13 +76,15 @@ install-pdf-local:
:> "$(pdfdir)/hello"
uninstall-local:
rm -f "$(pdfdir)/hello"
+
+check-local: ps pdf dvi html # For "make distcheck".
END
$ACLOCAL
$AUTOMAKE --add-missing
$AUTOCONF
-./configure
+./configure --prefix "$(pwd)"
$MAKE
@@ -100,9 +103,9 @@ $MAKE html
is_newest main.html main.texi
$MAKE clean
-test ! -d main.html
-test ! -d sub/main2.html
-test ! -d rec/main3.html
+test ! -e main.html
+test ! -e sub/main2.html
+test ! -e rec/main3.html
# Test production of a single HTML file.
$MAKE MAKEINFOFLAGS=--no-split html
@@ -110,44 +113,47 @@ test -f main.html
test -f sub/main2.html
test -f rec/main3.html
$MAKE clean
-test ! -f main.html
-test ! -f sub/main2.html
-test ! -f rec/main3.html
+test ! -e main.html
+test ! -e sub/main2.html
+test ! -e rec/main3.html
# Make sure AM_MAKEINFOHTMLFLAGS is supported, and override AM_MAKEINFO.
+
+cp Makefile.am Makefile.sav
cat >>Makefile.am <<\EOF
AM_MAKEINFOHTMLFLAGS = --no-headers --no-split
AM_MAKEINFOFLAGS = --unsupported-option
EOF
$AUTOMAKE
-./configure --prefix "$(pwd)"
+./config.status Makefile
$MAKE html
test -f main.html
test -f sub/main2.html
test -d rec/main3.html
+
$MAKE clean
-test ! -f main.html
-test ! -f sub/main2.html
-test ! -d rec/main3.html
+test ! -e main.html
+test ! -e sub/main2.html
+test ! -e rec/main3.html
$MAKE install-html
test -f share/$me/html/main.html
test -f share/$me/html/main2.html
test -d share/$me/html/main3.html
$MAKE uninstall
-test ! -f share/$me/html/main.html
-test ! -f share/$me/html/main2.html
-test ! -d share/$me/html/main3.html
+test ! -e share/$me/html/main.html
+test ! -e share/$me/html/main2.html
+test ! -e share/$me/html/main3.html
$MAKE install-dvi
test -f share/$me/dvi/main.dvi
test -f share/$me/dvi/main2.dvi
test -f share/$me/dvi/main3.dvi
$MAKE uninstall
-test ! -f share/$me/dvi/main.dvi
-test ! -f share/$me/dvi/main2.dvi
-test ! -f share/$me/dvi/main3.dvi
+test ! -e share/$me/dvi/main.dvi
+test ! -e share/$me/dvi/main2.dvi
+test ! -e share/$me/dvi/main3.dvi
dvips --help || skip_ "dvips is missing"
@@ -156,9 +162,9 @@ test -f share/$me/ps/main.ps
test -f share/$me/ps/main2.ps
test -f share/$me/ps/main3.ps
$MAKE uninstall
-test ! -f share/$me/ps/main.ps
-test ! -f share/$me/ps/main2.ps
-test ! -f share/$me/ps/main3.ps
+test ! -e share/$me/ps/main.ps
+test ! -e share/$me/ps/main2.ps
+test ! -e share/$me/ps/main3.ps
pdfetex --help || pdftex --help \
|| skip_ "pdftex and pdfetex are both missing"
@@ -169,9 +175,16 @@ test -f share/$me/pdf/main2.pdf
test -f share/$me/pdf/main3.pdf
test -f share/$me/pdf/hello
$MAKE uninstall
-test ! -f share/$me/pdf/main.pdf
-test ! -f share/$me/pdf/main2.pdf
-test ! -f share/$me/pdf/main3.pdf
-test ! -f share/$me/pdf/hello
+test ! -e share/$me/pdf/main.pdf
+test ! -e share/$me/pdf/main2.pdf
+test ! -e share/$me/pdf/main3.pdf
+test ! -e share/$me/pdf/hello
+
+# Restore the makefile without a broken AM_MAKEINFOFLAGS definition.
+mv -f Makefile.sav Makefile.am
+$AUTOMAKE
+./config.status Makefile
+
+$MAKE distcheck
:
diff --git a/t/txinfo21b.sh b/t/txinfo21b.sh
index 2860cde..8f6d3f5 100755
--- a/t/txinfo21b.sh
+++ b/t/txinfo21b.sh
@@ -22,7 +22,7 @@
# FIXME: TAP, and merge them.
required='makeinfo tex texi2dvi'
-. ./defs || Exit 1
+. ./defs || exit 1
cat >>configure.ac <<\EOF
AC_CONFIG_FILES([rec/Makefile])
@@ -125,7 +125,7 @@ cat >> ../Makefile.am <<\EOF
AM_MAKEINFOHTMLFLAGS = --no-headers --no-split
AM_MAKEINFOFLAGS = --unsupported-option
EOF
-../configure --prefix "`pwd`"
+../configure --prefix "$(pwd)"
$MAKE html
test -f main.html
test -f sub/main2.html
diff --git a/t/txinfo22.sh b/t/txinfo22.sh
index c33898b..efde953 100755
--- a/t/txinfo22.sh
+++ b/t/txinfo22.sh
@@ -19,7 +19,7 @@
# Report from Tom Tromey.
required='makeinfo tex texi2dvi'
-. ./defs || Exit 1
+. ./defs || exit 1
cat > configure.ac << END
AC_INIT([$me], [1.0])
@@ -55,8 +55,8 @@ $ACLOCAL
$AUTOMAKE --add-missing
$AUTOCONF
-test ! -f texinfo.tex
-test ! -f aux1/texinfo.tex
+test ! -e texinfo.tex
+test ! -e aux1/texinfo.tex
test -f tex/texinfo.tex
./configure
diff --git a/t/txinfo23.sh b/t/txinfo23.sh
index 4ac9e9f..9e47a29 100755
--- a/t/txinfo23.sh
+++ b/t/txinfo23.sh
@@ -20,7 +20,7 @@
# (See also txinfo24.test and txinfo25.test).
required='makeinfo tex texi2dvi'
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_OUTPUT
@@ -61,6 +61,6 @@ cd build
../configure
$MAKE distcheck
test -f subdir/main.info
-test ! -f ../subdir/main.info
+test ! -e ../subdir/main.info
:
diff --git a/t/txinfo24.sh b/t/txinfo24.sh
index ecf4e9c..af426d7 100755
--- a/t/txinfo24.sh
+++ b/t/txinfo24.sh
@@ -19,7 +19,7 @@
# (See also txinfo23.test and txinfo25.test).
required='makeinfo tex texi2dvi'
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_OUTPUT
@@ -48,7 +48,7 @@ mkdir build
cd build
../configure
$MAKE
-test ! -f ../main.info
+test ! -e ../main.info
test -f main.info
cd ..
@@ -74,7 +74,7 @@ cd build
$MAKE
# main.info should be rebuilt in the current directory.
test -f main.info
-test ! -f ../main.info
+test ! -e ../main.info
$MAKE dvi
test -f main.dvi
diff --git a/t/txinfo25.sh b/t/txinfo25.sh
index 0d217d5..6eb1975 100755
--- a/t/txinfo25.sh
+++ b/t/txinfo25.sh
@@ -21,7 +21,7 @@
# (See also txinfo23.test and txinfo24.test).
required='makeinfo tex texi2dvi'
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_OUTPUT
@@ -61,8 +61,8 @@ cd build
../configure
$MAKE
test -f main.info
-test ! -f ../main.info
-test ! -f other.info
+test ! -e ../main.info
+test ! -e other.info
test -f ../other.info
cd ..
@@ -101,7 +101,7 @@ $MAKE
# rule is always triggered. Still that's not a reason for 'make'
# to think 'version.texi' has been created...
test -f main.info
-test ! -f other.info
+test ! -e other.info
$MAKE dvi
test -f main.dvi
test -f other.dvi
diff --git a/t/txinfo26.sh b/t/txinfo26.sh
index 223a4ea..5401fc9 100755
--- a/t/txinfo26.sh
+++ b/t/txinfo26.sh
@@ -18,7 +18,7 @@
# PR/408
required='makeinfo'
-. ./defs || Exit 1
+. ./defs || exit 1
echo AC_OUTPUT >> configure.ac
@@ -48,11 +48,6 @@ $MAKE distclean
abscwd=$(pwd) || fatal_ "getting current working directory"
-case $abscwd in
- *\ * | *\ *)
- skip_ "this test might fail in a directory containing white spaces";;
-esac
-
mkdir build
cd build
../configure --srcdir="$abscwd" \
@@ -62,12 +57,14 @@ cd build
$MAKE install
test -f ../main.info
-test ! -f ./main.info
+test ! -e ./main.info
test -f _inst/info/main.info
$MAKE uninstall
-test ! -f _inst/info/main.info
+test ! -e _inst/info/main.info
test -f ../main.info
# Multiple uninstall should not fail.
$MAKE uninstall
+
+:
diff --git a/t/txinfo27.sh b/t/txinfo27.sh
index f94c0bc..bfc075a 100755
--- a/t/txinfo27.sh
+++ b/t/txinfo27.sh
@@ -17,7 +17,7 @@
# Make sure install-info works even if no-installinfo is given.
required='makeinfo'
-. ./defs || Exit 1
+. ./defs || exit 1
echo AC_OUTPUT >> configure.ac
diff --git a/t/txinfo28.sh b/t/txinfo28.sh
index cd09f41..f9517fb 100755
--- a/t/txinfo28.sh
+++ b/t/txinfo28.sh
@@ -20,7 +20,7 @@
# Report from Ralf Corsepius.
required='makeinfo tex texi2dvi'
-. ./defs || Exit 1
+. ./defs || exit 1
# This setting, when honored by GNU ls, used to cause an infinite loop
# in mdate-sh.
@@ -82,7 +82,7 @@ cd build
$MAKE
# main.info should be rebuilt in the current directory.
test -f main.info
-test ! -f ../main.info
+test ! -e ../main.info
$MAKE dvi
test -f main.dvi
diff --git a/t/txinfo29.sh b/t/txinfo29.sh
index eab87dd..3e27362 100755
--- a/t/txinfo29.sh
+++ b/t/txinfo29.sh
@@ -17,7 +17,7 @@
# Make sure that INFO_DEPS can be overridden.
# Report from Bruce Korb.
-. ./defs || Exit 1
+. ./defs || exit 1
cat > Makefile.am << 'END'
INFO_DEPS = foo.info
diff --git a/t/txinfo31.sh b/t/txinfo31.sh
index 191bca4..e8186e5 100755
--- a/t/txinfo31.sh
+++ b/t/txinfo31.sh
@@ -17,7 +17,7 @@
# Make sure file extensions are matched correctly.
# Report from Eric Dorland.
-. ./defs || Exit 1
+. ./defs || exit 1
echo info_TEXINFOS = bar.texi >Makefile.am
cat >bar.texi <<EOF
diff --git a/t/txinfo32.sh b/t/txinfo32.sh
index 6f0c5a3..9f2134a 100755
--- a/t/txinfo32.sh
+++ b/t/txinfo32.sh
@@ -17,7 +17,7 @@
# Make sure the documentation targets work as required with BSD make,
# even in the presence of subdirs (requires presence of default *-am rules).
-. ./defs || Exit 1
+. ./defs || exit 1
mkdir sub
cat >>configure.ac <<'END'
diff --git a/t/txinfo33.sh b/t/txinfo33.sh
index d35d0d3..037400f 100755
--- a/t/txinfo33.sh
+++ b/t/txinfo33.sh
@@ -18,7 +18,7 @@
# Similar to txinfo25.test.
required='makeinfo tex texi2dvi dvips'
-. ./defs || Exit 1
+. ./defs || exit 1
mkdir sub
@@ -84,8 +84,8 @@ test -f sub/another.ps
$MAKE mostlyclean
-ls *.aux && Exit 1
-ls sub/*.aux && Exit 1
+ls *.aux && exit 1
+ls sub/*.aux && exit 1
test -f main.dvi
test -f main.ps
@@ -103,20 +103,20 @@ test -f sub/another.ps
$MAKE clean
-test ! -f main.dvi
-test ! -f main.ps
-test ! -f main.html && test ! -d main.html
-test ! -f main.pdf
-test ! -f other.pdf
-test ! -f sub/another.pdf
-test ! -f sub/yetanother.pdf
-
-test ! -f other.dvi
-test ! -f other.html && test ! -d other.html
-test ! -f other.ps
-test ! -f sub/another.dvi
-test ! -f sub/another.html && test ! -d sub/another.html
-test ! -f sub/another.ps
+test ! -e main.dvi
+test ! -e main.ps
+test ! -e main.html
+test ! -e main.pdf
+test ! -e other.pdf
+test ! -e sub/another.pdf
+test ! -e sub/yetanother.pdf
+
+test ! -e other.dvi
+test ! -e other.html
+test ! -e other.ps
+test ! -e sub/another.dvi
+test ! -e sub/another.html
+test ! -e sub/another.ps
./configure
$MAKE
diff --git a/t/txinfo4.sh b/t/txinfo4.sh
index f92f9c1..e6c67b9 100755
--- a/t/txinfo4.sh
+++ b/t/txinfo4.sh
@@ -16,7 +16,7 @@
# Make sure non-empty, non-info suffixes are diagnosed.
-. ./defs || Exit 1
+. ./defs || exit 1
cat > Makefile.am << 'END'
info_TEXINFOS = textutils.texi
diff --git a/t/txinfo7.sh b/t/txinfo7.sh
index 2a5dc9d..93d199c 100755
--- a/t/txinfo7.sh
+++ b/t/txinfo7.sh
@@ -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
diff --git a/t/txinfo8.sh b/t/txinfo8.sh
index 6e5403a..72ae61b 100755
--- a/t/txinfo8.sh
+++ b/t/txinfo8.sh
@@ -18,7 +18,7 @@
# -a when we're using AC_CONFIG_AUX_DIR. Bug report by by Per
# Cederqvist.
-. ./defs || Exit 1
+. ./defs || exit 1
cat > configure.ac << END
AC_INIT([$me], [1.0])
diff --git a/t/uninstall-fail.sh b/t/uninstall-fail.sh
index 6ab728c..16f86b1 100755
--- a/t/uninstall-fail.sh
+++ b/t/uninstall-fail.sh
@@ -20,7 +20,7 @@
# tests for other primaries too? E.g., SCRIPTS, PROGRAMS, LISP, PYTHON,
# etc...
-. ./defs || Exit 1
+. ./defs || exit 1
mkdir d
: > d/f
@@ -62,7 +62,7 @@ mkdir $inst $inst/share
: > $inst/share/foobar.txt
chmod a-w $inst/share
-$MAKE uninstall 2>stderr && { cat stderr >&2; Exit 1; }
+$MAKE uninstall 2>stderr && { cat stderr >&2; exit 1; }
cat stderr >&2
if test $rm_f_is_silent_on_error = yes; then
: "rm -f" is silent on errors, skip the grepping of make output
@@ -73,24 +73,23 @@ fi
chmod a-rwx $inst/share
(cd $inst/share) && skip_ "cannot make directories fully unreadable"
-$MAKE uninstall 2>stderr && { cat stderr >&2; Exit 1; }
-cat stderr >&2
+$MAKE uninstall 2>stderr && { cat stderr >&2; exit 1; }
#
-# Some shells, like Solaris 10 /bin/sh and /bin/ksh, do not report
-# the name of the 'cd' builtin upon a chdir error:
+# Some shells, like Solaris 10 /bin/ksh and /usr/xpg4/bin/sh, do not
+# report the name of the 'cd' builtin upon a chdir error:
#
-# $ /bin/sh -c 'cd /none'
-# /bin/sh: /none: does not exist
+# $ /bin/ksh -c 'cd /none'
+# /bin/ksh: /none: not found
#
-# In addition, some shells, like Solaris 10 /usr/xpg4/bin/sh, also print
-# a line number in the error message *if the command contains newlines*:
+# and also print a line number in the error message *if the command
+# contains newlines*:
#
-# $ /usr/xpg4/bin/sh -c 'cd unreadable'
-# /usr/xpg4/bin/sh: unreadable: permission denied
-# $ /usr/xpg4/bin/sh -c '\
+# $ /bin/ksh -c 'cd unreadable'
+# /bin/ksh: unreadable: permission denied
+# $ /bin/ksh -c '\
# > \
# > cd unreadable'
-# /usr/xpg4/bin/sh[3]: unreadable: permission denied
+# /bin/ksh[3]: unreadable: permission denied
#
$EGREP "(cd|sh)(\[[0-9]*[0-9]\])?: .*$inst/share" stderr
diff --git a/t/uninstall-pr9578.sh b/t/uninstall-pr9578.sh
index 1be2a26..cb870b3 100755
--- a/t/uninstall-pr9578.sh
+++ b/t/uninstall-pr9578.sh
@@ -22,7 +22,7 @@
# need sister tests for other primaries too? E.g., PROGRAMS, LISP,
# PYTHON, etc...
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_OUTPUT
@@ -43,25 +43,25 @@ $AUTOCONF
./configure --prefix="$(pwd)/inst"
$MAKE uninstall
-test ! -d inst
+test ! -e inst
rm -rf inst
$MAKE install-exec
-test -f inst/bin/foo || Exit 99 # Sanity check.
+test -f inst/bin/foo || exit 99 # Sanity check.
$MAKE uninstall
-test ! -f inst/bin/foo
+test ! -e inst/bin/foo
$MAKE install-data
-test -f inst/share/bar || Exit 99 # Sanity check.
+test -f inst/share/bar || exit 99 # Sanity check.
$MAKE uninstall
-test ! -f inst/share/bar
+test ! -e inst/share/bar
rm -rf inst
$MAKE install-exec
-test -f inst/bin/foo || Exit 99 # Sanity check.
+test -f inst/bin/foo || exit 99 # Sanity check.
$MAKE uninstall
-test ! -f inst/bin/foo
+test ! -e inst/bin/foo
:
diff --git a/t/unused.sh b/t/unused.sh
index 271273f..79c7b41 100755
--- a/t/unused.sh
+++ b/t/unused.sh
@@ -16,7 +16,7 @@
# Test for failing check for unused macros. From Johan Danielsson.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
MACRO_1
@@ -30,6 +30,6 @@ AC_DEFUN([MACRO_1_2], echo 12)
AC_DEFUN([MACRO_1_2_3], echo 123)
END
-$ACLOCAL 2>stderr || { cat stderr >&2; Exit 1; }
+$ACLOCAL 2>stderr || { cat stderr >&2; exit 1; }
cat stderr >&2
test ! -s stderr
diff --git a/t/upc.sh b/t/upc.sh
index 320e02f..4128ea0 100755
--- a/t/upc.sh
+++ b/t/upc.sh
@@ -16,7 +16,7 @@
# A simple Hello World for UPC.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AM_PROG_UPC
@@ -44,7 +44,7 @@ $ACLOCAL
$AUTOMAKE
$AUTOCONF
-./configure || Exit $?
+./configure || exit $?
$MAKE distcheck
:
diff --git a/t/upc2.sh b/t/upc2.sh
index 43575d8..be6461f 100755
--- a/t/upc2.sh
+++ b/t/upc2.sh
@@ -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
echo AC_PROG_CC >>configure.ac
diff --git a/t/upc3.sh b/t/upc3.sh
index eb02679..7da65d5 100755
--- a/t/upc3.sh
+++ b/t/upc3.sh
@@ -16,7 +16,7 @@
# Test that C and Unified Parallel C link safely.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
@@ -59,7 +59,7 @@ $ACLOCAL
$AUTOMAKE
$AUTOCONF
-./configure || Exit $?
+./configure || exit $?
$MAKE distcheck
:
diff --git a/t/vala-headers.sh b/t/vala-headers.sh
index 2e1b5be..1c23cf8 100755
--- a/t/vala-headers.sh
+++ b/t/vala-headers.sh
@@ -17,7 +17,7 @@
# Test to make sure compiling Vala code really works with recursive make.
required="pkg-config valac gcc"
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
@@ -82,6 +82,6 @@ for h in $headers; do test -f $h; done
$MAKE distcheck
$MAKE maintainer-clean
-for h in $headers; do test ! -f $h; done
+for h in $headers; do test ! -e $h; done
:
diff --git a/t/vala-libs.sh b/t/vala-libs.sh
index 567d5b3..0eab4fe 100755
--- a/t/vala-libs.sh
+++ b/t/vala-libs.sh
@@ -18,7 +18,7 @@
# And use of vapi files to call C code from Vala.
required="valac cc pkg-config libtoolize"
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
diff --git a/t/vala-mix.sh b/t/vala-mix.sh
index 8f522de..e16c02c 100755
--- a/t/vala-mix.sh
+++ b/t/vala-mix.sh
@@ -17,7 +17,7 @@
# Vala sources and C sources in the same program. Functional test.
required='valac cc'
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac <<'END'
AC_PROG_CC
@@ -105,7 +105,7 @@ have_generated_files
# Remake rules are not uselessly triggered.
$MAKE -q
-$MAKE -n | $FGREP vala.stamp && Exit 1
+$MAKE -n | $FGREP vala.stamp && exit 1
# Check the distribution.
$MAKE distcheck
@@ -119,6 +119,6 @@ have_generated_files
# behaviour w.r.t. intermediate C files is still unclear, and
# better left undefined for the moment).
$MAKE maintainer-clean
-ls *vala*.stamp | grep . && Exit 1
+ls *vala*.stamp | grep . && exit 1
:
diff --git a/t/vala-mix2.sh b/t/vala-mix2.sh
index 7c793bf..7a2d324 100755
--- a/t/vala-mix2.sh
+++ b/t/vala-mix2.sh
@@ -18,7 +18,7 @@
# program. Functional test. See automake bug#10894.
required='valac cc c++'
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac <<'END'
AC_PROG_CC
@@ -89,13 +89,13 @@ have_generated_files
# Remake rules are not uselessly triggered.
$MAKE -q
-$MAKE -n | $FGREP vala.stamp && Exit 1
+$MAKE -n | $FGREP vala.stamp && exit 1
# But are triggered when they should.
for file in zardoz.vala foo.h bar.c baz.c zen.hh master.cxx; do
$sleep
echo '& choke me !' >> $file
- $MAKE && Exit 1
+ $MAKE && exit 1
$sleep
sed '$d' $file > t
mv -f t $file
@@ -115,6 +115,6 @@ have_generated_files
# behaviour w.r.t. intermediate C files is still unclear, and
# better left undefined for the moment).
$MAKE maintainer-clean
-ls *vala*.stamp | grep . && Exit 1
+ls *vala*.stamp | grep . && exit 1
:
diff --git a/t/vala-parallel.sh b/t/vala-parallel.sh
index d522093..3479135 100755
--- a/t/vala-parallel.sh
+++ b/t/vala-parallel.sh
@@ -17,7 +17,7 @@
# Vala support with parallel make.
required='valac cc'
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac <<'END'
AC_PROG_CC
@@ -54,8 +54,8 @@ test -f zardoz_vala.stamp
$MAKE maintainer-clean -j4
ls -l # For debugging.
-for x in main 1 2 3 4 5 6; do test ! -f $x.c; done
-test ! -f zardoz_vala.stamp
+for x in main 1 2 3 4 5 6; do test ! -e $x.c; done
+test ! -e zardoz_vala.stamp
mkdir build
cd build
@@ -68,7 +68,7 @@ test -f ../zardoz_vala.stamp
$MAKE distcheck -j4
$MAKE maintainer-clean -j2
-for x in main 1 2 3 4 5 6; do test ! -f ../$x.c; done
-test ! -f ../zardoz_vala.stamp
+for x in main 1 2 3 4 5 6; do test ! -e ../$x.c; done
+test ! -e ../zardoz_vala.stamp
:
diff --git a/t/vala-vapi.sh b/t/vala-vapi.sh
index 2e14eb7..dedf042 100755
--- a/t/vala-vapi.sh
+++ b/t/vala-vapi.sh
@@ -17,7 +17,7 @@
# Test and that vapi files are correctly handled by Vala support.
required='valac cc'
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac <<'END'
AC_PROG_CC
@@ -70,18 +70,18 @@ $MAKE
ls -l # For debugging.
cat zardoz.c # Likewise.
grep 'BARBAR' zardoz.c
-cross_compiling || $MAKE test1 || Exit 1
+cross_compiling || $MAKE test1 || exit 1
# Simple check on remake rules.
$sleep
echo '#define BAZBAZ "Quux!\n"' > foo.h
-sed 's/BARBAR/BAZBAZ/' zardoz.vala > t && mv -f t zardoz.vala || Exit 99
-$MAKE && Exit 1
-sed 's/BARBAR/BAZBAZ/' foo.vapi > t && mv -f t foo.vapi || Exit 99
+sed 's/BARBAR/BAZBAZ/' zardoz.vala > t && mv -f t zardoz.vala || exit 99
+$MAKE && exit 1
+sed 's/BARBAR/BAZBAZ/' foo.vapi > t && mv -f t foo.vapi || exit 99
$MAKE
cat zardoz.c # For debugging.
grep 'BAZBAZ' zardoz.c
-cross_compiling || $MAKE test2 || Exit 1
+cross_compiling || $MAKE test2 || exit 1
# Check the distribution.
$MAKE distcheck
diff --git a/t/vala-vpath.sh b/t/vala-vpath.sh
index 514d0e6..53b1358 100755
--- a/t/vala-vpath.sh
+++ b/t/vala-vpath.sh
@@ -18,7 +18,7 @@
# See automake bug#8753.
required="cc valac"
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_CONFIG_SRCDIR([hello.vala])
@@ -74,7 +74,7 @@ grep barbarbar ../hello.c
# Rebuild rules are not uselessly triggered.
$MAKE -q
-$MAKE -n | grep '\.stamp' && Exit 1
+$MAKE -n | grep '\.stamp' && exit 1
# Cleanup rules work also in VPATH builds.
$MAKE clean
@@ -83,9 +83,9 @@ test -f ../bar_vala.stamp
test -f ../zardoz.h
test -f ../hello.c
$MAKE maintainer-clean
-test ! -f ../zardoz.h
-test ! -f ../hello.c
-test ! -f ../foo_vala.stamp
-test ! -f ../bar_vala.stamp
+test ! -e ../zardoz.h
+test ! -e ../hello.c
+test ! -e ../foo_vala.stamp
+test ! -e ../bar_vala.stamp
:
diff --git a/t/vala.sh b/t/vala.sh
index cc50ff1..9e48549 100755
--- a/t/vala.sh
+++ b/t/vala.sh
@@ -16,7 +16,7 @@
# Basic "grepping" test on vala support.
-. ./defs || Exit 1
+. ./defs || exit 1
# So that we won't require libtool macros.
cat > acinclude.m4 <<'END'
@@ -71,7 +71,7 @@ $FGREP 'zardoz-foo.c' Makefile.in
$FGREP 'zardoz-bar.c' Makefile.in
grep '\$(VALAC).* \$(AM_VALAFLAGS) \$(VALAFLAGS) ' sub/Makefile.in
-$FGREP 'foo_VALAFLAGS' sub/Makefile.in && Exit 1
+$FGREP 'foo_VALAFLAGS' sub/Makefile.in && exit 1
$FGREP 'am_foo_OBJECTS' sub/Makefile.in
$FGREP 'bar.c' sub/Makefile.in
$FGREP 'baz.c' sub/Makefile.in
@@ -81,6 +81,6 @@ test $($FGREP -c '.stamp:' sub/Makefile.in) -eq 1
# Check against regression for weird bug due to unescaped '@'
# characters used in a "..." perl string when writing the vala
# rules from automake.in.
-grep '\$[0-9][0-9]*t' Makefile.in sub/Makefile.in && Exit 1
+grep '\$[0-9][0-9]*t' Makefile.in sub/Makefile.in && exit 1
:
diff --git a/t/vala2.sh b/t/vala2.sh
index cfbffc1..a392a7a 100755
--- a/t/vala2.sh
+++ b/t/vala2.sh
@@ -17,7 +17,7 @@
# Test to make sure compiling Vala code really works with recursive make.
required="pkg-config valac gcc"
-. ./defs || Exit 1
+. ./defs || exit 1
mkdir src
@@ -75,7 +75,7 @@ echo am--error > src/zardoz.c
$sleep
touch src/zardoz.vala
$MAKE
-grep 'am--error' src/zardoz.[ch] && Exit 1
+grep 'am--error' src/zardoz.[ch] && exit 1
# Check the distribution.
@@ -105,6 +105,6 @@ sed 's/Zardoz!/FooBar!/' ../src/zardoz.vala > t
mv -f t ../src/zardoz.vala
$MAKE
grep 'FooBar!' ../src/zardoz.c
-grep 'Zardoz!' ../src/zardoz.c && Exit 1
+grep 'Zardoz!' ../src/zardoz.c && exit 1
:
diff --git a/t/vala3.sh b/t/vala3.sh
index 6de68f8..ccce705 100755
--- a/t/vala3.sh
+++ b/t/vala3.sh
@@ -17,7 +17,7 @@
# Test to make sure compiling Vala code really works with non-recursive make.
required="pkg-config valac gcc"
-. ./defs || Exit 1
+. ./defs || exit 1
mkdir src
@@ -59,9 +59,9 @@ test -f src/zardoz.c
test -f src_zardoz_vala.stamp
$MAKE distcheck
$MAKE maintainer-clean
-test ! -f src/zardoz.c
+test ! -e src/zardoz.c
# FIXME: having 'src/zardoz_vala.stamp' should be more appropriate here.
-test ! -f src_zardoz_vala.stamp
+test ! -e src_zardoz_vala.stamp
mkdir build
cd build
@@ -74,6 +74,6 @@ $MAKE distcheck
$MAKE maintainer-clean
test ! -f src/zardoz.c
# FIXME: having 'src/zardoz_vala.stamp' should be more appropriate here.
-test ! -f src_zardoz_vala.stamp
+test ! -e src_zardoz_vala.stamp
:
diff --git a/t/vala4.sh b/t/vala4.sh
index 2d3951a..a727ec5 100755
--- a/t/vala4.sh
+++ b/t/vala4.sh
@@ -16,7 +16,7 @@
# Test AM_PROG_VALAC.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
@@ -41,21 +41,21 @@ $ACLOCAL
$AUTOMAKE -a
$AUTOCONF
-# The "|| Exit 1" is required here even if 'set -e' is active,
-# because ./configure migt exit with status 77, and in that case
+# The "|| exit 1" is required here even if 'set -e' is active,
+# because ./configure might exit with status 77, and in that case
# we want to FAIL, not to SKIP.
-./configure "VALAC=$cwd/valac" || Exit 1
+./configure "VALAC=$cwd/valac" || exit 1
sed 's/AM_PROG_VALAC.*/AM_PROG_VALAC([9999.9])/' < configure.ac >t
mv -f t configure.ac
$AUTOCONF --force
st=0; ./configure "VALAC=$cwd/valac" || st=$?
-test $st -eq 77 || Exit 1
+test $st -eq 77 || exit 1
sed 's/AM_PROG_VALAC.*/AM_PROG_VALAC([1.2.3])/' < configure.ac >t
mv -f t configure.ac
$AUTOCONF --force
-# See comments above for why "|| Exit 1" is needed.
-./configure "VALAC=$cwd/valac" || Exit 1
+# See comments above for why "|| exit 1" is needed.
+./configure "VALAC=$cwd/valac" || exit 1
:
diff --git a/t/vala5.sh b/t/vala5.sh
index 4a37d8f..7f5fba2 100755
--- a/t/vala5.sh
+++ b/t/vala5.sh
@@ -17,7 +17,7 @@
# Test per-target flags.
required="pkg-config valac gcc"
-. ./defs || Exit 1
+. ./defs || exit 1
mkdir src
@@ -97,7 +97,7 @@ mv config.sav config.status
./config.status
$MAKE maintainer-clean
-test ! -f src/xfoo.c
-test ! -f src/xbar.c
+test ! -e src/xfoo.c
+test ! -e src/xbar.c
:
diff --git a/t/var-undef-append.sh b/t/var-undef-append.sh
index f59bacc..28ca299 100755
--- a/t/var-undef-append.sh
+++ b/t/var-undef-append.sh
@@ -20,7 +20,7 @@
# to it should get overridden as well.
# See also "spy" test 'spy-var-append.sh'.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AM_CONDITIONAL([COND_NO], [false])
@@ -91,7 +91,7 @@ $AUTOCONF
checkit ()
{
- $MAKE "$@" 2>stderr && test ! -s stderr || { cat stderr >&2; Exit 1; }
+ $MAKE "$@" 2>stderr && test ! -s stderr || { cat stderr >&2; exit 1; }
}
checkit test1
diff --git a/t/vars-assign.sh b/t/vars-assign.sh
index 120118f..36d3dc7 100755
--- a/t/vars-assign.sh
+++ b/t/vars-assign.sh
@@ -17,7 +17,7 @@
# Automake do not complain about nor messes up GNU make specific
# variable assignments (":=" and "?=").
-. ./defs || Exit 1
+. ./defs || exit 1
echo AC_OUTPUT >> configure.ac
diff --git a/t/vars.sh b/t/vars.sh
index 1e3e91e..cf45cb9 100755
--- a/t/vars.sh
+++ b/t/vars.sh
@@ -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
diff --git a/t/vartar.sh b/t/vartar.sh
index d5ddf65..91d8fb9 100755
--- a/t/vartar.sh
+++ b/t/vartar.sh
@@ -16,7 +16,7 @@
# Targets and macros are two different name spaces.
-. ./defs || Exit 1
+. ./defs || exit 1
cat > Makefile.am << 'END'
xinstall = xinstall
diff --git a/t/vartypos-deps.sh b/t/vartypos-deps.sh
index 212b29a..8ba3792 100755
--- a/t/vartypos-deps.sh
+++ b/t/vartypos-deps.sh
@@ -18,7 +18,7 @@
# *_DEPENDENCIES when we should, and do not warn about them
# when we should not.
-. ./defs || Exit 1
+. ./defs || exit 1
subdirs='ok1 ok2 ko1 ko2'
mkdir $subdirs
@@ -85,19 +85,19 @@ $MAKE
(cd ok2 && $MAKE)
cd ko1
-$MAKE 2>stderr && { cat stderr >&2; Exit 1; }
+$MAKE 2>stderr && { cat stderr >&2; exit 1; }
cat stderr >&2
errgrep LOG
errgrep TEST_LOG
cd ..
cd ko2
-$MAKE 2>stderr && { cat stderr >&2; Exit 1; }
+$MAKE 2>stderr && { cat stderr >&2; exit 1; }
cat stderr >&2
errgrep SH_LOG
errgrep CONFIG
errgrep CONFIGSTATUS
-$EGREP "'(TEST_)?LOG" stderr && Exit 1
+$EGREP "'(TEST_)?LOG" stderr && exit 1
cd ..
:
diff --git a/t/vartypos-whitelist.sh b/t/vartypos-whitelist.sh
index 7c718b2..e886fc3 100755
--- a/t/vartypos-whitelist.sh
+++ b/t/vartypos-whitelist.sh
@@ -19,7 +19,7 @@
# build system.
required=cc
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
@@ -94,14 +94,14 @@ $AUTOMAKE -a
$MAKE
# If we remove the whitelisting, failure ensues.
-$MAKE AM_VARTYPOS_WHITELIST= 2>stderr && { cat stderr; Exit 1; }
+$MAKE AM_VARTYPOS_WHITELIST= 2>stderr && { cat stderr; exit 1; }
cat stderr >&2
grep "'copy_LDADD' is defined but no program" stderr
grep "'remove_LDADD' is defined but no program" stderr
-$MAKE AM_VARTYPOS_WHITELIST=remove_LDADD 2>stderr && { cat stderr; Exit 1; }
+$MAKE AM_VARTYPOS_WHITELIST=remove_LDADD 2>stderr && { cat stderr; exit 1; }
cat stderr >&2
grep "'copy_LDADD' is defined but no program" stderr
-grep "remove_LDADD" stderr && Exit 1
+grep "remove_LDADD" stderr && exit 1
# Sanity check the distribution.
$MAKE distcheck
diff --git a/t/vartypos.sh b/t/vartypos.sh
index cf9b31e..9048c20 100755
--- a/t/vartypos.sh
+++ b/t/vartypos.sh
@@ -16,7 +16,7 @@
# Make sure we warn about possible variable typos when we should.
-. ./defs || Exit 1
+. ./defs || exit 1
: > ltmain.sh
@@ -86,11 +86,11 @@ $AUTOCONF
$AUTOMAKE -a
./configure
-$MAKE nihil 2>stderr && { cat stderr >&2; Exit 1; }
+$MAKE nihil 2>stderr && { cat stderr >&2; exit 1; }
cat stderr >&2
$FGREP 'as canonical' stderr \
- | $EGREP -v " '(foo|libfoo_a|libbar_la)' " && Exit 1
+ | $EGREP -v " '(foo|libfoo_a|libbar_la)' " && exit 1
test 36 -eq $(grep -c 'variable.*is defined but' stderr)
# If matching programs or libraries are defined, all errors should
diff --git a/t/verbatim.sh b/t/verbatim.sh
index f0f6b74..4921f26 100755
--- a/t/verbatim.sh
+++ b/t/verbatim.sh
@@ -19,7 +19,7 @@
# too. Yes, this test is hacky ... as is the behaviour it tests
# after all ;-)
-. ./defs || Exit 1
+. ./defs || exit 1
echo AC_OUTPUT >> configure.ac
@@ -118,7 +118,7 @@ FOO= BAR=; unset FOO BAR
$ACLOCAL
$AUTOMAKE --libdir=.
-grep '^!' Makefile.in | grep -v '^!unmodified!$' && Exit 1
+grep '^!' Makefile.in | grep -v '^!unmodified!$' && exit 1
# Use perl, to avoid possible issues with regex length in vendor greps.
$PERL -e "
@@ -132,8 +132,8 @@ grep '^## unmodified$' Makefile.in
grep '^xyz = \\$' Makefile.in
$EGREP 'foo|bar' Makefile.in # For debugging.
-test `grep -c '^foo +=' Makefile.in` -eq 2
-test `grep -c '^bar =' Makefile.in` -eq 3
+test $(grep -c '^foo +=' Makefile.in) -eq 2
+test $(grep -c '^bar =' Makefile.in) -eq 3
$AUTOCONF
./configure
@@ -145,7 +145,7 @@ $MAKE rule
test ! -f verbatim-rule.ok
$MAKE
test -f verbatim-rule.ok
-$MAKE | grep 'Custom Rule' && Exit 1
+$MAKE | grep 'Custom Rule' && exit 1
$MAKE test-xyz
$MAKE check-var var=foo val='. 1'
diff --git a/t/version3.sh b/t/version3.sh
index 2839467..2b5294d 100755
--- a/t/version3.sh
+++ b/t/version3.sh
@@ -16,7 +16,7 @@
# Test to make sure version in AUTOMAKE_OPTIONS works.
-. ./defs || Exit 1
+. ./defs || exit 1
cat > Makefile.am << 'END'
AUTOMAKE_OPTIONS = 9.9x
diff --git a/t/version4.sh b/t/version4.sh
index 7fa429e..f04305e 100755
--- a/t/version4.sh
+++ b/t/version4.sh
@@ -16,7 +16,7 @@
# 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
diff --git a/t/version6.sh b/t/version6.sh
index 8d33c44..74fa088 100755
--- a/t/version6.sh
+++ b/t/version6.sh
@@ -16,7 +16,7 @@
# Make sure the current version can be required.
-. ./defs || Exit 1
+. ./defs || exit 1
amver=$($AUTOMAKE --version | sed -e 's/.* //;1q')
diff --git a/t/version7.sh b/t/version7.sh
index ed5847e..69e7cd1 100755
--- a/t/version7.sh
+++ b/t/version7.sh
@@ -20,7 +20,7 @@
# changes -- we don't support this feature on non-GNU Makes).
required='makeinfo tex texi2dvi'
-. ./defs || Exit 1
+. ./defs || exit 1
cat >configure.ac <<END
m4_include([version.m4])
diff --git a/t/version8.sh b/t/version8.sh
index 1e66280..28f7548 100755
--- a/t/version8.sh
+++ b/t/version8.sh
@@ -16,9 +16,9 @@
# Calling AM_AUTOMAKE_VERSION by hand is a bug.
-. ./defs || Exit 1
+. ./defs || exit 1
echo 'AM_AUTOMAKE_VERSION([1.9])' >>configure.ac
-$ACLOCAL 2>stderr && { cat stderr >&2; Exit 0; }
+$ACLOCAL 2>stderr && { cat stderr >&2; exit 0; }
cat stderr >&2
$FGREP 'AM_INIT_AUTOMAKE([1.9])' stderr
diff --git a/t/vpath-built-sources.sh b/t/vpath-built-sources.sh
index 1f47073..ae58511 100755
--- a/t/vpath-built-sources.sh
+++ b/t/vpath-built-sources.sh
@@ -18,9 +18,9 @@
# build a source with the same name but without the $(srcdir).
required=cc
-. ./defs || Exit 1
+. ./defs || exit 1
-ocwd=`pwd` || fatal_ "couldn't get current working directory"
+ocwd=$(pwd) || fatal_ "couldn't get current working directory"
cat >> configure.ac <<'END'
AC_PROG_CC
diff --git a/t/vpath-rewrite.sh b/t/vpath-rewrite.sh
index 0d2db6c..8f1eecc 100755
--- a/t/vpath-rewrite.sh
+++ b/t/vpath-rewrite.sh
@@ -16,7 +16,7 @@
# Test Automake-provided internal make macros to deal with VPATH rewrites.
-. ./defs || Exit 1
+. ./defs || exit 1
echo AC_OUTPUT >> configure.ac
@@ -91,7 +91,7 @@ cd build
$MAKE test-vpath
cd ..
-ocwd=`pwd` || fatal_ "couldn't get current working directory"
+ocwd=$(pwd) || fatal_ "couldn't get current working directory"
mkdir build2 build2/subbuild
cd build2/subbuild
"$ocwd"/configure
diff --git a/t/vpath.sh b/t/vpath.sh
index f20ebf8..2090810 100755
--- a/t/vpath.sh
+++ b/t/vpath.sh
@@ -17,7 +17,7 @@
# Test to make sure VPATH can be overridden.
# Report from Anthony Green.
-. ./defs || Exit 1
+. ./defs || exit 1
echo AC_OUTPUT >> configure.ac
@@ -41,7 +41,7 @@ echo KO > ../file.foo
$MAKE file.bar
test "$(cat file.bar)" = OK
rm -f file.bar zardoz/file.foo
-$MAKE file.bar && Exit 1
+$MAKE file.bar && exit 1
test ! -f file.bar
:
diff --git a/t/vtexi.sh b/t/vtexi.sh
index b3035ed..9127013 100755
--- a/t/vtexi.sh
+++ b/t/vtexi.sh
@@ -17,7 +17,7 @@
# Basic checks and some regressions testing on 'version.texi'
# support for texinfo files.
-. ./defs || Exit 1
+. ./defs || exit 1
cat > Makefile.am << 'END'
info_TEXINFOS = textutils.texi
diff --git a/t/vtexi2.sh b/t/vtexi2.sh
index 8cde8c4..198941f 100755
--- a/t/vtexi2.sh
+++ b/t/vtexi2.sh
@@ -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
diff --git a/t/vtexi3.sh b/t/vtexi3.sh
index 82ab71b..dd897e0 100755
--- a/t/vtexi3.sh
+++ b/t/vtexi3.sh
@@ -20,7 +20,7 @@
# See also the related test 'vtexi4.test', which does similar checks, but
# for version.texi only, and requires makeinfo, tex and texi2dvi.
-. ./defs || Exit 1
+. ./defs || exit 1
# We are going to override package version in AC_INIT, so we need
# to redefine the name of the distdir as well.
diff --git a/t/vtexi4.sh b/t/vtexi4.sh
index f87cb8b..abd1411 100755
--- a/t/vtexi4.sh
+++ b/t/vtexi4.sh
@@ -22,7 +22,7 @@
# texi2dvi.
required='makeinfo tex texi2dvi grep-nonprint'
-. ./defs || Exit 1
+. ./defs || exit 1
test $(LC_ALL=C date '+%u') -gt 0 && test $(LC_ALL=C date '+%u') -lt 8 \
&& day=$(LC_ALL=C date '+%d') && test -n "$day" \
diff --git a/t/warning-groups-win-over-strictness.sh
b/t/warning-groups-win-over-strictness.sh
index e275131..387bd9b 100755
--- a/t/warning-groups-win-over-strictness.sh
+++ b/t/warning-groups-win-over-strictness.sh
@@ -19,7 +19,7 @@
# levels are "catch-all warnings" (such as '-Wall' and '-Wnone').
# Since we are at it, also throw in *.am and *.m4 file inclusions.
-. ./defs || Exit 1
+. ./defs || exit 1
# We want complete control over automake options.
AUTOMAKE=$am_original_AUTOMAKE
diff --git a/t/warnings-override.sh b/t/warnings-override.sh
index a487ffa..31ae4aa 100755
--- a/t/warnings-override.sh
+++ b/t/warnings-override.sh
@@ -21,7 +21,7 @@
# been in place for quite a long time); see also Automake bug #7673.
# Update this test if the semantics are changed.
-. ./defs || Exit 1
+. ./defs || exit 1
# We want (almost) complete control over automake options.
AUTOMAKE="$am_original_AUTOMAKE -Werror"
diff --git a/t/warnings-precedence.sh b/t/warnings-precedence.sh
index 53705e4..43e569c 100755
--- a/t/warnings-precedence.sh
+++ b/t/warnings-precedence.sh
@@ -18,7 +18,7 @@
# warnings specified later should take precedence over those specified
# earlier.
-. ./defs || Exit 1
+. ./defs || exit 1
# We want (almost) complete control over automake options.
AUTOMAKE="$am_original_AUTOMAKE -Werror"
diff --git a/t/warnings-strictness-interactions.sh
b/t/warnings-strictness-interactions.sh
index 612c019..c8f28c2 100755
--- a/t/warnings-strictness-interactions.sh
+++ b/t/warnings-strictness-interactions.sh
@@ -18,7 +18,7 @@
# in AUTOMAKE_OPTIONS take precedence over explicit warnings given in
# AM_INIT_AUTOMAKE.
-. ./defs || Exit 1
+. ./defs || exit 1
# We want (almost) complete control over automake options.
AUTOMAKE="$am_original_AUTOMAKE -Werror"
diff --git a/t/warnings-unknown.sh b/t/warnings-unknown.sh
index 4d64059..d1b2b8c 100755
--- a/t/warnings-unknown.sh
+++ b/t/warnings-unknown.sh
@@ -16,7 +16,7 @@
# Check that automake complains about unknown warnings.
-. ./defs || Exit 1
+. ./defs || exit 1
# We want (almost) complete control over automake options.
AUTOMAKE="$am_original_AUTOMAKE --foreign -Werror"
diff --git a/t/warnings-win-over-strictness.sh
b/t/warnings-win-over-strictness.sh
index 3e20ae0..974bd9a 100755
--- a/t/warnings-win-over-strictness.sh
+++ b/t/warnings-win-over-strictness.sh
@@ -17,7 +17,7 @@
# Check that, on the command line, explicitly-defined warnings take
# precedence over implicit strictness-implied warnings.
-. ./defs || Exit 1
+. ./defs || exit 1
# We want complete control over automake options.
AUTOMAKE=$am_original_AUTOMAKE
diff --git a/t/warnopts.sh b/t/warnopts.sh
index 887f73a..c3be617 100755
--- a/t/warnopts.sh
+++ b/t/warnopts.sh
@@ -16,7 +16,7 @@
# Make sure that we can enable or disable warnings on a per-file basis.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
@@ -57,8 +57,8 @@ AUTOMAKE_fails
# sub/Makefile.am:1: warning: 'AUTOMAKE_OPTIONS' cannot have conditional
contents
grep '^Makefile\.am:.*sub/foo\.c.*AM_PROG_CC_C_O' stderr
grep '^sub/Makefile.am:.*AUTOMAKE_OPTIONS' stderr
-grep '^sub/Makefile\.am:.*AM_PROG_CC_C_O' stderr && Exit 1
-grep '^Makefile\.am:.*AUTOMAKE_OPTIONS' stderr && Exit 1
+grep '^sub/Makefile\.am:.*AM_PROG_CC_C_O' stderr && exit 1
+grep '^Makefile\.am:.*AUTOMAKE_OPTIONS' stderr && exit 1
# Only two lines of warnings.
test $(grep -v 'warnings are treated as errors' stderr | wc -l) -eq 2
diff --git a/t/werror.sh b/t/werror.sh
index 7407e00..d6c6587 100755
--- a/t/werror.sh
+++ b/t/werror.sh
@@ -17,7 +17,7 @@
# Test to make sure -Werror and --add-missing work together.
am_create_testdir=empty
-. ./defs || Exit 1
+. ./defs || exit 1
cat > configure.ac <<END
AC_INIT([$me], [1.0])
diff --git a/t/werror2.sh b/t/werror2.sh
index e77a85b..8b42833 100755
--- a/t/werror2.sh
+++ b/t/werror2.sh
@@ -19,7 +19,7 @@
# succeed if make is run a second time immediately afterwards.
# Report from Harlan Stenn.
-. ./defs || Exit 1
+. ./defs || exit 1
echo AC_OUTPUT >> configure.ac
@@ -41,7 +41,7 @@ foo_SOURCES = unused
END
# This repetition is deliberate; see heading comments.
-$MAKE && Exit 1
-$MAKE && Exit 1
+$MAKE && exit 1
+$MAKE && exit 1
:
diff --git a/t/werror3.sh b/t/werror3.sh
index b5e35e3..a22ff84 100755
--- a/t/werror3.sh
+++ b/t/werror3.sh
@@ -17,7 +17,7 @@
# Make sure a per-Makefile.am -Werror setting is not carried over
# to another Makefile.am.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >>configure.ac <<\END
AC_CONFIG_FILES([sub/Makefile])
diff --git a/t/werror4.sh b/t/werror4.sh
index 9a9a166..1b930d5 100755
--- a/t/werror4.sh
+++ b/t/werror4.sh
@@ -16,7 +16,7 @@
# -Werror and local -Werror settings should be flagged for the user.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >>configure.ac <<\END
AC_CONFIG_FILES([sub/Makefile])
@@ -61,6 +61,6 @@ test $(grep -c 'warnings are treated as errors' stderr) -eq 1
AUTOMAKE_run -Wno-error
grep 'VAR multiply defined' stderr
grep 'SUB multiply defined' stderr
-grep 'warnings are treated as errors' stderr && Exit 1
+grep 'warnings are treated as errors' stderr && exit 1
:
diff --git a/t/whoami.sh b/t/whoami.sh
index 72153ca..4a4c2e9 100755
--- a/t/whoami.sh
+++ b/t/whoami.sh
@@ -18,7 +18,7 @@
# from Johan Danielsson (and a very nice bug report, too, I might
# add).
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
WHO_AM_I=17
diff --git a/t/xsource.sh b/t/xsource.sh
index 677670f..2a65f40 100755
--- a/t/xsource.sh
+++ b/t/xsource.sh
@@ -17,7 +17,7 @@
# Test to make sure multiple source files with the same object
# file causes error.
-. ./defs || Exit 1
+. ./defs || exit 1
cat > Makefile.am << 'END'
bin_PROGRAMS = zardoz
diff --git a/t/yacc-auxdir.sh b/t/yacc-auxdir.sh
index 534abbd..d531758 100755
--- a/t/yacc-auxdir.sh
+++ b/t/yacc-auxdir.sh
@@ -17,7 +17,7 @@
# Test to make sure ylwrap is put in right location.
# Report from Tim Van Holder.
-. ./defs || Exit 1
+. ./defs || exit 1
mkdir aux1 sub
@@ -47,8 +47,8 @@ END
$ACLOCAL
$AUTOMAKE -a
test -f aux1/ylwrap
-test ! -f ylwrap
-test ! -f sub/ylwrap
+test ! -e ylwrap
+test ! -e sub/ylwrap
grep -i 'ylwrap' Makefile.in sub/Makefile.in # For debugging.
$FGREP '$(am__config_aux_dir)/ylwrap' Makefile.in
$FGREP '$(am__config_aux_dir)/ylwrap' sub/Makefile.in
diff --git a/t/yacc-basic.sh b/t/yacc-basic.sh
index 09dd394..2a98f9f 100755
--- a/t/yacc-basic.sh
+++ b/t/yacc-basic.sh
@@ -18,7 +18,7 @@
# Keep in sync with sister test 'yacc-cxx.test'.
required='cc yacc'
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
@@ -69,9 +69,9 @@ test -f bar-parse.output
if ! cross_compiling; then
echo a | ./foo
- echo b | ./foo && Exit 1
+ echo b | ./foo && exit 1
echo a | ./bar
- echo b | ./bar && Exit 1
+ echo b | ./bar && exit 1
: For shells with busted 'set -e'.
fi
@@ -102,7 +102,7 @@ test -f bar-parse.c
./configure # We must re-create 'Makefile'.
$MAKE maintainer-clean
ls -l
-test ! -f parse.c
-test ! -f bar-parse.c
+test ! -e parse.c
+test ! -e bar-parse.c
:
diff --git a/t/yacc-bison-skeleton-cxx.sh b/t/yacc-bison-skeleton-cxx.sh
index c770a85..315dc33 100755
--- a/t/yacc-bison-skeleton-cxx.sh
+++ b/t/yacc-bison-skeleton-cxx.sh
@@ -18,7 +18,7 @@
# For Automake bug#7648 and PR automake/491.
required='c++ bison'
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CXX
diff --git a/t/yacc-bison-skeleton.sh b/t/yacc-bison-skeleton.sh
index 5cb034c..9b0c376 100755
--- a/t/yacc-bison-skeleton.sh
+++ b/t/yacc-bison-skeleton.sh
@@ -18,7 +18,7 @@
# For Automake bug#7648 and PR automake/491.
required='cc bison'
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
diff --git a/t/yacc-clean-cxx.sh b/t/yacc-clean-cxx.sh
index 399f026..20d04d1 100755
--- a/t/yacc-clean-cxx.sh
+++ b/t/yacc-clean-cxx.sh
@@ -21,7 +21,7 @@
# See also sister test 'yacc-clean.test'.
required='c++ yacc'
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CXX
@@ -126,20 +126,20 @@ for target in clean distclean; do
ls -l . sub1 sub2
test -f sub1/parsefoo.cxx
test -f sub1/bar-parsebar.cc
- test ! -r sub1/parsebaz.y++
- test ! -r sub1/parsebaz.c++
- test ! -r sub1/parsequx.ypp
- test ! -r sub1/qux-parsequx.cpp
+ test ! -e sub1/parsebaz.y++
+ test ! -e sub1/parsebaz.c++
+ test ! -e sub1/parsequx.ypp
+ test ! -e sub1/qux-parsequx.cpp
test -f sub2/parsefoo.cxx
test -f sub2/parsefoo.hxx
test -f sub2/bar-parsebar.cc
test -f sub2/bar-parsebar.hh
- test ! -r sub2/parsebaz.y++
- test ! -r sub2/parsebaz.c++
- test ! -r sub2/parsebaz.h++
- test ! -r sub2/parsequx.ypp
- test ! -r sub2/qux-parsequx.cpp
- test ! -r sub2/qux-parsequx.hpp
+ test ! -e sub2/parsebaz.y++
+ test ! -e sub2/parsebaz.c++
+ test ! -e sub2/parsebaz.h++
+ test ! -e sub2/parsequx.ypp
+ test ! -e sub2/qux-parsequx.cpp
+ test ! -e sub2/qux-parsequx.hpp
done
cp config.sav config.status
@@ -149,16 +149,13 @@ $MAKE maintainer-clean
ls -l . sub1 sub2
test -f sub1/parsefoo.yxx
test -f sub1/parsebar.yy
-test ! -r sub1/parsefoo.cxx
-test ! -r sub1/bar-parsebar.cc
+test ! -e sub1/parsefoo.cxx
+test ! -e sub1/bar-parsebar.cc
test -f sub2/parsefoo.yxx
test -f sub2/parsebar.yy
-test ! -r sub2/parsefoo.cxx
-test ! -r sub2/parsefoo.hxx
-test ! -r sub2/bar-parsebar.cc
-test ! -r sub2/bar-parsebar.hh
-
-cp config.sav config.status
-./config.status # re-create Makefile
+test ! -e sub2/parsefoo.cxx
+test ! -e sub2/parsefoo.hxx
+test ! -e sub2/bar-parsebar.cc
+test ! -e sub2/bar-parsebar.hh
:
diff --git a/t/yacc-clean.sh b/t/yacc-clean.sh
index 530f87f..07b3b79 100755
--- a/t/yacc-clean.sh
+++ b/t/yacc-clean.sh
@@ -20,7 +20,7 @@
# See also sister test 'yacc-cxx-clean.test'.
required='cc yacc'
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
@@ -115,19 +115,19 @@ for target in clean distclean; do
test -f sub1/parse.y
test -f sub1/parse.c
test -f sub1/bar-parse.c
- test ! -r sub1/baz.y
- test ! -r sub1/baz.c
- test ! -r sub1/qux-baz.c
+ test ! -e sub1/baz.y
+ test ! -e sub1/baz.c
+ test ! -e sub1/qux-baz.c
test -f sub2/parse.y
test -f sub2/parse.c
test -f sub2/parse.h
test -f sub2/bar-parse.c
test -f sub2/bar-parse.h
- test ! -r sub2/baz.y
- test ! -r sub2/baz.c
- test ! -r sub2/baz.h
- test ! -r sub2/qux-baz.c
- test ! -r sub2/qux-baz.h
+ test ! -e sub2/baz.y
+ test ! -e sub2/baz.c
+ test ! -e sub2/baz.h
+ test ! -e sub2/qux-baz.c
+ test ! -e sub2/qux-baz.h
done
cp config.sav config.status
@@ -136,12 +136,12 @@ cp config.sav config.status
$MAKE maintainer-clean
ls -l . sub1 sub2
test -f sub1/parse.y
-test ! -r sub1/parse.c
-test ! -r sub1/bar-parse.c
+test ! -e sub1/parse.c
+test ! -e sub1/bar-parse.c
test -f sub2/parse.y
-test ! -r sub2/parse.c
-test ! -r sub2/parse.h
-test ! -r sub2/bar-parse.c
-test ! -r sub2/bar-parse.h
+test ! -e sub2/parse.c
+test ! -e sub2/parse.h
+test ! -e sub2/bar-parse.c
+test ! -e sub2/bar-parse.h
:
diff --git a/t/yacc-cxx.sh b/t/yacc-cxx.sh
index 6efb86f..2d284f4 100755
--- a/t/yacc-cxx.sh
+++ b/t/yacc-cxx.sh
@@ -19,7 +19,7 @@
# Keep in sync with sister test 'yacc-basic.test'.
required='c++ yacc'
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CXX
@@ -92,7 +92,7 @@ test -f foo4-parse4.output
if ! cross_compiling; then
for i in 1 2 3 4; do
echo a | ./foo$i
- echo b | ./foo$i && Exit 1
+ echo b | ./foo$i && exit 1
: For shells with busted 'set -e'.
done
fi
@@ -132,9 +132,9 @@ test -f foo4-parse4.cpp
./configure # Re-create 'Makefile'.
$MAKE maintainer-clean
ls -l
-test ! -f parse1.cc
-test ! -f parse2.c++
-test ! -f foo3-parse3.cxx
-test ! -f foo4-parse4.cpp
+test ! -e parse1.cc
+test ! -e parse2.c++
+test ! -e foo3-parse3.cxx
+test ! -e foo4-parse4.cpp
:
diff --git a/t/yacc-d-basic.sh b/t/yacc-d-basic.sh
index a374df0..905c04c 100755
--- a/t/yacc-d-basic.sh
+++ b/t/yacc-d-basic.sh
@@ -19,7 +19,7 @@
# Keep in sync with sister test 'yacc-d-cxx.test'.
required='cc yacc'
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
@@ -75,7 +75,7 @@ $ACLOCAL
$AUTOCONF
$AUTOMAKE -a
-$FGREP parse.h foo/Makefile.in bar/Makefile.in baz/Makefile.in && Exit 1
+$FGREP parse.h foo/Makefile.in bar/Makefile.in baz/Makefile.in && exit 1
cat >> foo/Makefile.am <<END
BUILT_SOURCES = parse.h
@@ -144,11 +144,11 @@ test -f baz/zardoz-parse.c
test -f baz/zardoz-parse.h
./configure # Re-create 'Makefile'.
$MAKE maintainer-clean
-test ! -f foo/parse.c
-test ! -f foo/parse.h
-test ! -f bar/parse.c
-test ! -f bar/parse.h
-test ! -f baz/zardoz-parse.c
-test ! -f baz/zardoz-parse.h
+test ! -e foo/parse.c
+test ! -e foo/parse.h
+test ! -e bar/parse.c
+test ! -e bar/parse.h
+test ! -e baz/zardoz-parse.c
+test ! -e baz/zardoz-parse.h
:
diff --git a/t/yacc-d-cxx.sh b/t/yacc-d-cxx.sh
index 34970f8..0483d8c 100755
--- a/t/yacc-d-cxx.sh
+++ b/t/yacc-d-cxx.sh
@@ -19,7 +19,7 @@
# Keep in sync with sister test 'yacc-d-basic.test'.
required='c++ yacc'
-. ./defs || Exit 1
+. ./defs || exit 1
write_parse ()
{
@@ -219,13 +219,13 @@ test -f qux/maude-parse.cxx
test -f qux/maude-parse.hxx
./configure # Re-create 'Makefile'.
$MAKE maintainer-clean
-test ! -f foo/parse.cc
-test ! -f foo/parse.hh
-test ! -f bar/parse.cpp
-test ! -f bar/parse.hpp
-test ! -f baz/sub/parse.c++
-test ! -f baz/sub/parse.h++
-test ! -f qux/maude-parse.cxx
-test ! -f qux/maude-parse.hxx
+test ! -e foo/parse.cc
+test ! -e foo/parse.hh
+test ! -e bar/parse.cpp
+test ! -e bar/parse.hpp
+test ! -e baz/sub/parse.c++
+test ! -e baz/sub/parse.h++
+test ! -e qux/maude-parse.cxx
+test ! -e qux/maude-parse.hxx
:
diff --git a/t/yacc-d-vpath.sh b/t/yacc-d-vpath.sh
index 78a486a..a195052 100755
--- a/t/yacc-d-vpath.sh
+++ b/t/yacc-d-vpath.sh
@@ -23,7 +23,7 @@
# Please keep this in sync with sister test 'yaccvpath.test'.
required='cc yacc'
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
diff --git a/t/yacc-deleted-headers.sh b/t/yacc-deleted-headers.sh
index 3ac0254..d522b8c 100755
--- a/t/yacc-deleted-headers.sh
+++ b/t/yacc-deleted-headers.sh
@@ -17,7 +17,7 @@
# Tests that we can recover from deleted headers generated by 'yacc -d'.
required='cc yacc'
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
@@ -106,28 +106,28 @@ headers='parse1.h p2-parse2.h parse3.h parse4.h'
rm -f $headers
$MAKE parse1.h
test -f parse1.h
-test ! -r p2-parse2.h
-test ! -r parse3.h
-test ! -r parse4.h
+test ! -e p2-parse2.h
+test ! -e parse3.h
+test ! -e parse4.h
rm -f $headers
$MAKE p2-parse2.h
-test ! -r parse1.h
+test ! -e parse1.h
test -f p2-parse2.h
-test ! -r parse3.h
-test ! -r parse4.h
+test ! -e parse3.h
+test ! -e parse4.h
rm -f $headers
$MAKE parse3.h
-test ! -r parse1.h
-test ! -r p2-parse2.h
+test ! -e parse1.h
+test ! -e p2-parse2.h
test -f parse3.h
-test ! -r parse4.h
+test ! -e parse4.h
# Since we declared parse3.h into $(p3_SOURCES), make should be
# able to rebuild it automatically before remaking 'p3'.
rm -f $headers
$MAKE clean-p3
-test ! -f parse3.h # Sanity check.
+test ! -e parse3.h # Sanity check.
$MAKE build-p3
test -f parse3.h
@@ -135,9 +135,9 @@ $MAKE
rm -f $headers
$MAKE parse4.h
-test ! -r parse1.h
-test ! -r p2-parse2.h
-test ! -r parse3.h
+test ! -e parse1.h
+test ! -e p2-parse2.h
+test ! -e parse3.h
test -f parse4.h
# Now remake all the headers together.
@@ -158,6 +158,6 @@ test -f p2-parse2.h
test -f parse3.h
# parse4.h is not declared in any *_SOURCES variable, nor #included
# by any C source file, so it shouldn't be rebuilt by "make all".
-test ! -r parse4.h
+test ! -e parse4.h
:
diff --git a/t/yacc-depend.sh b/t/yacc-depend.sh
index 04ddb52..f7254a2 100755
--- a/t/yacc-depend.sh
+++ b/t/yacc-depend.sh
@@ -18,7 +18,7 @@
# Report from Paolo Bonzini.
required='cc yacc'
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
diff --git a/t/yacc-depend2.sh b/t/yacc-depend2.sh
index c5b69f6..281dcd2 100755
--- a/t/yacc-depend2.sh
+++ b/t/yacc-depend2.sh
@@ -18,7 +18,7 @@
# for yacc rules.
required='cc yacc'
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
diff --git a/t/yacc-dist-nobuild-subdir.sh b/t/yacc-dist-nobuild-subdir.sh
index 174d704..94919aa 100755
--- a/t/yacc-dist-nobuild-subdir.sh
+++ b/t/yacc-dist-nobuild-subdir.sh
@@ -18,7 +18,7 @@
# using yacc sources in a subdir option. Exposes automake bug#8485.
required='cc yacc'
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
@@ -63,12 +63,12 @@ $MAKE distdir
test -f sub/parse.c
test -f sub/parse.h
test -f sub/bar-parse.c
-test ! -r sub/bar-parse.h
+test ! -e sub/bar-parse.h
test -f $distdir/sub/parse.c
test -f $distdir/sub/parse.h
test -f $distdir/sub/bar-parse.c
-test ! -r $distdir/sub/bar-parse.h
+test ! -e $distdir/sub/bar-parse.h
# But they shouldn't be rebuilt in VPATH builds.
@@ -81,7 +81,7 @@ chmod u+w .
../configure --enable-dependency-tracking YACC=false
$MAKE all YACC=false
-ls -l sub/*.[ch] && Exit 1
+ls -l sub/*.[ch] && exit 1
$MAKE distcheck YACC=false DISTCHECK_CONFIGURE_FLAGS='YACC=false'
diff --git a/t/yacc-dist-nobuild.sh b/t/yacc-dist-nobuild.sh
index 04c887f..45cb109 100755
--- a/t/yacc-dist-nobuild.sh
+++ b/t/yacc-dist-nobuild.sh
@@ -19,7 +19,7 @@
# See automake bug#7884.
required='cc yacc'
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
@@ -83,7 +83,7 @@ chmod a-w $distdir
mkdir build2
cd build2
../$distdir/configure
-$MAKE 2>stderr && { cat stderr >&2; Exit 1; }
+$MAKE 2>stderr && { cat stderr >&2; exit 1; }
cat stderr >&2
$FGREP parse.c stderr
diff --git a/t/yacc-lex-cxx-alone.sh b/t/yacc-lex-cxx-alone.sh
index e9548a5..e669cbc 100755
--- a/t/yacc-lex-cxx-alone.sh
+++ b/t/yacc-lex-cxx-alone.sh
@@ -18,7 +18,7 @@
# Lex + C++ support for a program built only from lex sources.
required='c++ yacc'
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CXX
@@ -101,9 +101,9 @@ test -f bar.cxx
if cross_compiling; then :; else
echo a | ./foo
- echo b | ./foo && Exit 1
+ echo b | ./foo && exit 1
echo x | ./bar
- echo y | ./bar && Exit 1
+ echo y | ./bar && exit 1
: # Don't trip on 'set -e'.
fi
diff --git a/t/yacc-line.sh b/t/yacc-line.sh
index 1d536ee..fab905e 100755
--- a/t/yacc-line.sh
+++ b/t/yacc-line.sh
@@ -19,7 +19,7 @@
# See also sister test 'lex-line.test'.
required='cc yacc'
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
@@ -78,15 +78,15 @@ for vpath in : false; do
$EGREP 'line|\.y' $c_outputs
# Adjusted "#line" should not contain reference to the builddir.
- grep '#.*line.*build.*\.y' $c_outputs && Exit 1
+ grep '#.*line.*build.*\.y' $c_outputs && exit 1
# Adjusted "#line" should not contain reference to the absolute
# srcdir.
- $EGREP '#.*line *"?/.*\.y' $c_outputs && Exit 1
+ $EGREP '#.*line *"?/.*\.y' $c_outputs && exit 1
# Adjusted "#line" should not contain reference to the default
# output file names, e.g., 'y.tab.c' and 'y.tab.h'.
- grep '#.*line.*y\.tab\.' $c_outputs && Exit 1
+ grep '#.*line.*y\.tab\.' $c_outputs && exit 1
# Look out for a silly regression.
- grep "#.*\.y.*\.y" $c_outputs && Exit 1
+ grep "#.*\.y.*\.y" $c_outputs && exit 1
if $vpath; then
grep '#.*line.*"\.\./zardoz\.y"' zardoz.c
grep '#.*line.*"\.\./zardoz\.y"' baz-zardoz.c
diff --git a/t/yacc-mix-c-cxx.sh b/t/yacc-mix-c-cxx.sh
index a1bc128..b688992 100755
--- a/t/yacc-mix-c-cxx.sh
+++ b/t/yacc-mix-c-cxx.sh
@@ -18,7 +18,7 @@
# in the same directory.
required='cc c++ yacc'
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
@@ -157,7 +157,7 @@ for try in 0 1; do
esac
else
echo "$me: invalid value of \$try '$try'" >&2
- Exit 99
+ exit 99
fi
$srcdir/configure
@@ -168,7 +168,7 @@ for try in 0 1; do
test -f p.c
test -f p.h
test -f c2-p.c
- test ! -r c2-p.h
+ test ! -e c2-p.h
test -f parse.cc
test -f parse.hh
@@ -176,8 +176,8 @@ for try in 0 1; do
test -f parse3.hxx
test -f cxx2-parse2.c++
- test ! -r parse2.h++
- test ! -r cxx2-parse2.h++
+ test ! -e parse2.h++
+ test ! -e cxx2-parse2.h++
# Minimal checks about recovering from header removal.
rm -f p.h parse.hh parse3.hxx
@@ -185,7 +185,7 @@ for try in 0 1; do
$debug_info
test -f p.h
test -f parse.hh
- test ! -r parse3.hxx
+ test ! -e parse3.hxx
$run_make
$debug_info
test -f parse3.hxx
diff --git a/t/yacc-nodist.sh b/t/yacc-nodist.sh
index af2bbd0..14fa0a7 100755
--- a/t/yacc-nodist.sh
+++ b/t/yacc-nodist.sh
@@ -21,7 +21,7 @@
# for lex-generated .c files.
required='cc yacc'
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
diff --git a/t/yacc-pr204.sh b/t/yacc-pr204.sh
index f1c8cac..44b73b3 100755
--- a/t/yacc-pr204.sh
+++ b/t/yacc-pr204.sh
@@ -21,7 +21,7 @@
# for lex-generated C files.
required='cc yacc'
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac <<'EOF'
AM_MAINTAINER_MODE
diff --git a/t/yacc-subobj-nodep.sh b/t/yacc-subobj-nodep.sh
index e0c415f..81c11aa 100755
--- a/t/yacc-subobj-nodep.sh
+++ b/t/yacc-subobj-nodep.sh
@@ -18,7 +18,7 @@
# are used, even when dependency tracking is disabled.
required='cc yacc'
-. ./defs || Exit 1
+. ./defs || exit 1
cat >configure.ac <<END
AC_INIT([$me], [1.0])
diff --git a/t/yacc-weirdnames.sh b/t/yacc-weirdnames.sh
index 82270fe..ab43af3 100755
--- a/t/yacc-weirdnames.sh
+++ b/t/yacc-weirdnames.sh
@@ -17,7 +17,7 @@
# Check that yacc sources with many dots in their name are handled
# correctly.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
diff --git a/t/yacc.sh b/t/yacc.sh
index 60b5a4f..0a838a9 100755
--- a/t/yacc.sh
+++ b/t/yacc.sh
@@ -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
cat >> configure.ac << 'END'
AC_PROG_CC
diff --git a/t/yacc2.sh b/t/yacc2.sh
index bfab752..11a1bcb 100755
--- a/t/yacc2.sh
+++ b/t/yacc2.sh
@@ -18,7 +18,7 @@
# if (AM_)?YFLAGS do not contain -d. Requested by Jim Meyering.
# See also the related semantic test 'yacc-d-basic.test'.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
@@ -39,7 +39,7 @@ cp Makefile.am Makefile.src
$AUTOMAKE -a
# If zardoz.h IS mentioned, fail.
-$FGREP 'zardoz.h' Makefile.in && Exit 1
+$FGREP 'zardoz.h' Makefile.in && exit 1
cp Makefile.src Makefile.am
echo 'AM_YFLAGS = -d' >> Makefile.am
@@ -51,7 +51,7 @@ cp Makefile.src Makefile.am
echo 'AM_YFLAGS = ' >> Makefile.am
$AUTOMAKE
# If zardoz.h IS mentioned, fail.
-$FGREP 'zardoz.h' Makefile.in && Exit 1
+$FGREP 'zardoz.h' Makefile.in && exit 1
cp Makefile.src Makefile.am
echo 'YFLAGS = -d' >> Makefile.am
@@ -67,6 +67,6 @@ cp Makefile.src Makefile.am
echo 'YFLAGS = ' >> Makefile.am
$AUTOMAKE -Wno-gnu
# If zardoz.h IS mentioned, fail.
-$FGREP 'zardoz.h' Makefile.in && Exit 1
+$FGREP 'zardoz.h' Makefile.in && exit 1
:
diff --git a/t/yacc4.sh b/t/yacc4.sh
index 3f9a204..a0e121f 100755
--- a/t/yacc4.sh
+++ b/t/yacc4.sh
@@ -17,7 +17,7 @@
# Some simple tests of ylwrap functionality.
required='cc yacc'
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
@@ -70,8 +70,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
@@ -80,7 +80,7 @@ test -f parse.c
# ... but maintainer-clean should.
../configure
$MAKE maintainer-clean
-test ! -f bar.c
-test ! -f parse.c
+test ! -e bar.c
+test ! -e parse.c
:
diff --git a/t/yacc5.sh b/t/yacc5.sh
index b24dcd3..9a8d8da 100755
--- a/t/yacc5.sh
+++ b/t/yacc5.sh
@@ -17,7 +17,7 @@
# Test of yacc functionality, derived from GNU binutils
# by Tim Van Holder.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
@@ -34,7 +34,7 @@ END
$AUTOMAKE -a
# No rule needed, the default .y.c: inference rule is enough
# (but there may be an additional dependency on a dirstamp file).
-grep '^sub/maude\.c:.*maude\.y' Makefile.in && Exit 1
+grep '^sub/maude\.c:.*maude\.y' Makefile.in && exit 1
## Try again with per-exe flags.
@@ -47,9 +47,9 @@ END
$AUTOMAKE -a
grep '^sub/maude-maude\.c:.*sub/maude\.y' Makefile.in
# 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/t/yacc7.sh b/t/yacc7.sh
index a3602e9..5d7be75 100755
--- a/t/yacc7.sh
+++ b/t/yacc7.sh
@@ -21,7 +21,7 @@
# PR/47.
required='cc yacc'
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
@@ -71,7 +71,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
@@ -83,7 +83,7 @@ test -f foo.c
# ... but maintainer-clean should.
./configure # Re-create 'Makefile'.
$MAKE maintainer-clean
-test ! -f foo.h
-test ! -f foo.c
+test ! -e foo.h
+test ! -e foo.c
:
diff --git a/t/yacc8.sh b/t/yacc8.sh
index 5f1a2f8..901066a 100755
--- a/t/yacc8.sh
+++ b/t/yacc8.sh
@@ -18,7 +18,7 @@
required='cc yacc'
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
diff --git a/t/yaccdry.sh b/t/yaccdry.sh
index 3100ce3..8e5af56 100755
--- a/t/yaccdry.sh
+++ b/t/yaccdry.sh
@@ -17,7 +17,7 @@
# Removal recovery rules for headers should not remove files with 'make -n'.
required='cc yacc'
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
@@ -53,6 +53,6 @@ $MAKE
rm -f parse.h
$MAKE -n parse.h
test -f parse.c
-test ! -f parse.h
+test ! -e parse.h
:
diff --git a/t/yaccpp.sh b/t/yaccpp.sh
index c065a50..2395b56 100755
--- a/t/yaccpp.sh
+++ b/t/yaccpp.sh
@@ -19,7 +19,7 @@
# which does much more in-depth checks (but requires an actual
# Yacc program and a working C++ compiler).
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CXX
@@ -39,7 +39,7 @@ $AUTOMAKE -a
$EGREP '(\.[ch]|foo|bar|baz|qux)' Makefile.in # For debugging.
-$EGREP '(foo|bar|baz|qux)\.h' Makefile.in && Exit 1
+$EGREP '(foo|bar|baz|qux)\.h' Makefile.in && exit 1
sed -e 's/^/ /' -e 's/$/ /' Makefile.in >mk
@@ -70,12 +70,12 @@ $EGREP '(^| )foo\.h\+\+(:| .*:)' Makefile.in
$EGREP '(^| )bar\.hpp(:| .*:)' Makefile.in
$EGREP '(^| )baz\.hh(:| .*:)' Makefile.in
-grep ' foo\.h[ :]' mk && Exit 1
-grep ' bar\.h[ :]' mk && Exit 1
-grep ' baz\.h[ :]' mk && Exit 1
+grep ' foo\.h[ :]' mk && exit 1
+grep ' bar\.h[ :]' mk && exit 1
+grep ' baz\.h[ :]' mk && exit 1
$FGREP ' qux-qux.cxx ' mk
$EGREP '(^| )qux-qux\.cxx(:| .*:)' Makefile.in
-grep 'qux\.h.*:' Makefile.in && Exit 1
+grep 'qux\.h.*:' Makefile.in && exit 1
:
diff --git a/t/yaccvpath.sh b/t/yaccvpath.sh
index 65ab53b..aacadda 100755
--- a/t/yaccvpath.sh
+++ b/t/yaccvpath.sh
@@ -23,7 +23,7 @@
# Please keep this in sync with sister test 'yacc-d-vpath.test'.
required='cc yacc'
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac << 'END'
AC_PROG_CC
diff --git a/t/yflags-cmdline-override.sh b/t/yflags-cmdline-override.sh
index 6628066..6139e4f 100755
--- a/t/yflags-cmdline-override.sh
+++ b/t/yflags-cmdline-override.sh
@@ -18,7 +18,7 @@
# at configure time and/or at make time.
required='cc yacc'
-. ./defs || Exit 1
+. ./defs || exit 1
unset YFLAGS || :
@@ -69,7 +69,7 @@ ls -l
$MAKE
ls -l
test -f foo.c
-test ! -r foo.h
+test ! -e foo.h
test -f foo.output
$MAKE maintainer-clean
@@ -80,7 +80,7 @@ $MAKE YFLAGS=-d
ls -l
test -f foo.c
test -f foo.h
-test ! -r foo.output
+test ! -e foo.output
$MAKE maintainer-clean
ls -l
diff --git a/t/yflags-conditional.sh b/t/yflags-conditional.sh
index 0cd09d2..6765613 100755
--- a/t/yflags-conditional.sh
+++ b/t/yflags-conditional.sh
@@ -17,7 +17,7 @@
# Check that automake complains about *_YFLAGS variables which have
# conditional content.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac <<'END'
AC_PROG_CC
@@ -135,7 +135,7 @@ grep '^Makefile4\.am:8:.*zardoz_YFLAGS.* conditional
contents' stderr
AUTOMAKE_fails -Wno-gnu Makefile5
grep -v '^Makefile5\.am:.*zardoz_YFLAGS' stderr \
| grep -v ': warnings are treated as errors' \
- | grep . && Exit 1
+ | grep . && exit 1
# Disable 'gnu' warnings because we override the user variable 'YFLAGS'.
$AUTOMAKE -Wno-gnu Makefile6
diff --git a/t/yflags-d-false-positives.sh b/t/yflags-d-false-positives.sh
index 78820ca..5b120dd 100755
--- a/t/yflags-d-false-positives.sh
+++ b/t/yflags-d-false-positives.sh
@@ -16,7 +16,7 @@
# Check for false positives in automake recognition of '-d' in YFLAGS.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac <<'END'
AC_PROG_CC
@@ -35,7 +35,7 @@ foobar_YFLAGS = - d $(foovar)-d -dd
END
$AUTOMAKE -a
-$EGREP '(foobar|zardoz)\.h.*:' Makefile.in && Exit 1
-$EGREP '(foobar|zardoz)\.h' Makefile.in | $FGREP -v '$(YLWRAP) ' && Exit 1
+$EGREP '(foobar|zardoz)\.h.*:' Makefile.in && exit 1
+$EGREP '(foobar|zardoz)\.h' Makefile.in | $FGREP -v '$(YLWRAP) ' && exit 1
:
diff --git a/t/yflags-force-conditional.sh b/t/yflags-force-conditional.sh
index 8a98903..a8404b7 100755
--- a/t/yflags-force-conditional.sh
+++ b/t/yflags-force-conditional.sh
@@ -17,7 +17,7 @@
# Check that the user can force automake to use *_YFLAGS variables
# which have conditional content.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac <<'END'
AC_SUBST([CC], [false])
@@ -67,7 +67,7 @@ cat bar-foo.c
$FGREP ' __am_cond_yes__ ' foo.c
$FGREP ' __bar_cond_yes__ ' bar-foo.c
-$FGREP 'cond_no' foo.c bar-foo.c && Exit 1
+$FGREP 'cond_no' foo.c bar-foo.c && exit 1
$MAKE maintainer-clean
ls -l
@@ -80,6 +80,6 @@ cat bar-foo.c
$FGREP ' __am_cond_no__ ' foo.c
$FGREP ' __bar_cond_no__ ' bar-foo.c
-$FGREP 'cond_yes' foo.c bar-foo.c && Exit 1
+$FGREP 'cond_yes' foo.c bar-foo.c && exit 1
:
diff --git a/t/yflags-force-override.sh b/t/yflags-force-override.sh
index 3f4755e..8682637 100755
--- a/t/yflags-force-override.sh
+++ b/t/yflags-force-override.sh
@@ -19,7 +19,7 @@
# variable is user-reserved).
required='cc yacc'
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac <<'END'
AC_PROG_CC
diff --git a/t/yflags-var-expand.sh b/t/yflags-var-expand.sh
index d3bd0d4..789cc2c 100755
--- a/t/yflags-var-expand.sh
+++ b/t/yflags-var-expand.sh
@@ -19,7 +19,7 @@
# foo_flags = -d
# AM_YFLAGS = $(foo_flags)
-. ./defs || Exit 1
+. ./defs || exit 1
cat >> configure.ac <<'END'
AC_PROG_CC
diff --git a/t/yflags.sh b/t/yflags.sh
index 969ded0..4a4f6bf 100755
--- a/t/yflags.sh
+++ b/t/yflags.sh
@@ -19,7 +19,7 @@
# Please keep this in sync with the sister tests yflags2.test, lflags.test
# and lflags2.test.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >fake-yacc <<'END'
#!/bin/sh
@@ -47,8 +47,8 @@ END
$ACLOCAL
$AUTOMAKE -a
-grep '\$(YFLAGS).*\$(bar_YFLAGS)' Makefile.in && Exit 1
-grep '\$(YFLAGS).*\$(AM_YFLAGS)' Makefile.in && Exit 1
+grep '\$(YFLAGS).*\$(bar_YFLAGS)' Makefile.in && exit 1
+grep '\$(YFLAGS).*\$(AM_YFLAGS)' Makefile.in && exit 1
: > foo.y
: > bar.y
diff --git a/t/yflags2.sh b/t/yflags2.sh
index 092b5b8..30d0a82 100755
--- a/t/yflags2.sh
+++ b/t/yflags2.sh
@@ -19,7 +19,7 @@
# Please keep this in sync with the sister tests yflags.test, lflags.test
# and lflags2.test.
-. ./defs || Exit 1
+. ./defs || exit 1
cat >fake-yacc <<'END'
#!/bin/sh
@@ -47,8 +47,8 @@ END
$ACLOCAL
$AUTOMAKE -a
-grep '\$(YFLAGS).*\$(bar_YFLAGS)' Makefile.in && Exit 1
-grep '\$(YFLAGS).*\$(AM_YFLAGS)' Makefile.in && Exit 1
+grep '\$(YFLAGS).*\$(bar_YFLAGS)' Makefile.in && exit 1
+grep '\$(YFLAGS).*\$(AM_YFLAGS)' Makefile.in && exit 1
: > foo.yy
: > bar.y++
hooks/post-receive
--
GNU Automake
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Automake-commit] [SCM] GNU Automake branch, ng/master, updated. v1.12.1-530-g7a3a1b6,
Stefano Lattarini <=