diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-06-24 10:36:15 +0200 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-06-25 10:29:43 +0200 |
| commit | c2a52bf0e8e87b8f347ca22b9ab2da7613bc4336 (patch) | |
| tree | 1e2115c0d24da906daa64cc84d853e538129574f | |
| parent | aa630a928a586fd8dc8a087337c3462d7f4fd1c6 (diff) | |
| download | automake-c2a52bf0e8e87b8f347ca22b9ab2da7613bc4336.tar.gz | |
tests: simpler workaround for shells losing the exit status in exit trap
Now that we can assume our tests are run by a decent POSIX shell, we
can simplify our workaround aimed at having the exit status propagated
correctly to the code in the exit trap. Unfortunately, we cannot
dispense with such a workaround altogether, because it's still required
by some shells we need to support (at least Solaris 10 /bin/ksh and
/usr/xpg4/bin/sh).
For more information about the need of that workaround, see the entry
about 'trap' in the section "Limitations of Shell Builtins" in the
Autoconf manual:
<http://www.gnu.org/software/autoconf/manual/autoconf.html#trap>
The new workaround has been tested successfully with the following
shells:
- Bash 4.1
- Bash 3.2
- Bash 3.0
- Bash 2.05b
- dash 0.5.5.1
- dash 0.5.2
- AT&T Ksh 93u (from official Debian package)
- MirBSD Korn Shell 40.2 (from official Debian package)
- Solaris 9, 10 and 11 /bin/ksh
- Solaris 9, 10 and 11 /usr/xpg4/bin/sh
- NetBSD 5.1 /bin/sh
- NetBSD 5.1 /bin/ksh
* t/ax/test-init.sh (Exit): Rename ...
(_am_exit): ... like this.
(exit): New alias for '_am_exit'. We cannot simply redefine 'exit'
as a shell function, because some shells (dash 0.5.5.1, Solaris 10
/bin/ksh and /usr/xpg4/bin/sh) do not allow it.
(_am_exit, trap): Add extra escaping for 'exit' calls, to ensure we
really invoke the 'exit' builtin and not our alias with the same
name.
* configure.ac: Check that the shell selected to run our testsuite
supports aliases named like shell builtins.
* t/REAMDE: Adjust.
* All tests: Adjust, by simply using 'exit' instead of 'Exit'.
* t/self-check-explicit-skips.sh: Adjust: the first usage of 'exit'
after it has been redefined as an alias must be on a new line w.r.t.
that where the alias is defined, in order for the redefinition to be
honored.
* syntax-checks.mk (sc_tests_Exit_not_exit): Delete.
(sc_tests_exit_not_Exit): New.
(syntax_check_rules): Adjust.
(sc_tests_automake_fails): Simplify the recipe a little.
* Several tests: Remove now useless spurious quoting once required
to placate the 'sc_tests_Exit_not_exit' maintainer check.
* gen-testsuite-part: Likewise. Also, avoid uses of 'Exit' in the
generated scripts.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
1229 files changed, 2723 insertions, 2722 deletions
diff --git a/configure.ac b/configure.ac index 43cb932c9..2b5b05735 100644 --- a/configure.ac +++ b/configure.ac @@ -262,6 +262,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 @@ -323,6 +326,14 @@ AC_DEFUN([_AM_CHECK_CANDIDATE_SHELL], [(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 alias named like shell builtins], + [. ./conftest-alias.sh], + [rm -f conftest-alias.sh], + [rm -f conftest-alias.sh; am_score=1; break]) + break done]) diff --git a/gen-testsuite-part b/gen-testsuite-part index 34e10a83d..002136263 100755 --- a/gen-testsuite-part +++ b/gen-testsuite-part @@ -86,12 +86,10 @@ 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 # In the spirit of VPATH, we prefer a test in the build tree # over one in the source tree. @@ -102,7 +100,7 @@ sub write_wrapper_script ($$$) fi done echo "\$0: cannot find wrapped test '$wrapped_test'" >&2 - exit '99' + exit 99 EOF } @@ -358,7 +356,7 @@ 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 "\$?" EOF diff --git a/syntax-checks.mk b/syntax-checks.mk index 417ae5e8e..3bbc4dae7 100644 --- a/syntax-checks.mk +++ b/syntax-checks.mk @@ -369,27 +369,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 @@ -199,7 +199,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, @@ -216,9 +216,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. @@ -283,7 +280,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 06b17caa2..be7e34976 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 @@ -179,4 +179,4 @@ cd .. # ----------------------------------------------------------------------- # And we're done. -Exit 0 +exit 0 diff --git a/t/acloca10.sh b/t/acloca10.sh index 05db9b9ab..291c80c14 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 @@ -78,7 +78,7 @@ $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 cp aclocal.m4 copy.m4 @@ -91,8 +91,8 @@ $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 diff aclocal.m4 copy.m4 diff --git a/t/acloca11.sh b/t/acloca11.sh index 7a1cff609..3db8508ab 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 958238e1b..64b66bb48 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 6d6f6c01c..bffd4f1f6 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 2ba8b7877..eb9105dde 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 01d11de03..38c6e3e66 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 ab894c739..a702f2729 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 e6098f0a6..a15cd57a7 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 4ae03ff07..ec430dfc0 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,7 +118,7 @@ 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 @@ -126,11 +126,11 @@ grep '#serial 456' stdout test ! -f 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 60e8afe49..c6d23520e 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 030506639..b5881d67f 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 d9b47afc2..2aca3f925 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 85ef29b4a..c8f83075a 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 b5f66e4ce..2366fc40b 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 88caef62f..abd7857d1 100755 --- a/t/aclocal-acdir.sh +++ b/t/aclocal-acdir.sh @@ -18,7 +18,7 @@ # options. Also 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,12 +70,12 @@ $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. rm -rf autom4te*.cache # Obsolescent '--acdir' option. -$ACLOCAL -Wobsolete --acdir am 2>stderr && { cat stderr >&2; Exit 1; } +$ACLOCAL -Wobsolete --acdir am 2>stderr && { cat stderr >&2; exit 1; } cat stderr >&2 grep '.*--acdir.*deprecated' stderr @@ -88,7 +88,7 @@ $FGREP 'am--macro' configure rm -rf autom4te*.cache -$ACLOCAL -Wno-obsolete --acdir sys 2>stderr && { cat stderr >&2; Exit 1; } +$ACLOCAL -Wno-obsolete --acdir sys 2>stderr && { cat stderr >&2; exit 1; } cat stderr >&2 grep 'macro .*AM_INIT_AUTOMAKE.* not found' stderr diff --git a/t/aclocal-install-absdir.sh b/t/aclocal-install-absdir.sh index 1c9938ebf..ada83c229 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 fae2997e0..d459a5585 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,19 +38,19 @@ 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 $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 $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 diff --git a/t/aclocal-install-mkdir.sh b/t/aclocal-install-mkdir.sh index 86cf8031a..483b950aa 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,11 +50,11 @@ 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 +ACLOCAL_PATH="$(pwd)/none:$(pwd)/none2" $ACLOCAL --install && exit 1 test ! -d none test ! -d none2 ACLOCAL_PATH="$(pwd)/none:$(pwd)/none2" $ACLOCAL --install -I x @@ -63,7 +63,7 @@ test ! -d none test ! -d none2 # It's better if aclocal doesn't create the first include dir on failure. -$ACLOCAL --install -I none -I none2 && Exit 1 +$ACLOCAL --install -I none -I none2 && exit 1 test ! -d none test ! -d none2 diff --git a/t/aclocal-no-install-no-mkdir.sh b/t/aclocal-no-install-no-mkdir.sh index 3e685f053..3b163b013 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,7 +30,7 @@ cat > sys-acdir/my-defs.m4 <<END AC_DEFUN([MY_MACRO], [:]) END -$ACLOCAL -I foo --system-acdir=sys-acdir && Exit 1 +$ACLOCAL -I foo --system-acdir=sys-acdir && exit 1 test ! -d foo test ! -r foo diff --git a/t/aclocal-path-install-serial.sh b/t/aclocal-path-install-serial.sh index c238a7868..683845ced 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 71d718cec..b03f28ed3 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,7 +39,7 @@ 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 diff --git a/t/aclocal-path-nonexistent.sh b/t/aclocal-path-nonexistent.sh index 3eb042aad..ad8d5b7ca 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 91d9a424c..81eee9886 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 72b393897..c22a7c4bc 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 ef61b2f62..d057d826e 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 095a3f7fc..27fa0c5ba 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 3e0cac60a..d99da5ff8 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 b2d2ab967..03aa42d8b 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 bc80f64cd..feae3ec17 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 23a7e5e55..4d3730a31 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 8923851cd..dc6b38db3 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 936d4ea0a..4c03a0c4e 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 869969eb6..a242fca36 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 c7ce7514e..bcdd6f477 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 0f9c1cbb0..18f18ff92 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 @@ -32,6 +32,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 9390944c3..19dfbdfc1 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 e8c866359..ea7749c37 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 902ff3bde..0ba69708f 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" @@ -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 @@ -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 c87904b3d..e054dd4f8 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 08fad97dd..38d2cf84f 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 90f2cc267..fe7ec1a1a 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,7 +60,7 @@ $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 diff --git a/t/alpha2.sh b/t/alpha2.sh index 6d5207f61..86f60b9c2 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-tests-environment.sh b/t/am-tests-environment.sh index f2931e6d0..e8fbbe38d 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 1649dd080..555e3f4b6 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 16fdfc3b8..c1d2575ee 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 4132bc177..a120d8110 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 26093cffa..d4476570f 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-deprecation.sh b/t/aminit-moreargs-deprecation.sh index ac91d1d1b..a8d4605e2 100755 --- a/t/aminit-moreargs-deprecation.sh +++ b/t/aminit-moreargs-deprecation.sh @@ -17,7 +17,7 @@ # Check that automake warns against 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.* two-.* three-arguments form.*deprecated' @@ -33,10 +33,10 @@ do_check() { rm -rf autom4te*.cache for cmd in "$AUTOCONF" "$AUTOMAKE"; do - $cmd -Werror -Wnone -Wobsolete 2>stderr && { cat stderr; Exit 1; } + $cmd -Werror -Wnone -Wobsolete 2>stderr && { cat stderr; exit 1; } cat stderr >&2 grep "^configure\.ac:2:.*$warn_rx" stderr - $cmd -Werror -Wall -Wno-obsolete || Exit 1 + $cmd -Werror -Wall -Wno-obsolete || exit 1 done } diff --git a/t/ammissing.sh b/t/ammissing.sh index aa281267c..038dabfe9 100755 --- a/t/ammissing.sh +++ b/t/ammissing.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/amopt.sh b/t/amopt.sh index 786118410..5d6005de5 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 0219f1854..c0d471a00 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 8a035d126..bc0daea28 100755 --- a/t/amopts-variable-expansion.sh +++ b/t/amopts-variable-expansion.sh @@ -16,7 +16,7 @@ # Check that AUTOMAKE_OPTIONS support variable expansion. -. ./defs || Exit 1 +. ./defs || exit 1 # We want complete control over automake options. AUTOMAKE=$am_original_AUTOMAKE @@ -46,7 +46,7 @@ END $ACLOCAL AUTOMAKE_run grep '^Makefile\.am:.*:=.*not portable' stderr -grep README stderr && Exit 1 -$EGREP '(install|override)' stderr && Exit 1 +grep README stderr && exit 1 +$EGREP '(install|override)' stderr && exit 1 : diff --git a/t/amsubst.sh b/t/amsubst.sh index b655ce472..49d50c1e0 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 99f2e9210..452abd381 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 diff --git a/t/ar-lib.sh b/t/ar-lib.sh index 1d6b588db..c6f6a3c88 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 7d7e9b588..da2b5ca58 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 02696f62d..513808aa2 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 d1be2eb41..2bd93aa90 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 1987936b9..abfe51394 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 30a44a8ea..451b337eb 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 be6afcd3f..4ccaa5dd9 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 54c02225e..bebf7152e 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 34e6c6e53..c27cabf47 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 @@ -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 @@ -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 @@ -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 @@ -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 : @@ -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 @@ -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 @@ -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 @@ -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-acconfig-no-subdir.sh b/t/autodist-acconfig-no-subdir.sh index d4ad1d960..474e05fa2 100755 --- a/t/autodist-acconfig-no-subdir.sh +++ b/t/autodist-acconfig-no-subdir.sh @@ -18,7 +18,7 @@ # 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-acconfig.sh b/t/autodist-acconfig.sh index 18b280c3c..98db0a6cd 100755 --- a/t/autodist-acconfig.sh +++ b/t/autodist-acconfig.sh @@ -18,7 +18,7 @@ # (at automake runtime). # Related to automake bug#7819. -. ./defs || Exit 1 +. ./defs || exit 1 cat >> configure.ac <<END AC_OUTPUT diff --git a/t/autodist-aclocal-m4.sh b/t/autodist-aclocal-m4.sh index 6108f5743..a61d804e9 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-config-headers.sh b/t/autodist-config-headers.sh index 65888f813..ad61fd667 100755 --- a/t/autodist-config-headers.sh +++ b/t/autodist-config-headers.sh @@ -19,7 +19,7 @@ # exist at automake runtime. # Related to automake bug#7819. -. ./defs || Exit 1 +. ./defs || exit 1 cat >> configure.ac <<END AC_CONFIG_HEADERS([config.h sub/config.h cfg2.h:conf2.hin]) diff --git a/t/autodist-configure-no-subdir.sh b/t/autodist-configure-no-subdir.sh index cc53cafcc..a48a0a76c 100755 --- a/t/autodist-configure-no-subdir.sh +++ b/t/autodist-configure-no-subdir.sh @@ -18,7 +18,7 @@ # automatically 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 0055e4cd1..58742ceb5 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 4db1f141e..6d8b02d15 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 1454edd7b..8d3e2fb4d 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]) diff --git a/t/autodist.sh b/t/autodist.sh index 952df4abd..bde9f777c 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]) diff --git a/t/autohdr.sh b/t/autohdr.sh index bef7027fe..19daabeed 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/autohdr2.sh b/t/autohdr2.sh index 6f5415e00..292a800bd 100755 --- a/t/autohdr2.sh +++ b/t/autohdr2.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 AM_CONFIG_HEADER([thisfile.h]) diff --git a/t/autohdr3.sh b/t/autohdr3.sh index ad5513059..0fccc535a 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 9bdfd13e4..fa1f8f0f6 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 9df36f1e4..3399ec8fe 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]) diff --git a/t/automake-cmdline.tap b/t/automake-cmdline.tap index 72c559a4b..dd8b30a48 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 41a73d5ae..654a30348 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 487958df7..95d1003a1 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 33f5db061..87259b297 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 5575b284d..43eeed2ce 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 d04b38c89..8f06999fc 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 c4860f4d2..c7f7d7320 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 08de2415a..2194db8ee 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 9a32bcbb8..858a67621 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 4dd083549..317c64b94 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/plain-functions.sh b/t/ax/plain-functions.sh index e6483dc0f..6c5fef82a 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 eebcbe989..3eff61cd4 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 8962326b7..156c4ad83 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 116d4b1b2..24945b67d 100644 --- a/t/ax/test-init.sh +++ b/t/ax/test-init.sh @@ -155,22 +155,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 @@ -181,11 +183,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 @@ -257,7 +259,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 @@ -321,12 +323,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 } # using_gmake @@ -979,7 +981,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 diff --git a/t/ax/testsuite-summary-checks.sh b/t/ax/testsuite-summary-checks.sh index 0c8e98c5d..54d76cd04 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) @@ -81,9 +81,9 @@ do_check () eval "env $tests $xfail_tests \$MAKE -e 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" @@ -95,7 +95,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.sh b/t/backcompat.sh index 8a93141a9..fa8368763 100755 --- a/t/backcompat.sh +++ b/t/backcompat.sh @@ -17,7 +17,7 @@ # Test usage of AM_INIT_AUTOMAKE with two or three arguments, for # backward-compatibility. -. ./defs || Exit 1 +. ./defs || exit 1 cat > Makefile.am <<'END' .PHONY: test display diff --git a/t/backcompat2.sh b/t/backcompat2.sh index ba9ec3b93..84bf64235 100755 --- a/t/backcompat2.sh +++ b/t/backcompat2.sh @@ -19,7 +19,7 @@ # third argument is empty or non-existent. am_create_testdir=empty -. ./defs || Exit 1 +. ./defs || exit 1 # A trick to make the test run muuuch faster, by avoiding repeated # runs of aclocal (one order of magnitude improvement in speed!). @@ -47,7 +47,7 @@ END cat config.h # For debugging. # The non-empty third argument should prevent PACKAGE and VERSION # from being AC_DEFINE'd. - $EGREP 'pkg(name|version)' config.h && Exit 1 + $EGREP 'pkg(name|version)' config.h && exit 1 # This is required because even relatively-recent versions of the # BSD shell wrongly exit when the 'errexit' shell flag is active if # the last command of a compound statement fails, even if it should diff --git a/t/backcompat3.sh b/t/backcompat3.sh index 5dc78f672..e00992bb2 100755 --- a/t/backcompat3.sh +++ b/t/backcompat3.sh @@ -18,7 +18,7 @@ # AM_INIT_AUTOMAKE are both given two or more arguments. am_create_testdir=empty -. ./defs || Exit 1 +. ./defs || exit 1 empty='' @@ -146,7 +146,7 @@ $MAKE got diff exp got -$FGREP am_foo_quux Makefile.in Makefile configure config.status && Exit 1 +$FGREP am_foo_quux Makefile.in Makefile configure config.status && exit 1 ### Done ### diff --git a/t/backcompat4.sh b/t/backcompat4.sh index 9088aae1f..f2e552bf5 100755 --- a/t/backcompat4.sh +++ b/t/backcompat4.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/backcompat5.sh b/t/backcompat5.sh index fda98f47d..88f4ce952 100755 --- a/t/backcompat5.sh +++ b/t/backcompat5.sh @@ -21,7 +21,7 @@ am_serial_tests=yes am_create_testdir=empty -. ./defs || Exit 1 +. ./defs || exit 1 makefiles='hacky/Makefile src/Makefile data/Makefile tests/Makefile' diff --git a/t/backcompat6.sh b/t/backcompat6.sh index 4523a6567..271ffd3c8 100755 --- a/t/backcompat6.sh +++ b/t/backcompat6.sh @@ -21,7 +21,7 @@ required=cc am_create_testdir=empty -. ./defs || Exit 1 +. ./defs || exit 1 # Anyone doing something like this in a real-life package probably # deserves to be killed. diff --git a/t/backsl.sh b/t/backsl.sh index 48d70c719..fb34ee169 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 82e2f084e..5d9d6d158 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 <rwscott@omnisig.com> -. ./defs || Exit 1 +. ./defs || exit 1 cat > Makefile.am << 'END' SUBDIRS = \ diff --git a/t/backsl3.sh b/t/backsl3.sh index 36fab7f32..7891753f2 100755 --- a/t/backsl3.sh +++ b/t/backsl3.sh @@ -17,7 +17,7 @@ # Make sure we diagnose trailing backslash at the end of a file. # Report from Akim Demaile <akim@epita.fr>. -. ./defs || Exit 1 +. ./defs || exit 1 cat > Makefile.am << 'END' foo = \ diff --git a/t/backsl4.sh b/t/backsl4.sh index c11d20d47..707d35860 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/badline.sh b/t/badline.sh index 3f548f75d..3d714250a 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 b06657f27..b548a4f53 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 81ff5b76c..6134e3e57 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 a6e9e3255..7cdb5ff27 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 482015f3e..d16b58060 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 @@ -27,6 +27,6 @@ END $ACLOCAL $AUTOMAKE -grep 'install-recursive' Makefile.in && Exit 1 +grep 'install-recursive' Makefile.in && exit 1 : diff --git a/t/c-demo.sh b/t/c-demo.sh index c461876e0..cc571b3df 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], [bug-automake@gnu.org]) diff --git a/t/candist.sh b/t/candist.sh index aaa40d499..d87836a97 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 3e8de0888..59f8d8dbe 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 b5038a535..8b3c75633 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 4d39a7e42..d9869e8a3 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 25a8e71df..4a95cb5d3 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 6cdfd41a7..e57667d5f 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 0d71d8328..124da0211 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 64f946c9e..dc4acd6dc 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 d9d22c218..8ffeffbf8 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 180e33351..bb5e7f932 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 foob@rquux Makefile.in -grep 'foob[^@]rquux' Makefile.in && Exit 1 +grep 'foob[^@]rquux' Makefile.in && exit 1 : diff --git a/t/ccnoco.sh b/t/ccnoco.sh index 60898c8d1..2e5bd4fb0 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 e6c9c6428..dcb6fa70d 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_PROG_CC diff --git a/t/ccnoco3.sh b/t/ccnoco3.sh index b47ed48f3..ff773f4ca 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 @@ -70,8 +70,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 1cb842237..79e8ffcf9 100755 --- a/t/check-concurrency-bug9245.sh +++ b/t/check-concurrency-bug9245.sh @@ -18,7 +18,7 @@ # even when the Automake-generated parallel testsuite harness failed. # See automake bug#9245. -. ./defs || Exit 1 +. ./defs || exit 1 cat >> configure.ac << 'END' AC_OUTPUT @@ -43,16 +43,16 @@ $AUTOMAKE -a ./configure # Some make implementations don't grok the '-j' option. -$MAKE -j1 || Exit 77 +$MAKE -j1 || exit 77 for j in '' -j1 -j2; do - $MAKE $j check && Exit 1 - TESTS=foo.test $MAKE $j -e check && Exit 1 - $MAKE $j recheck && Exit 1 - TEST_LOGS=foo.log $MAKE $j -e check && Exit 1 + $MAKE $j check && exit 1 + TESTS=foo.test $MAKE $j -e check && exit 1 + $MAKE $j recheck && exit 1 + TEST_LOGS=foo.log $MAKE $j -e 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 c6fda2125..baa8c4003 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 618aa80a9..0d31e892c 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 84ea32599..7df5251f8 100755 --- a/t/check-no-test-driver.sh +++ b/t/check-no-test-driver.sh @@ -19,7 +19,7 @@ # used. am_serial_tests=yes -. ./defs || Exit 1 +. ./defs || exit 1 echo 'TESTS = foo.test' > Makefile.am @@ -27,8 +27,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 540c7490b..dc1947ef7 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 ac8fe8905..fe623bbbf 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 323c3bca2..de453d222 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 simple-tests driver does not strip VPATH components from # the name of the test, but the parallel-tests 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 simple-tests driver does not strip VPATH components from # the name of the test, but the parallel-tests 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/check.sh b/t/check.sh index 1edd60fb0..f44c6617d 100755 --- a/t/check.sh +++ b/t/check.sh @@ -17,7 +17,7 @@ # Test Automake style tests. # For gen-testsuite-part: ==> try-with-serial-tests <== -. ./defs || Exit 1 +. ./defs || exit 1 cat > Makefile.am << 'END' TESTS = frob.test @@ -29,7 +29,7 @@ $ACLOCAL $AUTOMAKE grep 'check-TESTS.*:' Makefile.in -grep 'check-DEJAGNU' Makefile.in && Exit 1 +grep 'check-DEJAGNU' Makefile.in && exit 1 # 'check-TESTS' is phony. sed -n '/^\.PHONY:/,/^$/p' Makefile.in | $EGREP '(^| )check-TESTS($| )' diff --git a/t/check10.sh b/t/check10.sh index 9f436ad3d..e76773c16 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 env TESTS='pass skip xfail' $MAKE -e check $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 fc1209c61..2fa489a44 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 -env TESTS=skip $MAKE -e check >stdout || { cat stdout; Exit 1; } +env TESTS=skip $MAKE -e check >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 -env TESTS="skip skip2" $MAKE -e check >stdout || { cat stdout; Exit 1; } +env TESTS="skip skip2" $MAKE -e check >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 839f24fc3..69dac885c 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 @@ -158,15 +158,15 @@ for vpath in : false; do 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,11 +175,11 @@ 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 # Do not trust the exit status of 'make -k'. @@ -189,7 +189,7 @@ for vpath in : false; do 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 73eb0b7a5..05dcacb0b 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 # 'check' should depend directly on 'check-am' (similar tests are # in check.test and check3.test). diff --git a/t/check3.sh b/t/check3.sh index b4858e0eb..a00e37a49 100755 --- a/t/check3.sh +++ b/t/check3.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 # check should depend directly on $(BUILT_SOURCES) (similar tests # are in check.test and check2.test). diff --git a/t/check4.sh b/t/check4.sh index 49043c786..946290f34 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,10 +51,10 @@ $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 # The exit status of 'make -k' can be anything # (depending on the Make implementation) diff --git a/t/check5.sh b/t/check5.sh index 8865f3e67..50113b96a 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 @@ -52,11 +52,11 @@ cp one.c two.c ./configure $MAKE check test -f ok -EXEEXT=.bin $MAKE -e print-tests >stdout || { cat stdout; Exit 1; } +EXEEXT=.bin $MAKE -e print-tests >stdout || { cat stdout; exit 1; } cat stdout $FGREP 'BEG: one.bin two.bin :END' stdout # No am__EXEEXT_* variable is needed. -grep '_EXEEXT_[1-9]' Makefile.in && Exit 1 +grep '_EXEEXT_[1-9]' Makefile.in && exit 1 $FGREP 'TESTS = $(check_PROGRAMS)' Makefile.in : diff --git a/t/check6.sh b/t/check6.sh index 0f33f8d55..d885713e8 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 54d2b2bd3..e77249fd0 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 @@ -60,7 +60,7 @@ $AUTOMAKE -a ./configure $MAKE check -EXEEXT=.bin $MAKE -e print-xfail-tests >stdout || { cat stdout; Exit 1; } +EXEEXT=.bin $MAKE -e print-xfail-tests >stdout || { cat stdout; exit 1; } cat stdout $FGREP 'BEG: a.bin b c.bin d.bin :END' stdout diff --git a/t/check8.sh b/t/check8.sh index d33c002cf..b968c3a0d 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 @@ -66,7 +66,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 @@ -77,15 +77,15 @@ grep '^[^X]*FAIL.* baz' stdout grep 'XFAIL.* sub/baz' stdout # 'parallel-tests' should not add 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 3b04d568a..43205745e 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 279e162f3..80f56df03 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/clean2.sh b/t/clean2.sh index b5f5df224..32cc2c8f9 100755 --- a/t/clean2.sh +++ b/t/clean2.sh @@ -17,7 +17,7 @@ # Make sure distclean works in cygnus mode. # Report from Daniel Jacobowitz. -. ./defs || Exit 1 +. ./defs || exit 1 cat >> configure.ac << 'END' AM_MAINTAINER_MODE diff --git a/t/colneq.sh b/t/colneq.sh index 0b5bbcd9b..6df427f30 100755 --- a/t/colneq.sh +++ b/t/colneq.sh @@ -16,7 +16,7 @@ # Test that := definitions produce warnings, but otherwise work. -. ./defs || Exit 1 +. ./defs || exit 1 cat > Makefile.am << 'END' ICONS := $(wildcard *.xbm) diff --git a/t/colneq2.sh b/t/colneq2.sh index b313441af..124b6d282 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/colneq3.sh b/t/colneq3.sh index 728cc3299..4211131c7 100755 --- a/t/colneq3.sh +++ b/t/colneq3.sh @@ -17,7 +17,7 @@ # Test that := definitions work as expected at make time. required=GNUmake -. ./defs || Exit 1 +. ./defs || exit 1 cat >> configure.ac << 'END' AC_OUTPUT diff --git a/t/colon.sh b/t/colon.sh index f5cb4e0f3..f3e95a6e3 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 2b06151d2..b59ad495f 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 5d7b3b22b..5ef22673a 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 6dad3ab85..34f0571d2 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 5a0ef379b..c600679bd 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 9f14d2a09..1e93a8f99 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 @@ -87,7 +87,7 @@ for vpath in : false; do # version.good should depend on version.gin. rm -f version.good - $MAKE version.good >output 2>&1 && { cat output; Exit 1; } + $MAKE version.good >output 2>&1 && { cat output; exit 1; } cat output # Try to verify that we errored out for the right reason. $FGREP version.gin output diff --git a/t/colon7.sh b/t/colon7.sh index 1b84d8046..51607c63e 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 5726ac1bd..61158b17a 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" @@ -113,10 +113,10 @@ test_no_color () cat stdout | grep '====' cat stdout | grep '[Ss]ee .*test-suite\.log' cat stdout | grep '[Tt]estsuite summary' - ) | grep "$esc" && Exit 1 + ) | grep "$esc" && exit 1 : For shells with broken 'set -e' else - cat stdout | grep "$esc" && Exit 1 + cat stdout | grep "$esc" && exit 1 : For shells with broken 'set -e' fi } @@ -136,11 +136,11 @@ for vpath in false :; do # Forced colorization should take place also with non-ANSI terminals; # hence the "TERM=dumb" definition. TERM=dumb AM_COLOR_TESTS=always $MAKE -e check >stdout \ - && { cat stdout; Exit 1; } + && { cat stdout; exit 1; } cat stdout test_color - TERM=ansi $MAKE -e check >stdout && { cat stdout; Exit 1; } + TERM=ansi $MAKE -e check >stdout && { cat stdout; exit 1; } cat stdout test_no_color diff --git a/t/color2.sh b/t/color2.sh index 72087a03b..e79ab277b 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" # Also, if the $MAKE program fails to consider the standard output as a @@ -143,10 +142,10 @@ test_no_color () cat stdout | grep '====' cat stdout | grep '[Ss]ee .*test-suite\.log' cat stdout | grep '[Tt]estsuite summary' - ) | grep "$esc" && Exit 1 + ) | grep "$esc" && exit 1 : For shells with broken 'set -e' else - cat stdout | grep "$esc" && Exit 1 + cat stdout | grep "$esc" && exit 1 : For shells with broken 'set -e' fi } @@ -169,17 +168,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/commen10.sh b/t/commen10.sh index d0c246abd..1bc60f008 100755 --- a/t/commen10.sh +++ b/t/commen10.sh @@ -17,7 +17,7 @@ # Make sure comments following trailing backslashes are diagnosed. # Report from Harald Dunkel. -. ./defs || Exit 1 +. ./defs || exit 1 cat > Makefile.am << 'END' SUBDIRS = foo \ diff --git a/t/commen11.sh b/t/commen11.sh index d4b264a48..139545d18 100755 --- a/t/commen11.sh +++ b/t/commen11.sh @@ -18,7 +18,7 @@ # comments following a trailing backslash, even when the combination # follows a variable assignment that is preceded by a comment. -. ./defs || Exit 1 +. ./defs || exit 1 cat > Makefile.am << 'END' # initial comment diff --git a/t/comment.sh b/t/comment.sh index 6ca98ba13..3508bed93 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 a63075c92..124e273d1 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/comment3.sh b/t/comment3.sh index 8f80945c2..e1f15832c 100755 --- a/t/comment3.sh +++ b/t/comment3.sh @@ -19,7 +19,7 @@ # shell, which in turn can't find '#' as a command. # Sigh. Some vendors must be destroyed. -. ./defs || Exit 1 +. ./defs || exit 1 cat > Makefile.am << 'END' install-data-local: diff --git a/t/comment4.sh b/t/comment4.sh index efd703631..8a0ab4531 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/comment5.sh b/t/comment5.sh index 0c2a4d601..06478e0fa 100755 --- a/t/comment5.sh +++ b/t/comment5.sh @@ -17,7 +17,7 @@ # Test for PR/280. # (Automake should complain about trailing backslashes in comments.) -. ./defs || Exit 1 +. ./defs || exit 1 cat >> configure.ac <<'EOF' AC_OUTPUT diff --git a/t/comment6.sh b/t/comment6.sh index 9fd8d1069..496dfdd32 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 diff --git a/t/comment7.sh b/t/comment7.sh index 634cc2037..a4f8d886e 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]) diff --git a/t/comment8.sh b/t/comment8.sh index 3ed31e7c7..b4e871bf4 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 a75fafc41..49a9f6f72 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 5c01d76c1..dbb3b1412 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 638a0d724..df5eb83e4 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 diff --git a/t/compile2.sh b/t/compile2.sh index f808607bd..5f38775ef 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 a1cc479a8..e8bf8a439 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 8e516e3e5..2e275a354 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 0f787cce8..89c5be30f 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 3979802ee..ee47c174e 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 806c59f92..74a5478b1 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 <mrnolta@princeton.edu> -. ./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 99893d8c3..97f8d8476 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 <langston@SLAC.Stanford.EDU> -. ./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 5d18b5c5f..0b79032bf 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]) @@ -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 '^@TEST_TRUE@VAR = true$' Makefile.in grep '^@TEST_FALSE@VAR = false$' Makefile.in diff --git a/t/cond10.sh b/t/cond10.sh index 56a9083cd..a556a9996 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 b53cb70e9..95073d10e 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 1ab328d7b..c23df15cb 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 7f300e88e..345171e22 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 8ee799b2f..6ce37d74b 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 11a4f68d2..ded33700d 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 37a0793ba..837fa0255 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 32c0ab2b9..22bbfcfea 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 86f677e6f..b0dd05cf8 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 40e41f1fe..403c6098f 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 7719c835d..f5c748c71 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 7a58c2418..10e1d4d4b 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 d6c2bdfe3..522cffa1e 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 b7038cc6b..eaaf3d7cf 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 c42703356..2119a8a6a 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 f0aac9638..74cc7cc85 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 0a8263d01..fa4aa94aa 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 7a6bcff84..4df74463a 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 2bcb8c1db..4a348d1fd 100755 --- a/t/cond3.sh +++ b/t/cond3.sh @@ -17,7 +17,7 @@ # Test sources listed in conditional. # Report from Rob Savoye <rob@cygnus.com>, and Lars J. Aas. -. ./defs || Exit 1 +. ./defs || exit 1 cat >> configure.ac << 'END' AC_PROG_CC diff --git a/t/cond30.sh b/t/cond30.sh index 6c2b39626..cf505d924 100755 --- a/t/cond30.sh +++ b/t/cond30.sh @@ -16,7 +16,7 @@ # For PR/352: make sure we support bin_PROGRAMS being defined conditionally. -. ./defs || Exit 1 +. ./defs || exit 1 cat >>configure.ac <<'EOF' AM_CONDITIONAL([C1], [test -z "$two"]) diff --git a/t/cond31.sh b/t/cond31.sh index d6006cb0d..b849a1a9b 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 7ff1a4142..07b7814c5 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 d8b608749..afe688a44 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"]) diff --git a/t/cond34.sh b/t/cond34.sh index 8349406a2..3d37a2b32 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 a87090209..ea663ce97 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 d9b069908..2b8e584ab 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 6423d391b..31a1f4059 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 71ae69a0c..887aa0381 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 840b8b804..4cbda481a 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 9bd0cc6fd..72d98c9dd 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 '^@ONE_FALSE@' Makefile.in && Exit 1 -grep '^@TWO_FALSE@' Makefile.in && Exit 1 +grep '^@ONE_FALSE@' Makefile.in && exit 1 +grep '^@TWO_FALSE@' Makefile.in && exit 1 $AUTOCONF diff --git a/t/cond40.sh b/t/cond40.sh index 7dadfc171..5579131f5 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], @@ -62,7 +62,7 @@ test ! -f file2 test -f file3 rm -f file1 file3 $MAKE file1 file3 -$MAKE file2 && Exit 1 +$MAKE file2 && exit 1 test -f file1 test ! -f file2 test -f file3 @@ -73,9 +73,9 @@ test ! -f file1 test -f file2 test ! -f file3 rm -f file2 -$MAKE file1 && Exit 1 +$MAKE file1 && exit 1 $MAKE file2 -$MAKE file3 && Exit 1 +$MAKE file3 && exit 1 test ! -f file1 test -f file2 test ! -f file3 diff --git a/t/cond41.sh b/t/cond41.sh index 7c59a0a68..9f4cc5376 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 c21772612..d7f885e2b 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 028168ec2..a6c754548 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 8cc2c2e91..71c3bcd0d 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 1296cd188..ceddc6365 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 c89caf997..59820c4bb 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 8accd6769..fb5c92005 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 42fa40779..640f49629 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 1651ac981..19cd12e87 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 c498b7582..1eab7075b 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 b9addabeb..942274882 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 be32b7d1d..81fd0157a 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 bcd05510e..dd2153c28 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]) diff --git a/t/condhook2.sh b/t/condhook2.sh index f68332c6f..1ab8d8852 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 b7011e76d..d826f9614 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 '^@TOBE_TRUE@target:' Makefile.in : diff --git a/t/condinc2.sh b/t/condinc2.sh index e88b0d276..1763a6d70 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 fae04bff6..3c8822688 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 fbb3844b0..ad97abcbf 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 89196dfb7..094a66cf0 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 f508d45f2..95e60f9ee 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 d9696608e..b6f908138 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 2c42f29bc..728d78e3d 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 9c4cb4fff..3eed30bb4 100755 --- a/t/conffile-leading-dot.sh +++ b/t/conffile-leading-dot.sh @@ -19,7 +19,7 @@ # broken in that case. required=GNUmake -. ./defs || Exit 1 +. ./defs || exit 1 cat > configure.ac << END AC_INIT([$me], [1.0]) @@ -54,7 +54,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 5c17b6550..5a942da5b 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' AM_CONFIG_HEADER([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 475961998..c86b63e84 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' AM_CONFIG_HEADER([include/config.h]) diff --git a/t/confh4.sh b/t/confh4.sh index ea6a9ffc2..2f52add86 100755 --- a/t/confh4.sh +++ b/t/confh4.sh @@ -22,7 +22,7 @@ # Use AM_CONFIG_HEADER(subdir/config.h) to place configuration # header in subdirectory and observe that it is not included. -. ./defs || Exit 1 +. ./defs || exit 1 cat >> configure.ac << 'END' AC_CONFIG_FILES([include/Makefile]) diff --git a/t/confh5.sh b/t/confh5.sh index c35c3e847..7da63fec6 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]) diff --git a/t/confh6.sh b/t/confh6.sh index c5e7d7e58..5479491ca 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' AM_CONFIG_HEADER([subdir/config.h]) diff --git a/t/confh7.sh b/t/confh7.sh index 408077978..d771b3d96 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' AM_CONFIG_HEADER([config.h two.h]) diff --git a/t/confh8.sh b/t/confh8.sh index c3a27d10f..45fbe8e5f 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' AM_CONFIG_HEADER([one.h two.h]) diff --git a/t/configure.sh b/t/configure.sh index b8e3d0b7c..6ba740e86 100755 --- a/t/configure.sh +++ b/t/configure.sh @@ -18,7 +18,7 @@ # Diagnose if both configure.in and configure.ac are present, prefer # configure.ac. -. ./defs || Exit 1 +. ./defs || exit 1 cat >configure.ac <<EOF AC_INIT([$me], [1.0]) @@ -34,11 +34,11 @@ EOF : >Makefile.am -$ACLOCAL 2>stderr && { cat stderr >&2; Exit 1; } +$ACLOCAL 2>stderr && { cat stderr >&2; exit 1; } cat stderr >&2 grep 'configure\.ac.*configure\.in.*both present' stderr -$ACLOCAL -Wno-error 2>stderr || { cat stderr >&2; Exit 1; } +$ACLOCAL -Wno-error 2>stderr || { cat stderr >&2; exit 1; } cat stderr >&2 grep 'configure\.ac.*configure\.in.*both present' stderr grep 'proceeding.*configure\.ac' stderr diff --git a/t/confincl.sh b/t/confincl.sh index dfc755106..4527a144d 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 93851ca8c..8446ac859 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 4a1478b29..fa0b0092b 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 ffb0d98c3..993581df4 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 diff --git a/t/conflnk4.sh b/t/conflnk4.sh index a1f2f0e5a..090f809f2 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 b13f26a3b..979c66560 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 e77563ee1..39739d9fe 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 bc6ffcae7..fc78f6e48 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]) @@ -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 f1f0c4e7c..fdf13f1c5 100755 --- a/t/cscope.tap +++ b/t/cscope.tap @@ -16,7 +16,7 @@ # Test cscope functionality. -. ./defs || Exit 1 +. ./defs || exit 1 plan_ 18 diff --git a/t/cscope2.sh b/t/cscope2.sh index f72bb6a32..631642fb0 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 47bcd4d3a..30e8c0cc9 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 869c2b3b2..d7aeab78f 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], [bug-automake@gnu.org]) @@ -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-lt-demo.sh b/t/cxx-lt-demo.sh index c11043546..d0023e859 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], [bug-automake@gnu.org]) @@ -95,7 +95,7 @@ $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. @@ -17,7 +17,7 @@ # Test that '.c++' extension works. # From Ralf Corsepius. -. ./defs || Exit 1 +. ./defs || exit 1 cat >> configure.ac << 'END' AC_PROG_CXX @@ -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 cc69163ca..f2bb75a60 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 6f4ce2ea1..b6d023146 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 5ce3beb6f..ff271c39c 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/cxxnoc.sh b/t/cxxnoc.sh index 66d0b0df2..b3e563126 100755 --- a/t/cxxnoc.sh +++ b/t/cxxnoc.sh @@ -16,7 +16,7 @@ # Test to make sure pure C++ sources don't include C-specific code. -. ./defs || Exit 1 +. ./defs || exit 1 cat >> configure.ac << 'END' AC_PROG_CXX @@ -33,5 +33,5 @@ END $ACLOCAL $AUTOMAKE -$FGREP '(CC)' Makefile.in && Exit 1 -Exit 0 +$FGREP '(CC)' Makefile.in && exit 1 +exit 0 @@ -15,7 +15,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # Make sure C++ files are rewritten to ".o" and not just "o". -. ./defs || Exit 1 +. ./defs || exit 1 cat >> configure.ac << 'END' AC_PROG_CXX diff --git a/t/cygnus-check-without-all.sh b/t/cygnus-check-without-all.sh index 121c657f7..8b3c6e102 100755 --- a/t/cygnus-check-without-all.sh +++ b/t/cygnus-check-without-all.sh @@ -17,7 +17,7 @@ # Check that, in cygnus mode, target "check" does not depend target # "all". -. ./defs || Exit 1 +. ./defs || exit 1 cat >> configure.ac <<'END' AM_MAINTAINER_MODE @@ -35,7 +35,7 @@ END $ACLOCAL $AUTOMAKE --cygnus -Wno-obsolete -$EGREP '(^| )all.*(:|:.* )check' Makefile.in && Exit 1 +$EGREP '(^| )all.*(:|:.* )check' Makefile.in && exit 1 $AUTOCONF ./configure @@ -44,7 +44,7 @@ $MAKE check test -f check-target-has-run test ! -r all-target-has-failed # Sanity checks. -$MAKE && Exit 1 +$MAKE && exit 1 test -f all-target-has-failed : diff --git a/t/cygnus-dependency-tracking.sh b/t/cygnus-dependency-tracking.sh index 6c858c1aa..6fe7edea5 100755 --- a/t/cygnus-dependency-tracking.sh +++ b/t/cygnus-dependency-tracking.sh @@ -18,7 +18,7 @@ # And check that this *cannot* be overridden. required=cc -. ./defs || Exit 1 +. ./defs || exit 1 cat >> configure.ac <<'END' AM_MAINTAINER_MODE @@ -66,7 +66,7 @@ $MAKE test-nodeps # Sanity check. $MAKE clean -$MAKE >out 2>&1 && { cat out; Exit 1; } +$MAKE >out 2>&1 && { cat out; exit 1; } cat out # Not all compilers mention the undefined symbol in the error message. grep GIVE_BACK out || grep main out diff --git a/t/cygnus-deprecation.sh b/t/cygnus-deprecation.sh index 779914b9d..551d0e66a 100755 --- a/t/cygnus-deprecation.sh +++ b/t/cygnus-deprecation.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.*deprecated' diff --git a/t/cygnus-imply-foreign.sh b/t/cygnus-imply-foreign.sh index 1173a47da..9a5ef7ff9 100755 --- a/t/cygnus-imply-foreign.sh +++ b/t/cygnus-imply-foreign.sh @@ -16,7 +16,7 @@ # Check that 'cygnus' mode imply 'foreign' mode. -. ./defs || Exit 1 +. ./defs || exit 1 cat >> configure.ac <<'END' # This is *required* in cygnus mode diff --git a/t/cygnus-no-dist.sh b/t/cygnus-no-dist.sh index d94a8f51b..af2c45f59 100755 --- a/t/cygnus-no-dist.sh +++ b/t/cygnus-no-dist.sh @@ -16,7 +16,7 @@ # Check that cygnus mode forbids creation of distribution tarball. -. ./defs || Exit 1 +. ./defs || exit 1 echo AM_MAINTAINER_MODE >> configure.ac mv -f configure.ac configure.stub @@ -35,7 +35,7 @@ $AUTOMAKE --cygnus -Wno-obsolete $MAKE for target in dist distdir distcheck dist-all dist-gzip; do - $MAKE -n $target >out 2>&1 && { cat out; Exit 1; } + $MAKE -n $target >out 2>&1 && { cat out; exit 1; } cat out grep $target out done @@ -70,7 +70,7 @@ $AUTOMAKE ./configure $MAKE cd sub2 -$MAKE -n distdir >out 2>&1 && { cat out; Exit 1; } +$MAKE -n distdir >out 2>&1 && { cat out; exit 1; } grep distdir out cd .. diff --git a/t/cygnus-no-installinfo.sh b/t/cygnus-no-installinfo.sh index 2de752d03..9102484eb 100755 --- a/t/cygnus-no-installinfo.sh +++ b/t/cygnus-no-installinfo.sh @@ -17,7 +17,7 @@ # Check that cygnus mode enables the 'no-installinfo' option. required=makeinfo -. ./defs || Exit 1 +. ./defs || exit 1 cat >> configure.ac <<'END' AM_MAINTAINER_MODE @@ -40,7 +40,7 @@ $ACLOCAL $AUTOMAKE --cygnus -Wno-override -Wno-obsolete $AUTOCONF -cwd=$(pwd) || Exit 1 +cwd=$(pwd) || exit 1 ./configure --prefix="$cwd"/_inst $MAKE $MAKE install diff --git a/t/cygnus-requires-maintainer-mode.sh b/t/cygnus-requires-maintainer-mode.sh index 546e8983e..978df8cf4 100755 --- a/t/cygnus-requires-maintainer-mode.sh +++ b/t/cygnus-requires-maintainer-mode.sh @@ -16,7 +16,7 @@ # Check that, in cygnus mode, maintainer mode is required. -. ./defs || Exit 1 +. ./defs || exit 1 : > Makefile.am diff --git a/t/cygwin32.sh b/t/cygwin32.sh index 9415fb64c..95b442e91 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 : @@ -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 9b66a56f3..5a4530c19 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 0b3f96b6d..2c74cc497 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 8cdc3a1d7..22f7cc5a7 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 05ae2005e..9fdf17926 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 c3bfff6af..c980c8537 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 f0f61942a..2361ff70d 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,7 +147,7 @@ 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. diff --git a/t/dejagnu-siteexp-useredit.sh b/t/dejagnu-siteexp-useredit.sh index 63fc18b54..42f4d4404 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 583158f34..a3bec5243 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 8feb5de9a..5b75bb698 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 7d15bc941..42345bee0 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 1c9479893..655218b1a 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 26eaa6096..d64a7f2c6 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 38255f6f8..80ff02785 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 a926955f6..d34931b7f 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 636286cf9..9dc015a64 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 @@ -36,12 +36,12 @@ $MAKE rm -f zardoz.am $sleep # Required to avoid racy failures with FreeBSD make. -$MAKE >output 2>&1 && { cat output; Exit 1; } +$MAKE >output 2>&1 && { cat output; exit 1; } cat output # This error will come from automake, not make, so we can be stricter # in our grepping of it. grep 'cannot open.*zardoz\.am' output -grep 'foobar\.am' output && Exit 1 # No spurious error, please. +grep 'foobar\.am' output && exit 1 # No spurious error, please. # Try with one less indirection. : > foobar.am @@ -50,7 +50,7 @@ $AUTOMAKE Makefile $MAKE # Sanity check. rm -f foobar.am $sleep # Required to avoid racy failures with FreeBSD make. -$MAKE >output 2>&1 && { cat output; Exit 1; } +$MAKE >output 2>&1 && { cat output; exit 1; } cat output # 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 e1bbfce4a..296f453cf 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 >output 2>&1 && { cat output; Exit 1; } +$MAKE >output 2>&1 && { cat output; exit 1; } cat output # 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' output # No spurious errors, please. -$FGREP -v ' foobar.m4:1:' output | $FGREP 'foobar.m4' && Exit 1 +$FGREP -v ' foobar.m4:1:' output | $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 >output 2>&1 && { cat output; Exit 1; } +$MAKE >output 2>&1 && { cat output; exit 1; } cat output # This error will come from aclocal, not make, so we can be stricter # in our grepping of it. grep 'foobar\.m4.*does not exist' output # No spurious errors, please (ok, this is really paranoid). -$FGREP 'zardoz.m4' output && Exit 1 +$FGREP 'zardoz.m4' output && exit 1 : diff --git a/t/depacl2.sh b/t/depacl2.sh index 378a1a2a2..897a5a226 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 81528b2af..dc93a85cb 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 @@ -65,6 +65,6 @@ $AUTOMAKE --gnu # so that more files are included in lib's DIST_COMMON definition, # then you must handle the case in which depcomp is listed on a # continued line. -grep '^DIST_COMMON.*depcomp' lib/Makefile.in && Exit 1 +grep '^DIST_COMMON.*depcomp' lib/Makefile.in && exit 1 : diff --git a/t/depcomp.sh b/t/depcomp.sh index f2e0370e5..63c702f57 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 624dee6f0..c29d9cdfd 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 01a2403c2..72e852f9a 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.*\./\$(DEPDIR)/bar\.P' Makefile.in -grep 'include.*/\./\$(DEPDIR)' Makefile.in && Exit 1 +grep 'include.*/\./\$(DEPDIR)' Makefile.in && exit 1 $AUTOCONF # Don't reject slower dependency extractors, for better coverage. @@ -70,7 +70,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 b5f7371cd..d6399e9ad 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 @@ -46,7 +46,7 @@ $AUTOMAKE -a grep include Makefile.in # For debugging. grep 'include.*\./\$(DEPDIR)/foo\.P' Makefile.in grep 'include.*\./\$(DEPDIR)/bar\.P' Makefile.in -grep 'include.*/\./\$(DEPDIR)' Makefile.in && Exit 1 +grep 'include.*/\./\$(DEPDIR)' Makefile.in && exit 1 $AUTOCONF # Don't reject slower dependency extractors, for better coverage. @@ -65,7 +65,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 e81e09783..8965cd8cc 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 b69427dd6..846a4247f 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 8f8431afa..65f83ce05 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 e3ace0bbc..3a7174158 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/depend5.sh b/t/depend5.sh index ca900f0fc..2bc6a8f5a 100755 --- a/t/depend5.sh +++ b/t/depend5.sh @@ -18,7 +18,7 @@ # quoting in $CONFIG_FILES, done by newer Autoconf. required=cc -. ./defs || Exit 1 +. ./defs || exit 1 cat >>configure.ac << END AC_PROG_CC @@ -65,13 +65,13 @@ for arg in Makefile \ do rm -rf .deps _deps ./config.status "$arg" depfiles >stdout 2>stderr || - { cat stdout; cat stderr >&2; Exit 1; } + { cat stdout; cat stderr >&2; exit 1; } cat stdout cat stderr >&2 - grep '[Nn]o such file' stderr && Exit 1 + grep '[Nn]o such file' stderr && exit 1 if test -n "$depdir"; then - test -d $depdir || Exit 1 + test -d $depdir || exit 1 fi done diff --git a/t/depend6.sh b/t/depend6.sh index fb4c14003..0795f9381 100755 --- a/t/depend6.sh +++ b/t/depend6.sh @@ -17,7 +17,7 @@ # Check for _AM_OUTPUT_DEPENDENCY_COMMANDS grouping bug, # reported by Markus Duft. -. ./defs || Exit 1 +. ./defs || exit 1 cat >>configure.ac << END AC_PROG_CC @@ -38,9 +38,9 @@ $ACLOCAL $AUTOMAKE $AUTOCONF ./configure --disable-dependency-tracking 2>stderr || { - stat=$?; cat stderr >&2; Exit $stat; + stat=$?; cat stderr >&2; exit $stat; } cat stderr >&2 -grep shift stderr && Exit 1 +grep shift stderr && exit 1 : diff --git a/t/deprecated-acinit.sh b/t/deprecated-acinit.sh index d130f9c44..516b13979 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 22bf18406..f10480b36 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/dir-named-obj-is-bad.sh b/t/dir-named-obj-is-bad.sh index e422f1928..d14f8c8f3 100755 --- a/t/dir-named-obj-is-bad.sh +++ b/t/dir-named-obj-is-bad.sh @@ -16,7 +16,7 @@ # Naming a subdirectory 'obj/' is a bad idea. Automake should say so. -. ./defs || Exit 1 +. ./defs || exit 1 mkdir obj diff --git a/t/dirlist-abspath.sh b/t/dirlist-abspath.sh index f33f44516..3c25fba5d 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 76daa3505..e18877711 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 @@ -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 f3b9c4ddc..5a11769c2 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 @@ -52,7 +52,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 7a01dc74d..4ecf2effc 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 50d04f332..eb6b98c33 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 b7e2e2d1a..c11083abc 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 500f6b807..6d130fb6b 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 @@ -61,7 +61,7 @@ END mkdir subdir echo > subdir/Makefile.am # 'echo', not ':', for Solaris /bin/sh. - 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 ac6853b8e..84f4edab8 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 a74c6dbeb..aed105102 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 3390884e2..80254c49a 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 >output 2>&1 && { cat output; Exit 1; } + $MAKE >output 2>&1 && { cat output; exit 1; } cat output # This error comes from automake, not make, so we can be stricter # in our grepping of it. grep 'cannot open.*zardoz\.am' output - grep 'foobar\.am' output && Exit 1 # No spurious error, please. + grep 'foobar\.am' output && 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 b2835ee83..6a2a57de9 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 >output 2>&1 && { cat output; Exit 1; } + $MAKE >output 2>&1 && { cat output; exit 1; } cat output # This error will come from automake, not make, so we can be stricter # in our grepping of it. grep 'zardoz\.m4.*does not exist' output - grep 'foobar\.m4' output && Exit 1 # No spurious error, please. + grep 'foobar\.m4' output && 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 b8284cbf1..4e002e4dd 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 >output 2>&1 && { cat output; Exit 1; } + $MAKE >output 2>&1 && { cat output; exit 1; } cat output # This error will come from autoconf, not make, so we can be stricter # in our grepping of it. grep 'possibly undefined .*MY_ZARDOZ' output - grep 'MY_FOOBAR' output && Exit 1 # No spurious error, please. + grep 'MY_FOOBAR' output && 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 2e22e841d..50085a68f 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 2bf2a6d6b..b7b0e0ecc 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 f67d17e6b..491cf2939 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/distcheck-configure-flags-am.sh b/t/distcheck-configure-flags-am.sh index 7dbe2ab3d..11c992c14 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 >output 2>&1 && { cat output; Exit 1; } +$MAKE distcheck >output 2>&1 && { cat output; exit 1; } cat output grep "^configure:.* success='no', sentence='it works :-)'" output diff --git a/t/distcheck-configure-flags-subpkg.sh b/t/distcheck-configure-flags-subpkg.sh index 45d0e0cb6..f5bc15d26 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 >output 2>&1 && { cat output; Exit 1; } +$MAKE distcheck >output 2>&1 && { cat output; exit 1; } cat output grep '^configure:.* dc=KO am_dc=KO' output diff --git a/t/distcheck-configure-flags.sh b/t/distcheck-configure-flags.sh index ae9fe4015..e10b2bafe 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]) @@ -47,7 +47,7 @@ $MAKE distcheck \ DISTCHECK_CONFIGURE_FLAGS="--enable-success=yes sentence='it works :-)'" # Sanity check. -$MAKE distcheck >output 2>&1 && { cat output; Exit 1; } +$MAKE distcheck >output 2>&1 && { cat output; exit 1; } cat output grep "^configure:.* success='no', sentence=''" output diff --git a/t/distcheck-hook.sh b/t/distcheck-hook.sh index dfc20010a..81a6646e1 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 93446b3bc..ee177ee8d 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) $(AM_MAKEFLAGS) 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 051e52d14..1eef8720d 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,21 +60,21 @@ 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 + $EGREP -i 'mkdir:|:.*(permission|denied)' output && exit 1 # On failure, some make implementations (such as Solaris make) print the # whole failed recipe on stdout. The first grep works around this. - grep -v 'rm -rf ' output | grep -i 'autom4te.*\.cache' && Exit 1 + grep -v 'rm -rf ' output | grep -i 'autom4te.*\.cache' && 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 @@ -98,15 +98,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 ac8ce5419..50e1057e2 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,10 +59,10 @@ $MAKE distcheck # Sanity check. check_no_spurious_error () { - $EGREP -i 'mkdir:|:.*(permission|denied)' output && Exit 1 + $EGREP -i 'mkdir:|:.*(permission|denied)' output && exit 1 # On failure, some make implementations (such as Solaris make) print the # whole failed recipe on stdout. The first grep works around this. - grep -v 'rm -rf ' output | grep -i 'autom4te.*\.cache' && Exit 1 + grep -v 'rm -rf ' output | grep -i 'autom4te.*\.cache' && exit 1 : To placate 'set -e'. } @@ -79,13 +79,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. @@ -121,12 +121,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 4aaf268c8..f7a5640f9 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 infodir="$(pwd)/_info" $MAKE -e distcheck -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 e4d8252bf..d888a9972 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 >output 2>&1 || { cat output; Exit 1; } +$MAKE distcheck >output 2>&1 || { cat output; exit 1; } cat output # 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 0b205e8bb..ae1da2b92 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 >output 2>&1 && { cat output; Exit 1; } +$MAKE distcheck >output 2>&1 && { cat output; exit 1; } cat output $FGREP 'ERROR: files left after uninstall:' output @@ -86,7 +86,7 @@ test -f inst/mu/share/info/dir test -f inst/share/info/more/dir rm -rf inst -$MAKE distcheck >output 2>&1 && { cat output; Exit 1; } +$MAKE distcheck >output 2>&1 && { cat output; exit 1; } cat output $FGREP 'ERROR: files left after uninstall:' output diff --git a/t/distcheck-writable-srcdir.sh b/t/distcheck-writable-srcdir.sh index bbc50f461..034dc1e44 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 39197d721..5cdd6f181 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 4da74d05c..7def7bf25 100755 --- a/t/distcom-subdir.sh +++ b/t/distcom-subdir.sh @@ -17,7 +17,7 @@ # Test to make sure that if an auxfile (here depcomp) is required # by a subdir Makefile.am, it is distributed by that Makefile.am. -. ./defs || Exit 1 +. ./defs || exit 1 cat >> configure.ac << 'END' AC_CONFIG_FILES([subdir/Makefile]) diff --git a/t/distcom2.sh b/t/distcom2.sh index 4b86f928d..0b218f3d6 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 34ad7096e..a2ffe0b0c 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 '/^DIST_COMMON =.*\\$/ { :loop diff --git a/t/distcom4.sh b/t/distcom4.sh index 32d3db2ac..400533c27 100755 --- a/t/distcom4.sh +++ b/t/distcom4.sh @@ -20,7 +20,7 @@ # test with a Makefile in the directory. # Also make sure that README appears first in DIST_COMMON. -. ./defs || Exit 1 +. ./defs || exit 1 cat >> configure.ac << 'END' AC_CONFIG_FILES([tests/autoconf:tests/wrapper.in], diff --git a/t/distcom5.sh b/t/distcom5.sh index de6ea11b4..0ee2946cc 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 extract_distcommon () { diff --git a/t/distdir.sh b/t/distdir.sh index 41a9a8c7b..9600746b2 100755 --- a/t/distdir.sh +++ b/t/distdir.sh @@ -21,7 +21,7 @@ # Also test DISTFILES containing 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 98f086d35..3da6075c3 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 diff --git a/t/distlinks.sh b/t/distlinks.sh index 97b5b49e6..7d05b6eeb 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 cf0556e93..9f537681f 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. @@ -60,7 +60,7 @@ for lnk in $lnk1 $lnk2 $lnka $lnkb; do $AUTOMAKE ./configure # Distribution must fail, with a decent error message. - $MAKE distdir >out 2>&1 && { cat out; Exit 1; } + $MAKE distdir >out 2>&1 && { cat out; exit 1; } cat out $FGREP $lnk out done diff --git a/t/distname.sh b/t/distname.sh index 0ef3cdb4c..19806cef0 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 2bf6a7c49..3f37eb5ab 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/doc-parsing-buglets-colneq-subst.sh b/t/doc-parsing-buglets-colneq-subst.sh index 8ff27f1e7..f099f0224 100755 --- a/t/doc-parsing-buglets-colneq-subst.sh +++ b/t/doc-parsing-buglets-colneq-subst.sh @@ -22,7 +22,7 @@ # See: <http://lists.gnu.org/archive/html/automake/2010-08/msg00074.html> # or: <http://thread.gmane.org/gmane.comp.sysutils.automake.general/11943/focus=11962> -. ./defs || Exit 1 +. ./defs || exit 1 cat > Makefile.am <<'END' $(FOO:=x): bar diff --git a/t/doc-parsing-buglets-tabs.sh b/t/doc-parsing-buglets-tabs.sh index 22c981c63..8c9ea4d35 100755 --- a/t/doc-parsing-buglets-tabs.sh +++ b/t/doc-parsing-buglets-tabs.sh @@ -20,7 +20,7 @@ # If you cause some parts of this test to fail, chances are that you've # improved the Automake parser ;-) -. ./defs || Exit 1 +. ./defs || exit 1 cat > Makefile.am <<END .PHONY: test @@ -47,8 +47,8 @@ echo AC_OUTPUT >> configure.ac $ACLOCAL $AUTOMAKE -$FGREP '$(EXEEEXT)' Makefile.in && Exit 1 -grep 'all:.*all-local' Makefile.in && Exit 1 +$FGREP '$(EXEEEXT)' Makefile.in && exit 1 +grep 'all:.*all-local' Makefile.in && exit 1 grep "^${tab}bin_PROGRAMS = foo" Makefile.in $AUTOCONF diff --git a/t/dollar.sh b/t/dollar.sh index 2fc9c93d1..e62f42b32 100755 --- a/t/dollar.sh +++ b/t/dollar.sh @@ -21,7 +21,7 @@ # Require GNU make for this test. SunOS Make does not support # '$$' in a target or a dependency (it outputs the empty string instead). required=GNUmake -. ./defs || Exit 1 +. ./defs || exit 1 echo AC_OUTPUT >> configure.ac diff --git a/t/dollarvar.sh b/t/dollarvar.sh index 940ef23db..f28ce04dd 100755 --- a/t/dollarvar.sh +++ b/t/dollarvar.sh @@ -22,7 +22,7 @@ # containing a '$' on the left hand side of an assignment are not # portable in practice, even though POSIX allows them. :-/ -. ./defs || Exit 1 +. ./defs || exit 1 cat >Makefile.am <<'EOF' x = 1 @@ -56,8 +56,8 @@ grep 'Makefile.am:2' stderr grep 'Makefile.am:3' stderr grep 'Makefile.am:4' stderr grep 'Makefile.am:5' stderr -grep 'Makefile.am:6' stderr && Exit 1 -grep 'Makefile.am:7' stderr && Exit 1 +grep 'Makefile.am:6' stderr && exit 1 +grep 'Makefile.am:7' stderr && exit 1 : diff --git a/t/dollarvar2.sh b/t/dollarvar2.sh index cef85bb96..1703ceb35 100755 --- a/t/dollarvar2.sh +++ b/t/dollarvar2.sh @@ -17,7 +17,7 @@ # Test to make sure that -Wportability turns on portability-recursive, # likewise for -Wno-... -. ./defs || Exit 1 +. ./defs || exit 1 # # First, try a setup where we have a 'portability-recursive' warning, @@ -80,12 +80,12 @@ $AUTOMAKE -Wno-portability # 'portability' warnings. AUTOMAKE_fails -Wportability -Wno-portability-recursive grep AM_PROG_CC_C_O stderr -grep 'recursive variable expansion' stderr && Exit 1 +grep 'recursive variable expansion' stderr && exit 1 # Enabling 'portability-recursive' warnings should not enable # all the 'portability' warning. AUTOMAKE_fails -Wno-portability -Wportability-recursive -grep AM_PROG_CC_C_O stderr && Exit 1 +grep AM_PROG_CC_C_O stderr && exit 1 grep 'recursive variable expansion' stderr : diff --git a/t/double.sh b/t/double.sh index 7f353b799..6e1b96fee 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 @@ -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 @@ -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.sh b/t/empty.sh index 23f8a7d59..a8e1b1678 100755 --- a/t/empty.sh +++ b/t/empty.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/empty2.sh b/t/empty2.sh index 7d1242301..47a079256 100755 --- a/t/empty2.sh +++ b/t/empty2.sh @@ -17,7 +17,7 @@ # Test to make sure empty _SOURCES suppresses assumption about default # name. Report from Pavel Roskin. -. ./defs || Exit 1 +. ./defs || exit 1 cat >> configure.ac << 'END' AC_PROG_CC @@ -31,5 +31,5 @@ END $ACLOCAL $AUTOMAKE -grep 'pavel\.[co]' Makefile.in && Exit 1 -Exit 0 +grep 'pavel\.[co]' Makefile.in && exit 1 +exit 0 diff --git a/t/empty3.sh b/t/empty3.sh index 6aabfbaa9..f77f4396a 100755 --- a/t/empty3.sh +++ b/t/empty3.sh @@ -16,7 +16,7 @@ # A test for missing _SOURCES variable. -. ./defs || Exit 1 +. ./defs || exit 1 cat >> configure.ac << 'END' AC_PROG_CC diff --git a/t/empty4.sh b/t/empty4.sh index 810642607..1233f4097 100755 --- a/t/empty4.sh +++ b/t/empty4.sh @@ -17,7 +17,7 @@ # Test to make sure empty _SOURCES works. # From Paul Berrevoets. -. ./defs || Exit 1 +. ./defs || exit 1 cat >> configure.ac << 'END' AC_PROG_CC @@ -34,5 +34,5 @@ END $ACLOCAL $AUTOMAKE -$FGREP zoo. Makefile.in && Exit 1 -Exit 0 +$FGREP zoo. Makefile.in && exit 1 +exit 0 diff --git a/t/exdir.sh b/t/exdir.sh index 6e048d23f..0c249e459 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 ddaac5830..cf17f58ec 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 672548c44..6d602cbb9 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 a07bdcb74..1eb42564c 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,7 +65,7 @@ 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 diff --git a/t/exeext2.sh b/t/exeext2.sh index 3315ad8db..956acff2e 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 9561c7a2e..e12462a7f 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 693fc566e..6d8bc88ea 100755 --- a/t/exeext4.sh +++ b/t/exeext4.sh @@ -18,7 +18,7 @@ # programs, but not to @substitutions@. # For gen-testsuite-part: ==> try-with-serial-tests <== -. ./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 15b274f07..4a308cfd1 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 @@ -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 @@ -41,7 +41,7 @@ $AUTOMAKE for ext in f for f90 f95 F F90 F95 r m mm upc; do grep "^\.$ext\.o:" Makefile.in - grep "^$ext\.o:" Makefile.in && Exit 1 + grep "^$ext\.o:" Makefile.in && exit 1 : For shells with busted 'set -e'. done @@ -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 @@ -20,7 +20,7 @@ # In both cases, we don't try to create a rule; but we shouldn't # fail either, because magic might be happening behind our back. -. ./defs || Exit 1 +. ./defs || exit 1 cat >> configure.ac << 'END' END @@ -36,4 +36,4 @@ END $ACLOCAL $AUTOMAKE -Exit 0 +exit 0 diff --git a/t/extra-portability.sh b/t/extra-portability.sh index 3ad637592..fffd6d3d6 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 2d33008c5..e87dde0fb 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-portability3.sh b/t/extra-portability3.sh index 13d608469..2412b4f7b 100755 --- a/t/extra-portability3.sh +++ b/t/extra-portability3.sh @@ -17,7 +17,7 @@ # Check interactions between the 'portability-recursive' and # 'extra-portability' warning categories. -. ./defs || Exit 1 +. ./defs || exit 1 # We want (almost) complete control over automake options. AUTOMAKE="$am_original_AUTOMAKE --foreign -Werror" @@ -44,14 +44,14 @@ grep 'recursive variable expansion' stderr # We can disable 'extra-portability' while leaving # 'portability-recursive' intact. AUTOMAKE_fails -Wportability-recursive -Wno-extra-portability -grep 'requires.*AM_PROG_AR' stderr && Exit 1 +grep 'requires.*AM_PROG_AR' stderr && exit 1 grep 'recursive variable expansion' stderr # We can disable 'portability-recursive' while leaving # 'extra-portability' intact. AUTOMAKE_fails -Wextra-portability -Wno-portability-recursive grep 'requires.*AM_PROG_AR' stderr -grep 'recursive variable expansion' stderr && Exit 1 +grep 'recursive variable expansion' stderr && exit 1 # Disabling 'portability' disables 'portability-recursive' and # 'extra-portability'. diff --git a/t/extra-programs-empty.sh b/t/extra-programs-empty.sh index 37e1a2bc1..189fac4a1 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 7bad9ef0a..09937061d 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 8fe7133d2..de8242258 100755 --- a/t/extra10.sh +++ b/t/extra10.sh @@ -20,7 +20,7 @@ # with the involvement of the $(wildcard) GNU make builtin. required=GNUmake -. ./defs || Exit 1 +. ./defs || exit 1 echo AC_OUTPUT >> configure.ac diff --git a/t/extra11.sh b/t/extra11.sh index a645afbe4..f5319c61b 100755 --- a/t/extra11.sh +++ b/t/extra11.sh @@ -18,7 +18,7 @@ # Suggested by observations from Braden McDaniel. required=GNUmake -. ./defs || Exit 1 +. ./defs || exit 1 echo AC_OUTPUT >> configure.ac diff --git a/t/extra12.sh b/t/extra12.sh index 979411592..a2a797b0d 100755 --- a/t/extra12.sh +++ b/t/extra12.sh @@ -19,7 +19,7 @@ # Suggested by observations from Braden McDaniel. required=GNUmake -. ./defs || Exit 1 +. ./defs || exit 1 echo AC_OUTPUT >> configure.ac diff --git a/t/extra2.sh b/t/extra2.sh index 30eaeeda6..e5576a53e 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 406580106..02ac789f7 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 5b31b63ac..286540aa7 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 7fdd9838d..abe8e13c8 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 6b512114b..b5308afd2 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 4ad778959..b75a0a775 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 9eef189d1..0a4f818c5 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 b5a6007c1..c0bb0f336 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 8398ea6ea..75daf2eb4 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 011a0d415..554d0be94 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 a65a91ecf..56e63effa 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 <mrnolta@princeton.edu> -. ./defs || Exit 1 +. ./defs || exit 1 cat >> configure.ac << 'END' AC_PROG_FC diff --git a/t/flavor.sh b/t/flavor.sh index 6a1fddb3b..8999795ce 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 4f5701bd0..d51849f39 100755 --- a/t/flibs.sh +++ b/t/flibs.sh @@ -17,7 +17,7 @@ # Make sure 'AC_F77_LIBRARY_LDFLAGS' works properly. # Matthew D. Langston <langston@SLAC.Stanford.EDU> -. ./defs || Exit 1 +. ./defs || exit 1 cat >> configure.ac << 'END' AC_PROG_F77 @@ -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 0df282c0a..eb289b48b 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) @@ -18,7 +18,7 @@ # C-specific code. # Matthew D. Langston <langston@SLAC.Stanford.EDU> -. ./defs || Exit 1 +. ./defs || exit 1 cat >> configure.ac << 'END' AC_PROG_F77 @@ -35,5 +35,5 @@ END $ACLOCAL $AUTOMAKE -grep '[^F]CC' Makefile.in | grep -v MKDEP && Exit 1 -Exit 0 +grep '[^F]CC' Makefile.in | grep -v MKDEP && exit 1 +exit 0 @@ -17,7 +17,7 @@ # Make sure Fortran 77 files are rewritten to ".o" and not just "o". # Matthew D. Langston <langston@SLAC.Stanford.EDU> -. ./defs || Exit 1 +. ./defs || exit 1 cat >> configure.ac << 'END' AC_PROG_F77 diff --git a/t/fonly.sh b/t/fonly.sh index c3ae61481..98541872d 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 <langston@SLAC.Stanford.EDU> -. ./defs || Exit 1 +. ./defs || exit 1 cat >> configure.ac << 'END' AC_PROG_F77 diff --git a/t/forcemiss.sh b/t/forcemiss.sh index d7d0800c2..74da2d7f0 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 3c75722df..8c6369aeb 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 6bf58fef9..d118e9fad 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 d345592ef..cb93e7947 100755 --- a/t/fort2.sh +++ b/t/fort2.sh @@ -19,7 +19,7 @@ # Cf. fort1.test and link_f90_only.test. -. ./defs || Exit 1 +. ./defs || exit 1 mkdir sub @@ -43,20 +43,20 @@ $ACLOCAL $AUTOMAKE # The following tests aren't fool-proof, but they don't # need a Fortran compiler. -grep '.\$(LINK)' Makefile.in && Exit 1 +grep '.\$(LINK)' Makefile.in && exit 1 grep '.\$(FCLINK)' Makefile.in grep '.\$(FCCOMPILE)' Makefile.in > stdout 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 # Notice the TAB: grep '^[ ].*\$(FC.*\$(FCFLAGS_f90).*\.f90' Makefile.in grep '^[ ].*\$(FC.*\$(FCFLAGS_f95).*\.f95' Makefile.in grep '^[ ].*\$(FC.*\$(FCFLAGS_f03).*\.f03' Makefile.in grep '^[ ].*\$(FC.*\$(FCFLAGS_f08).*\.f08' Makefile.in -grep '^[ ].*\$(FC.*\$(FCFLAGS_f90).*\.f95' Makefile.in && Exit 1 -grep '^[ ].*\$(FC.*\$(FCFLAGS_f95).*\.f90' Makefile.in && Exit 1 -grep '^[ ].*\$(FC.*\$(FCFLAGS_f90).*\.f03' Makefile.in && Exit 1 -grep '^[ ].*\$(FC.*\$(FCFLAGS_f08).*\.f90' Makefile.in && Exit 1 +grep '^[ ].*\$(FC.*\$(FCFLAGS_f90).*\.f95' Makefile.in && exit 1 +grep '^[ ].*\$(FC.*\$(FCFLAGS_f95).*\.f90' Makefile.in && exit 1 +grep '^[ ].*\$(FC.*\$(FCFLAGS_f90).*\.f03' Makefile.in && exit 1 +grep '^[ ].*\$(FC.*\$(FCFLAGS_f08).*\.f90' Makefile.in && exit 1 : diff --git a/t/fort4.sh b/t/fort4.sh index 7315ec1b4..e1e6ed4c2 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 @@ -67,7 +67,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 6fa1f22f6..62df8ec88 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 diff --git a/t/fortdep.sh b/t/fortdep.sh index d10644d88..8eff4e9c1 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 @@ -16,7 +16,7 @@ # Test of compiled java. -. ./defs || Exit 1 +. ./defs || exit 1 cat >> configure.ac << 'END' _AM_DEPENDENCIES([GCJ]) @@ -16,7 +16,7 @@ # Make sure '..' invalid in subdir .o's. -. ./defs || Exit 1 +. ./defs || exit 1 cat >> configure.ac << 'END' _AM_DEPENDENCIES(GCJ) @@ -16,7 +16,7 @@ # Make sure dependency tracking works for java. -. ./defs || Exit 1 +. ./defs || exit 1 cat >> configure.ac << 'END' _AM_DEPENDENCIES([GCJ]) @@ -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 ... @@ -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) @@ -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 ac09a6324..60f62cdff 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 e424a8ec0..a42c031d4 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 a9181e48d..a1925f17b 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 8b8a06284..f3d91b04f 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 9a39af2ae..bfeb92218 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/gnits.sh b/t/gnits.sh index badb8b0c3..f3de3b674 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 6bc914609..bf8ec34b4 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 diff --git a/t/gnits3.sh b/t/gnits3.sh index d8baf7c97..0b67253ef 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,7 +86,7 @@ cd build ../configure "--prefix=$(pwd)/../inst-dir" --program-prefix=p $MAKE $MAKE install -$MAKE installcheck && Exit 1 +$MAKE installcheck && exit 1 $MAKE -k installcheck 2>stderr || : # Never trust the exit status of make -k. cat stderr >&2 $MAKE grep-stderr diff --git a/t/gnumake.sh b/t/gnumake.sh index b1ea0002f..ed660a2ff 100755 --- a/t/gnumake.sh +++ b/t/gnumake.sh @@ -18,7 +18,7 @@ # Report from Braden McDaniel. required=GNUmake -. ./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 5aac432b7..1e468a09f 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 6a68d6580..0cdc71009 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 de868a841..92279d704 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 dc93ac87a..60d8ed1e5 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 '[^@]MY_HEADERS' Makefile.in && Exit 1 -Exit 0 +grep '[^@]MY_HEADERS' Makefile.in && exit 1 +exit 0 diff --git a/t/help-depend.sh b/t/help-depend.sh index c69d564d8..1c2cb436b 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 58a8342a8..b40b6f342 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 a9ab69f60..7d2f10cdc 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 d1cff1cd0..0ae47dd79 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 ca1ddfc30..2dd9df36b 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 c2a8d3c27..d4f64024a 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 501b545d8..dcbcfe898 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 2be4fefc0..b7e805e76 100755 --- a/t/help-silent.sh +++ b/t/help-silent.sh @@ -17,7 +17,7 @@ # Make sure that our macro 'AM_SILENT_RULES' 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-upc.sh b/t/help-upc.sh index b81b3879a..822eadf8c 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]) @@ -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 0d433f462..fad2b29fd 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 54e06d57c..0ee3043ba 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 diff --git a/t/help4.sh b/t/help4.sh index d51e0c41a..775a3abbe 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 : @@ -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 a9a068b9b..86d6032a7 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 @@ -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 @@ -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 44e79cb9c..fa2a06573 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 cd74f82a5..38bb46a9a 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 0b0521ba3..3a391bd30 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" @@ -92,7 +92,7 @@ if test $have_installinfo = yes; then $MAKE uninstall test ! -f $instdir/info/foo.info - $FGREP 'but has a nice name' $instdir/info/dir && Exit 1 + $FGREP 'but has a nice name' $instdir/info/dir && exit 1 dir="$destdir/$cwd/$instdir/info" @@ -102,7 +102,7 @@ if test $have_installinfo = yes; then $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 + $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 +grep 'error from install-info' output && exit 1 rm -rf $instdir output @@ -146,7 +146,7 @@ END $MAKE uninstall test ! -f $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 @@ -181,7 +181,7 @@ if test $have_installinfo = yes; then 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 + $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 bd400f427..96d1c56aa 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 9b2bc5747..1cef2c152 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 0754a0941..b6fad9deb 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 8773fc369..54d26a9fc 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 abab752bf..cdcbf5dd7 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]) diff --git a/t/instdir-cond2.sh b/t/instdir-cond2.sh index 6be0883c9..9ca58f735 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 ! -d inst || { find inst; exit 1; } : diff --git a/t/instdir-java.sh b/t/instdir-java.sh index 83361d470..f9c651c18 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 @@ -52,9 +52,9 @@ test ! -d "$instdir" $MAKE -e install DESTDIR="$destdir" test ! -d "$instdir" test ! -d "$destdir" -$MAKE -e uninstall > stdout || { cat stdout; Exit 1; } +$MAKE -e uninstall > stdout || { cat stdout; exit 1; } cat stdout -grep 'rm -f' stdout && Exit 1 +grep 'rm -f' stdout && exit 1 $MAKE -e uninstall DESTDIR="$destdir" : diff --git a/t/instdir-lisp.sh b/t/instdir-lisp.sh index eebf5da18..0c2fa1ebe 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 @@ -50,9 +50,9 @@ test ! -d "$instdir" $MAKE -e install DESTDIR="$destdir" test ! -d "$instdir" test ! -d "$destdir" -$MAKE -e uninstall > stdout || { cat stdout; Exit 1; } +$MAKE -e uninstall > stdout || { cat stdout; exit 1; } cat stdout -grep 'rm -f' stdout && Exit 1 +grep 'rm -f' stdout && exit 1 $MAKE -e uninstall DESTDIR="$destdir" : diff --git a/t/instdir-ltlib.sh b/t/instdir-ltlib.sh index 3d04d2c28..dcd03624e 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 @@ -76,13 +76,13 @@ test ! -d "$instdir" $MAKE -e install DESTDIR="$destdir" test ! -d "$instdir" test ! -d "$destdir" -$MAKE -e uninstall > stdout || { cat stdout; Exit 1; } +$MAKE -e uninstall > stdout || { cat stdout; exit 1; } cat stdout # Creative quoting below to please maintainer-check. -grep 'rm'' ' stdout && Exit 1 -$MAKE -e uninstall DESTDIR="$destdir" > stdout || { cat stdout; Exit 1; } +grep 'rm'' ' stdout && exit 1 +$MAKE -e 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 f86365fe1..53572644b 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 ! -d inst || { find inst; exit 1; } $MAKE uninstall doinst bin_SCRIPTS=foo.sh AM_MAKEFLAGS='bin_SCRIPTS=foo.sh' test -f inst/bin/foo.sh ./configure doinst DESTDIR="$cwd/dest" -test ! -d dest || { find dest; Exit 1; } +test ! -d dest || { find dest; exit 1; } $MAKE uninstall doinst DESTDIR="$cwd/dest" bin_SCRIPTS=foo.sh AM_MAKEFLAGS='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 d459f0ef5..7306c5c94 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 @@ -75,13 +75,13 @@ test ! -d "$instdir" $MAKE -e install DESTDIR="$destdir" test ! -d "$instdir" test ! -d "$destdir" -$MAKE -e uninstall > stdout || { cat stdout; Exit 1; } +$MAKE -e uninstall > stdout || { cat stdout; exit 1; } cat stdout # Creative quoting below to please maintainer-check. -grep 'rm'' ' stdout && Exit 1 -$MAKE -e uninstall DESTDIR="$destdir" > stdout || { cat stdout; Exit 1; } +grep 'rm'' ' stdout && exit 1 +$MAKE -e 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 c15370e42..3d39bd8e0 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 @@ -54,9 +54,9 @@ test ! -d "$instdir" $MAKE -e install DESTDIR="$destdir" test ! -d "$instdir" test ! -d "$destdir" -$MAKE -e uninstall > stdout || { cat stdout; Exit 1; } +$MAKE -e uninstall > stdout || { cat stdout; exit 1; } cat stdout -grep 'rm -f' stdout && Exit 1 +grep 'rm -f' stdout && exit 1 $MAKE -e uninstall DESTDIR="$destdir" : diff --git a/t/instdir-texi.sh b/t/instdir-texi.sh index c0b660741..1d8015ccb 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-html tex texi2dvi' -. ./defs || Exit 1 +. ./defs || exit 1 dvips --help \ || skip_ "dvips is missing" @@ -64,9 +64,9 @@ test ! -d "$instdir" $MAKE -e install install-html install-dvi install-ps install-pdf DESTDIR="$destdir" test ! -d "$instdir" test ! -d "$destdir" -$MAKE -e uninstall > stdout || { cat stdout; Exit 1; } +$MAKE -e uninstall > stdout || { cat stdout; exit 1; } cat stdout -grep 'rm -f' stdout && Exit 1 +grep 'rm -f' stdout && exit 1 $MAKE -e uninstall DESTDIR="$destdir" : diff --git a/t/instdir.sh b/t/instdir.sh index 06821ed23..f9d8e641d 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]) @@ -63,9 +63,9 @@ test ! -d "$instdir" $MAKE -e install DESTDIR="$destdir" test ! -d "$instdir" test ! -d "$destdir" -$MAKE -e uninstall > stdout || { cat stdout; Exit 1; } +$MAKE -e uninstall > stdout || { cat stdout; exit 1; } cat stdout -grep 'rm -f' stdout && Exit 1 +grep 'rm -f' stdout && exit 1 $MAKE -e uninstall DESTDIR="$destdir" : diff --git a/t/instdir2.sh b/t/instdir2.sh index d12d39061..27314814d 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]) @@ -85,9 +85,9 @@ test ! -d "$instdir" $MAKE -e install DESTDIR="$destdir" test ! -d "$instdir" test ! -d "$destdir" -$MAKE -e uninstall > stdout || { cat stdout; Exit 1; } +$MAKE -e uninstall > stdout || { cat stdout; exit 1; } cat stdout -grep 'rm -f' stdout && Exit 1 +grep 'rm -f' stdout && exit 1 $MAKE -e uninstall DESTDIR="$destdir" : diff --git a/t/instexec.sh b/t/instexec.sh index c033ecd37..f394d84a8 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 257f9a013..ee994dffe 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 b602517ea..18525a426 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 b5a0d160e..2b3bf2f60 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 eb4c269ec..5f29c83e8 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 7fe0278c3..1b296129f 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 114dc71e9..612f9a88a 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 <gordoni@cygnus.com>. -. ./defs || Exit 1 +. ./defs || exit 1 echo AC_OUTPUT >> configure.ac diff --git a/t/instman2.sh b/t/instman2.sh index 04663dbef..30baf91ef 100755 --- a/t/instman2.sh +++ b/t/instman2.sh @@ -17,7 +17,7 @@ # Test to make sure mkinstalldirs invocation correct in install-man # target. Bug reported by Gordon Irlam <gordoni@cygnus.com>. -. ./defs || Exit 1 +. ./defs || exit 1 cat > Makefile.am << 'EOF' man8_MANS = frob.8 diff --git a/t/instmany-mans.sh b/t/instmany-mans.sh index 682fc1da7..68d1ba73f 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 d6dd11895..5cf128cb0 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 7721f7df7..369e23a9e 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 1fd1b3b30..e7924b2f9 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 054beb9eb..9e6182c80 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 3a527cb59..f8238933a 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 a6f776376..f72ccf3b8 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/interp.sh b/t/interp.sh index b45d44932..766e8785c 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 3ce33e253..5da8a6126 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/java-check.sh b/t/java-check.sh index 15c0e457b..c9ae66c10 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 239920172..5457f1932 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 448a83907..4f78ea883 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 94a6fa90b..e0e8001a1 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 c1c79422c..fccc7415a 100755 --- a/t/java-compile-run-nested.sh +++ b/t/java-compile-run-nested.sh @@ -25,7 +25,7 @@ # of the older non-parallel 'simple-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 9ec48b28b..c54da0ba3 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 f2fc76d31..d0c1c492e 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"]) diff --git a/t/java-mix.sh b/t/java-mix.sh index 6ec91855f..94adbd6b9 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 diff --git a/t/java-no-duplicate.sh b/t/java-no-duplicate.sh index d7ea5f29f..b5ad9fc98 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 7a1ca440d..a643b3d98 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 cf0c60058..8bb3832a9 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 7672943a3..5b5f2966e 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 2de968391..532cb1ff7 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 e637f6a6a..92373df0d 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 @@ -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 c0b9f957d..286fdd6b6 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 356d0c200..a4652fd55 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,7 +46,7 @@ $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 diff --git a/t/javadir-undefined.sh b/t/javadir-undefined.sh index e2ed7f659..fb0872e8e 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 364b21fe8..17f0dad9f 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 @@ -44,7 +44,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 fe5553572..a5c4a62f0 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 455b8c653..b6929b854 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 8e16fb34b..948745949 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 269af345e..7eb9be311 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 8834a743a..ef6b5cb5a 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 diff --git a/t/lex-clean.sh b/t/lex-clean.sh index 18cf32e4d..29ab4c2dc 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 diff --git a/t/lex-depend-cxx.sh b/t/lex-depend-cxx.sh index ec592f7c6..15557a875 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 0fe32ed0c..4011b8041 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 be7da7fef..7280b84db 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 test-deps-exist $MAKE -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 df8aa00b2..9a64266c9 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 yl_distcheck diff --git a/t/lex-lib.sh b/t/lex-lib.sh index 0320f759c..29e2ed84a 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 3f4b860db..9bd597ae4 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 a95faf349..9629cce24 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_CONFIG_FILES([sub/Makefile]) @@ -106,15 +106,15 @@ for vpath in : false; do ls -l . sub sub/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"' bar-quux.c diff --git a/t/lex-nodist.sh b/t/lex-nodist.sh index 2e90032a6..b2f7b2944 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 733527915..c4c496498 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 1fc64ad18..535b482ca 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 44c977635..0c021a26a 100755 --- a/t/lex-subobj-nodep.sh +++ b/t/lex-subobj-nodep.sh @@ -18,7 +18,7 @@ # are used, even when dependency tracking is disabled. required='cc lex' -. ./defs || Exit 1 +. ./defs || exit 1 cat >>configure.ac <<\END AC_PROG_CC @@ -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 : @@ -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 @@ -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 @@ -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 717be0e03..683f7ea57 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 c7316929f..2c13c96fc 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 bb939a785..22fbbd616 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 @@ -54,8 +54,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 57b7b6715..ec398037b 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 @@ -53,8 +53,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 24a934da3..e4255e0c5 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 1165f1ecc..c730c522a 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 f19de7492..1c0736bb2 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 c3c005707..4c2b74d87 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 ef63d8b0d..360ff5d2b 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 50554de49..266aaadb9 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 d306b7157..c7c30e8e7 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 f0466fd54..71ace126f 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 8fe521d9c..ccaa6bd26 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 2e1da263b..9826446c7 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 110ba1959..1b8da0836 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 6c54a284e..e4277f91a 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 0ac743859..77d7d54ba 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 4d9e2835d..cae9e8125 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 ce655c232..778dbd3dd 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/libobj20a.sh b/t/libobj20a.sh index d56be31da..4ff807f72 100755 --- a/t/libobj20a.sh +++ b/t/libobj20a.sh @@ -17,7 +17,7 @@ # Test error reporting for AC_CONFIG_LIBOBJ_DIR. # See also sister tests 'libobj20b.test' and 'libobj20c.test' . -. ./defs || Exit 1 +. ./defs || exit 1 cat >> configure.ac << 'END' AC_CONFIG_LIBOBJ_DIR([libobj-dir]) diff --git a/t/libobj20b.sh b/t/libobj20b.sh index f8ca60019..a90df20b6 100755 --- a/t/libobj20b.sh +++ b/t/libobj20b.sh @@ -17,7 +17,7 @@ # Test error reporting for AC_CONFIG_LIBOBJ_DIR. # See also sister tests 'libobj20a.test' and 'libobj20c.test' . -. ./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 7ae51bf21..2d1d65b5a 100755 --- a/t/libobj20c.sh +++ b/t/libobj20c.sh @@ -17,7 +17,7 @@ # Test error reporting for AC_CONFIG_LIBOBJ_DIR. # See also sister tests 'libobj20a.test' and 'libobj20b.test' . -. ./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 37ec6bf77..1c78cbabe 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 68711afc8..c7a199eb5 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 036ae561d..d8b7e2d1d 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 46f0f9841..1630bee6f 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 1bf34de6a..e95fecb90 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 dfa87584c..98c880bdd 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 daf96b922..308e74836 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 0218ef32c..d78886a20 100755 --- a/t/libtoo10.sh +++ b/t/libtoo10.sh @@ -18,7 +18,7 @@ # Report from Guillermo Ontañón. required='cc libtoolize' -. ./defs || Exit 1 +. ./defs || exit 1 cat >> configure.ac << 'END' AM_PROG_AR diff --git a/t/libtoo11.sh b/t/libtoo11.sh index cd55cc014..1f91f19ef 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 f2f881128..17fea0656 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/libtool.sh b/t/libtool.sh index 7b267a714..dd918a14d 100755 --- a/t/libtool.sh +++ b/t/libtool.sh @@ -18,7 +18,7 @@ # Report from Kevin Dalley. required=libtool -. ./defs || Exit 1 +. ./defs || exit 1 cat >> configure.ac << 'END' AC_LIBTOOL_DLOPEN diff --git a/t/libtool2.sh b/t/libtool2.sh index 3b8a78b60..d9db4aad1 100755 --- a/t/libtool2.sh +++ b/t/libtool2.sh @@ -18,7 +18,7 @@ # Report from Eric Magnien. required=libtoolize -. ./defs || Exit 1 +. ./defs || exit 1 cat >> configure.ac << 'END' AC_PROG_CC diff --git a/t/libtool3.sh b/t/libtool3.sh index dbcd519d9..22c72d1d8 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 @@ -78,8 +78,8 @@ $AUTOMAKE --add-missing --copy # We need explicit rules to build 1.o and a.lo. Make sure # Automake did not output additional rules for 1.lo and and a.lo. $FGREP '1.o:' Makefile.in -$FGREP '1.lo:' Makefile.in && Exit 1 -$FGREP 'a.o:' Makefile.in && Exit 1 +$FGREP '1.lo:' Makefile.in && exit 1 +$FGREP 'a.o:' Makefile.in && exit 1 $FGREP 'a.lo:' Makefile.in ./configure diff --git a/t/libtool4.sh b/t/libtool4.sh index 2ce92dd29..e8704b79a 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 b9e778b36..760509808 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 7655569d9..19f30e79f 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 6dc6aeb9f..59e9e2504 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 @@ -81,7 +81,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 @@ -92,7 +92,7 @@ $MAKE env LIBTOOLFLAGS=--silent $MAKE install >output 2>&1 || { cat output - Exit 1 + exit 1 } cat output grep 'silent.*silent.*prg' output @@ -100,7 +100,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 9182c278e..8cfb8e351 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 b4d7baa87..eb777d807 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 @@ -87,16 +87,16 @@ $AUTOMAKE --add-missing --copy ./configure env LDFLAGS=ldflags AM_LDFLAGS=am_ldflags libmod1_la_LDFLAGS=lm1_la_ldflags \ CFLAGS=cflags AM_CFLAGS=am_cflags prg2_CFLAGS=prg2_cflags \ - $MAKE -e print >output 2>&1 || { cat output; Exit 1; } + $MAKE -e 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 c3dad694e..384670913 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 diff --git a/t/license2.sh b/t/license2.sh index d447eba2f..736e96fa0 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 a3dac1b5b..27dcb2455 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 <langston@SLAC.Stanford.EDU> -. ./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 71733ba60..a5ac4b101 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 @@ CXX=false $MAKE -e # Sanity check. rm -f foo foo.exe -CC=false $MAKE -e && Exit 99 +CC=false $MAKE -e && exit 99 $MAKE distclean @@ -83,6 +83,6 @@ CC=false $MAKE -e # Sanity check. rm -f foo foo.exe -CXX=false $MAKE -e && Exit 99 +CXX=false $MAKE -e && exit 99 : diff --git a/t/link_dist.sh b/t/link_dist.sh index 8ba05dfd4..9ad431951 100755 --- a/t/link_dist.sh +++ b/t/link_dist.sh @@ -18,7 +18,7 @@ # *_SOURCES # Richard Boulton <richard@tartarus.org> -. ./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 a34d6c6d2..252d46a3a 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 <mrnolta@princeton.edu> -. ./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 25f3ef93e..5d2702508 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 <langston@SLAC.Stanford.EDU> -. ./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 6cf8b8bd2..f334ad83f 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 <langston@SLAC.Stanford.EDU> -. ./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 ede7b5a59..03b71f5e2 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 <langston@SLAC.Stanford.EDU> -. ./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 545f6a675..29893d899 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 <langston@SLAC.Stanford.EDU> -. ./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 48d32a26a..1bf1085dc 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 25d174f71..4f0791124 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 0d8be77bb..5b95715ec 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 >output 2>&1 || { cat output; Exit 1; } +$MAKE >output 2>&1 || { cat output; exit 1; } cat output grep $unique output diff --git a/t/lisp4.sh b/t/lisp4.sh index 82109f5b4..b8cb7963a 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 34edf3b57..4d0499cd7 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 1e3bc4186..07b1d5847 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 diff --git a/t/lisp7.sh b/t/lisp7.sh index 6022334fc..e2574ab50 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,7 +37,7 @@ $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) diff --git a/t/lisp8.sh b/t/lisp8.sh index 8c1982bd9..6e6b901de 100755 --- a/t/lisp8.sh +++ b/t/lisp8.sh @@ -17,7 +17,7 @@ # Check the recover rule of lisp_LISP with parallel make. required='GNUmake 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 a89ffe171..2dfbc0b20 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 diff --git a/t/listval.sh b/t/listval.sh index 5e2f9a64c..8bd6b7905 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/location.sh b/t/location.sh index f9dd289ed..dab1e330f 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 ab3d5d4ce..1174a1437 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 0c7e09e82..d0240fdc6 100755 --- a/t/longline.sh +++ b/t/longline.sh @@ -17,7 +17,7 @@ # Long lines of += should be wrapped. # Report from Simon Josefsson. -. ./defs || Exit 1 +. ./defs || exit 1 (echo DUMMY = some_long_filename_1; for i in 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20; diff --git a/t/ltcond.sh b/t/ltcond.sh index 7562d92bd..773efbfb5 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]) @@ -87,11 +87,11 @@ test -f lib/lib1bar.la test -f lib/lib2foo.la test ! -f 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 diff --git a/t/ltcond2.sh b/t/ltcond2.sh index 4a7239483..49b14d8e9 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 7a6258575..c22a44f1a 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,7 +134,7 @@ 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 @@ -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 100d045e9..a13ae0352 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 e0f9b02ad..69e8d55e7 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 690699449..f12da7760 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 5cdccf09b..ed0d2ed3c 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/ltlibsrc.sh b/t/ltlibsrc.sh index 11e2a1d56..7c848144c 100755 --- a/t/ltlibsrc.sh +++ b/t/ltlibsrc.sh @@ -17,7 +17,7 @@ # Test to make sure a sensible default source for libraries is used. required='cc libtool' -. ./defs || Exit 1 +. ./defs || exit 1 cat >> configure.ac << 'END' AC_PROG_CC diff --git a/t/ltorder.sh b/t/ltorder.sh index 59047a0a6..c8f60edec 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 @@ -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 52dae22a0..3da20eee0 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 11e97a69f..edac28745 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]) diff --git a/t/maintclean.sh b/t/maintclean.sh index c5d3d0ef7..8c2d3a621 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]) diff --git a/t/maintmode-configure-msg.sh b/t/maintmode-configure-msg.sh index 5396cbf35..ebdf4d724 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 8e25d88f8..1fd255d11 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 @@ -18,7 +18,7 @@ # From Ralf Corsepius. required=GNUmake -. ./defs || Exit 1 +. ./defs || exit 1 cat >> configure.ac << 'END' AM_MAKE_INCLUDE @@ -49,4 +49,4 @@ for flag in '' -w; do rm -f config.cache done -Exit 0 +exit 0 diff --git a/t/makefile-deps.sh b/t/makefile-deps.sh index 83f3caeef..192e56bae 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 64c5f28a9..b339bd73c 100755 --- a/t/makej.sh +++ b/t/makej.sh @@ -22,7 +22,7 @@ # via autom4te. required=GNUmake -. ./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 2e5d55b94..c7d809e89 100755 --- a/t/makej2.sh +++ b/t/makej2.sh @@ -18,7 +18,7 @@ # without -B, it may reuse the same shell for separate commands in a # rule, which can lead to interesting results. -. ./defs || Exit 1 +. ./defs || exit 1 cat >>configure.ac <<'END' AC_OUTPUT diff --git a/t/maken.sh b/t/maken.sh index a114422b4..ec7200895 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, at least when using GNU make. -. ./defs || Exit 1 +. ./defs || exit 1 mkdir sub @@ -52,7 +52,7 @@ $sleep for target in dist distcheck; do $MAKE -n $target if using_gmake; then - $MAKE -n $target | grep stamp-sub-dist-hook || Exit 1 + $MAKE -n $target | grep stamp-sub-dist-hook || exit 1 fi $MAKE test-no-distdir # No file has been actually touched or created. diff --git a/t/maken3.sh b/t/maken3.sh index 832bdcf59..99e2305bf 100755 --- a/t/maken3.sh +++ b/t/maken3.sh @@ -25,7 +25,7 @@ # as well as tags, TAGS. # For gen-testsuite-part: ==> try-with-serial-tests <== -. ./defs || Exit 1 +. ./defs || exit 1 # Does $MAKE support the '.MAKE' special target? have_dotmake=false @@ -144,33 +144,33 @@ 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 ) ;; *) if $have_dotmake; then - grep "stamp-$target$" stdout || Exit 1 + grep "stamp-$target$" stdout || exit 1 fi - test ! -f "stamp-$target$" || Exit 1 + test ! -f "stamp-$target$" || exit 1 ;; esac case $target in install-* | installdirs ) ;; *) if $have_dotmake; then - grep "stamp-$target-sub" stdout || Exit 1 + grep "stamp-$target-sub" stdout || exit 1 fi - test ! -f "sub/stamp-$target-sub" || Exit 1 + test ! -f "sub/stamp-$target-sub" || exit 1 ;; esac case $target in distclean | maintainer-clean ) ;; *) if $have_dotmake; then - grep "should-not-be-executed" stdout || Exit 1 + grep "should-not-be-executed" stdout || exit 1 fi - test ! -f "sub2/sub2-$target-should-not-be-executed" || Exit 1 + test ! -f "sub2/sub2-$target-should-not-be-executed" || exit 1 ;; esac done @@ -178,7 +178,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. @@ -186,6 +186,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 ad18830a2..3654196b2 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 : @@ -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 @@ -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 @@ -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 @@ -31,7 +31,7 @@ # when developers ask users to try out a fix from VCS; the developers themselves # will usually have help2man installed (or should install it). -. ./defs || Exit 1 +. ./defs || exit 1 cat > Makefile.am << 'END' dist_man_MANS = $(srcdir)/foo.1 bar.1 @@ -74,7 +74,7 @@ grep_error_messages() grep ' man pages contain.*missing help2man.* replacement text' stderr \ && grep 'install help2man' stderr \ && grep 'regenerate the man pages' stderr \ - || Exit 1 + || exit 1 } $ACLOCAL @@ -83,10 +83,10 @@ $AUTOCONF ./configure $MAKE -$MAKE dist 2>stderr && { cat stderr >&2; Exit 1; } +$MAKE dist 2>stderr && { cat stderr >&2; exit 1; } cat stderr >&2 grep_error_messages -$MAKE distcheck 2>stderr && { cat stderr >&2; Exit 1; } +$MAKE distcheck 2>stderr && { cat stderr >&2; exit 1; } cat stderr >&2 grep_error_messages $MAKE distclean @@ -95,10 +95,10 @@ mkdir build cd build ../configure $MAKE -$MAKE dist 2>stderr && { cat stderr >&2; Exit 1; } +$MAKE dist 2>stderr && { cat stderr >&2; exit 1; } cat stderr >&2 grep_error_messages -$MAKE distcheck 2>stderr && { cat stderr >&2; Exit 1; } +$MAKE distcheck 2>stderr && { cat stderr >&2; exit 1; } cat stderr >&2 grep_error_messages @@ -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 @@ -18,7 +18,7 @@ # even if the 'missing' script is involved. required=help2man -. ./defs || Exit 1 +. ./defs || exit 1 # Avoid a spurious failure due to a known FreeBSD make incompatibility. useless_vpath_rebuild \ @@ -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 @@ -16,7 +16,7 @@ # Check for a bug in distcheck w.r.t. generated manpages. -. ./defs || Exit 1 +. ./defs || exit 1 # Avoid a spurious failure due to a known FreeBSD make incompatibility. useless_vpath_rebuild \ diff --git a/t/mdate.sh b/t/mdate.sh index b33bf638b..e44144a8f 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 093de5ea9..6ba57278b 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 a37e60b79..aa2755ee0 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/mdate4.sh b/t/mdate4.sh index ac1be3a38..70809a6a6 100755 --- a/t/mdate4.sh +++ b/t/mdate4.sh @@ -17,7 +17,7 @@ # Test to make sure that mdate-sh is added to the right directory. # Report from Kevin Dalley. -. ./defs || Exit 1 +. ./defs || exit 1 cat >> configure.ac << 'END' AC_CONFIG_FILES([sub/Makefile]) diff --git a/t/mdate5.sh b/t/mdate5.sh index 66afac1bc..0cbc19856 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 ca3ca21ea..110bb2d57 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/missing-auxfile-stops-makefiles-creation.sh b/t/missing-auxfile-stops-makefiles-creation.sh index d7080818d..9c6c037ef 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 diff --git a/t/missing.sh b/t/missing.sh index 473d0412c..fcca48f85 100755 --- a/t/missing.sh +++ b/t/missing.sh @@ -16,7 +16,7 @@ # Test missing with version mismatches. -. ./defs || Exit 1 +. ./defs || exit 1 cat >>configure.ac <<'EOF' AC_OUTPUT @@ -61,6 +61,6 @@ $MAKE # Make sure $MAKE fails when timestamps aren't updated and missing is not used. $sleep touch aclocal.m4 -$MAKE && Exit 1 +$MAKE && exit 1 : diff --git a/t/missing2.sh b/t/missing2.sh index 89e9a5daf..7b9c231d8 100755 --- a/t/missing2.sh +++ b/t/missing2.sh @@ -16,7 +16,7 @@ # Test missing with version mismatches. -. ./defs || Exit 1 +. ./defs || exit 1 cat >>configure.ac <<'EOF' m4_include([v.m4]) @@ -53,6 +53,6 @@ $MAKE # Make sure $MAKE fail when timestamps aren't updated and missing is not used. $sleep touch v.m4 -$MAKE && Exit 1 +$MAKE && exit 1 : diff --git a/t/missing3.sh b/t/missing3.sh index a26f954c9..c5db4f038 100755 --- a/t/missing3.sh +++ b/t/missing3.sh @@ -17,37 +17,37 @@ # Test missing when running a tool's --version. am_create_testdir=empty -. ./defs || Exit 1 +. ./defs || exit 1 get_shell_script missing # b7cb8259 assumed not to exist. -./missing b7cb8259 --version 2>stderr && { cat stderr >&2; Exit 1; } +./missing b7cb8259 --version 2>stderr && { cat stderr >&2; exit 1; } cat stderr >&2 -grep . stderr && Exit 1 -./missing b7cb8259 --grep 2>stderr && { cat stderr >&2; Exit 1; } +grep . stderr && exit 1 +./missing b7cb8259 --grep 2>stderr && { cat stderr >&2; exit 1; } cat stderr >&2 grep WARNING stderr -./missing --run b7cb8259 --version && Exit 1 -./missing --run b7cb8259 --grep 2>stderr && { cat stderr >&2; Exit 1; } +./missing --run b7cb8259 --version && exit 1 +./missing --run b7cb8259 --grep 2>stderr && { cat stderr >&2; exit 1; } cat stderr >&2 grep WARNING stderr # missing itself it known to exist :) -./missing ./missing --version 2>stderr && { cat stderr >&2; Exit 1; } +./missing ./missing --version 2>stderr && { cat stderr >&2; exit 1; } cat stderr >&2 -grep . stderr && Exit 1 -./missing ./missing --grep 2>stderr && { cat stderr >&2; Exit 1; } +grep . stderr && exit 1 +./missing ./missing --grep 2>stderr && { cat stderr >&2; exit 1; } cat stderr >&2 grep WARNING stderr -./missing --run ./missing --version 2>stderr || { cat stderr >&2; Exit 1; } +./missing --run ./missing --version 2>stderr || { cat stderr >&2; exit 1; } cat stderr >&2 -grep . stderr && Exit 1 -./missing --run ./missing --grep 2>stderr && { cat stderr >&2; Exit 1; } +grep . stderr && exit 1 +./missing --run ./missing --grep 2>stderr && { cat stderr >&2; exit 1; } cat stderr >&2 -grep WARNING stderr && Exit 1 +grep WARNING stderr && exit 1 grep Unknown stderr diff --git a/t/missing4.sh b/t/missing4.sh index 01321c349..22d31d0b2 100755 --- a/t/missing4.sh +++ b/t/missing4.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/missing5.sh b/t/missing5.sh index 363cc1aab..4dcb022c5 100755 --- a/t/missing5.sh +++ b/t/missing5.sh @@ -18,7 +18,7 @@ # PR automake/483. am_create_testdir=empty -. ./defs || Exit 1 +. ./defs || exit 1 get_shell_script missing diff --git a/t/missing6.sh b/t/missing6.sh index 8173f818a..8e02ae999 100755 --- a/t/missing6.sh +++ b/t/missing6.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/mkdirp-deprecation.sh b/t/mkdirp-deprecation.sh index 7b8f67f0f..8482dea36 100755 --- a/t/mkdirp-deprecation.sh +++ b/t/mkdirp-deprecation.sh @@ -17,7 +17,7 @@ # Check that the AM_PROG_MKDIR_P macro is deprecated. It will be # be removed in the next major Automake release. -. ./defs || Exit 1 +. ./defs || exit 1 echo AM_PROG_MKDIR_P >> configure.ac : > Makefile.am @@ -32,7 +32,7 @@ grep_err () $ACLOCAL -$AUTOCONF -Werror -Wobsolete 2>stderr && { cat stderr >&2; Exit 1; } +$AUTOCONF -Werror -Wobsolete 2>stderr && { cat stderr >&2; exit 1; } cat stderr >&2 grep_err diff --git a/t/mkinst2.sh b/t/mkinst2.sh index 2a4fb0b0c..c2f9bf66a 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 diff --git a/t/mkinst3.sh b/t/mkinst3.sh index 08cfb76e8..258275821 100755 --- a/t/mkinst3.sh +++ b/t/mkinst3.sh @@ -17,7 +17,7 @@ # Test mkinstalldirs 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/mkinstall.sh b/t/mkinstall.sh index e6b3bc22a..51c1fe949 100755 --- a/t/mkinstall.sh +++ b/t/mkinstall.sh @@ -16,7 +16,7 @@ # Test for bug where mkinstalldirs variable can be set incorrectly. -. ./defs || Exit 1 +. ./defs || exit 1 cat > Makefile.am << 'END' pkgdata_DATA = @@ -27,5 +27,5 @@ END $ACLOCAL $AUTOMAKE ././Makefile -grep ' /mkinstalldirs' Makefile.in && Exit 1 -Exit 0 +grep ' /mkinstalldirs' Makefile.in && exit 1 +exit 0 diff --git a/t/mmode.sh b/t/mmode.sh index 6c8039955..23cb646a5 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 25139aa88..9147da1f2 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 698f1c0bd..778db14e4 100755 --- a/t/multlib.sh +++ b/t/multlib.sh @@ -20,7 +20,7 @@ # FIXME: We should move this script accordingly. required='gcc GNUmake' -. ./defs || Exit 1 +. ./defs || exit 1 mldir=$am_top_srcdir/contrib/multilib mkdir m4 diff --git a/t/no-extra-makefile-code.sh b/t/no-extra-makefile-code.sh index 1742dc433..ab0e33d3a 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 @@ -31,6 +31,6 @@ $ACLOCAL $AUTOMAKE $EGREP 'DEFAULT_INCLUDES|@am__isrc@|-compile|\$\(OBJEXT\)|tab\.[ch]' \ - Makefile.in && Exit 1 + Makefile.in && exit 1 : diff --git a/t/no-outdir-option.sh b/t/no-outdir-option.sh index 621253479..59987b59d 100755 --- a/t/no-outdir-option.sh +++ b/t/no-outdir-option.sh @@ -16,7 +16,7 @@ # Check that the '-o' aka '--output-dir' option is not recognized anymore. -. ./defs || Exit 1 +. ./defs || exit 1 : > Makefile.am diff --git a/t/nobase-libtool.sh b/t/nobase-libtool.sh index 163ffd36f..2a6bc2a9e 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 54b940b9b..6024e5c29 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 diff --git a/t/nobase-python.sh b/t/nobase-python.sh index d086bbe43..dba17f715 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 a7219ed45..1432d8dbe 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/nodef.sh b/t/nodef.sh index 3c55745b3..979b906d6 100755 --- a/t/nodef.sh +++ b/t/nodef.sh @@ -16,7 +16,7 @@ # Make sure that PACKAGE and VERSION are AC_DEFINEd when requested. -. ./defs || Exit 1 +. ./defs || exit 1 # ------------------------------------------------------------------- # Do not upgrade this file to use the modern AC_INIT/AM_INIT_AUTOMAKE @@ -53,6 +53,6 @@ $ACLOCAL $AUTOCONF ./configure -grep 'DEFS.*-DVERSION=\\"UnIqUe' output && Exit 1 +grep 'DEFS.*-DVERSION=\\"UnIqUe' output && exit 1 : diff --git a/t/nodef2.sh b/t/nodef2.sh index 1af7b0d36..2f7bb77ca 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/nodep.sh b/t/nodep.sh index 5dcad1ce9..8a4ce8e9f 100755 --- a/t/nodep.sh +++ b/t/nodep.sh @@ -17,7 +17,7 @@ # Test to make sure no-dependencies option does the right thing. # Bug report from Greg A. Woods. -. ./defs || Exit 1 +. ./defs || exit 1 cat > Makefile.am << 'END' AUTOMAKE_OPTIONS = no-dependencies @@ -36,5 +36,5 @@ mkdir x $ACLOCAL $AUTOMAKE -grep '%' Makefile.in && Exit 1 -Exit 0 +grep '%' Makefile.in && exit 1 +exit 0 diff --git a/t/nodep2.sh b/t/nodep2.sh index cc80058a5..df411b763 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 @@ -45,6 +45,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 4691efa91..25c66b596 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 92cc2f75a..f63ea976a 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 '^DIST_SOURCES =' Makefile.in -grep '^DIST_SOURCES =.*nodist' Makefile.in && Exit 1 +grep '^DIST_SOURCES =.*nodist' Makefile.in && exit 1 : diff --git a/t/nodist2.sh b/t/nodist2.sh index 9c7ec30e3..9db9dcee3 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 23becc12d..f45f66f9e 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 '^DIST_SOURCES =' Makefile.in && Exit 1 +grep '^dist:' Makefile.in && exit 1 +grep '^DIST_SOURCES =' Makefile.in && exit 1 : diff --git a/t/noinst.sh b/t/noinst.sh index 887c7a73c..ca4440fde 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 39abdc7e2..be07970f7 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 dea627127..34219b201 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 8b780a6e5..812c6be22 100755 --- a/t/nostdinc.sh +++ b/t/nostdinc.sh @@ -21,7 +21,7 @@ # just skip the rest of the test if configure fails to find a working C # compiler. -. ./defs || Exit 1 +. ./defs || exit 1 cat >> configure.ac << 'END' AC_PROG_CC @@ -37,7 +37,7 @@ END $ACLOCAL $AUTOMAKE -$EGREP '(-I *\.|-I.*srcdir|am__isrc)' Makefile.in && Exit 1 +$EGREP '(-I *\.|-I.*srcdir|am__isrc)' Makefile.in && exit 1 # We'll test the fully-processed Makefile too. $AUTOCONF @@ -45,12 +45,12 @@ $AUTOCONF # Test with $builddir != $srcdir mkdir build cd build -../configure || Exit $? -$EGREP '.*-I *(\.|\$.srcdir.)' Makefile && Exit 1 +../configure || exit $? +$EGREP '.*-I *(\.|\$.srcdir.)' Makefile && exit 1 # Test with $builddir = $srcdir cd .. -./configure || Exit $? -$EGREP '.*-I *(\.|\$.srcdir.)' Makefile && Exit 1 +./configure || exit $? +$EGREP '.*-I *(\.|\$.srcdir.)' Makefile && exit 1 -Exit 0 +exit 0 diff --git a/t/notrans.sh b/t/notrans.sh index 81ed4d89d..d997e97a1 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 d5c3acf0e..e0ccd240e 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 f608fbc83..919bb10d5 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 a2e42126e..31bc30dcc 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 6c2b1e6a1..e98a81128 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 8a26db78f..876fecbf7 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. @@ -92,7 +92,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 $AUTOHEADER $AUTOCONF @@ -337,7 +337,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 acd7e1991..e20a0369e 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 be2cdf752..e00106d79 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 @@ -40,7 +40,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 $AUTOMAKE diff --git a/t/objcxx-deps.sh b/t/objcxx-deps.sh index 782193ac7..fef4ac549 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' dnl Support for Object C++ was introduced only in Autoconf 2.65. @@ -55,14 +55,14 @@ 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 $AUTOCONF $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 @@ -73,7 +73,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 aea7e1948..8f5df45cb 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' dnl Support for Object C++ was introduced only in Autoconf 2.65. @@ -55,16 +55,16 @@ 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 $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 74e152c1c..e4e776789 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' dnl Support for Object C++ was introduced only in Autoconf 2.65. @@ -62,7 +62,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 $AUTOCONF $AUTOHEADER diff --git a/t/objext-pr10128.sh b/t/objext-pr10128.sh index 440fc1d19..e773b72b3 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/obsolete.sh b/t/obsolete.sh index e48d435ea..2a21f54ed 100755 --- a/t/obsolete.sh +++ b/t/obsolete.sh @@ -20,7 +20,7 @@ # AUTOUPDATE='autoupdate --verbose'. set x ${AUTOUPDATE-autoupdate} required=$2 -. ./defs || Exit 1 +. ./defs || exit 1 cat > configure.ac << 'END' AC_INIT @@ -29,8 +29,8 @@ END $PERL -ne '/AU_DEFUN\(\[(\w+)\]/ && print "$1\n"' \ "$am_automake_acdir/obsolete.m4" > obs cat obs >> configure.ac -$PERL -ne 'chomp; print "grep $_ output || Exit 1\n"; ' obs > obs.1 -$PERL -ne 'chomp; print "grep $_ configure.ac && Exit 1\n"; ' obs > obs.2 +$PERL -ne 'chomp; print "grep $_ output || exit 1\n"; ' obs > obs.1 +$PERL -ne 'chomp; print "grep $_ configure.ac && exit 1\n"; ' obs > obs.2 echo : >> obs.1 # Since it will be sourced, it must end with a success. echo : >> obs.2 # Likewise. @@ -44,7 +44,7 @@ test $(wc -l <configure.ac) -gt 1 $ACLOCAL # Expect Autoconf to complain about each of the macros in obs. -$AUTOCONF -Wobsolete >output 2>&1 || { cat output; Exit 1; } +$AUTOCONF -Wobsolete >output 2>&1 || { cat output; exit 1; } cat output . ./obs.1 # Make sure Autoupdate remove each of these macros. diff --git a/t/oldvars.sh b/t/oldvars.sh index dd162fff8..26f6001b2 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/order.sh b/t/order.sh index 238340346..cd0beac9d 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 879b678c3..02b26df29 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 faf877ba5..a21fe8920 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 92492f692..f0060fdac 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 4413f9732..7dbd835a9 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 a3693cc29..80e0f2084 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 065bdb5cb..a012d337b 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]) diff --git a/t/output2.sh b/t/output2.sh index 41c81bfe7..615f6cf5e 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 dd7aaefe7..2e4f38a54 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 fa6a95ea5..54d49e297 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 8bf9403a2..8222ea700 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 b55f5e327..418e1a5af 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 0f4725fae..d5aca2995 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 943e75865..62cade51c 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 f0759108c..54dc8c12f 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 020a6e37e..fbdcda7f2 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"]) diff --git a/t/override-conditional-2.sh b/t/override-conditional-2.sh index 4f0688832..58ab1fda3 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 cf57880bc..777d946e2 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 286c8881b..11b7fb96b 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 a27c663e9..bd50af9e6 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 a8ee1b955..0cca565d7 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 d6302907e..1bc12bbbc 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-cmdline-override.sh b/t/parallel-tests-cmdline-override.sh index 5c48640cc..4e8780f05 100755 --- a/t/parallel-tests-cmdline-override.sh +++ b/t/parallel-tests-cmdline-override.sh @@ -17,7 +17,7 @@ # Check that we can use indirections when overriding TESTS and # TEST_LOGS from the command line. -. ./defs || Exit 1 +. ./defs || exit 1 cat >> configure.ac << 'END' AC_OUTPUT @@ -60,7 +60,7 @@ END do_check () { - env "$@" $MAKE -e check >stdout || { cat stdout; Exit 1; } + env "$@" $MAKE -e check >stdout || { cat stdout; exit 1; } cat stdout grep '^PASS:' stdout | LC_ALL=C sort > got-out cat got-out diff --git a/t/parallel-tests-console-output.sh b/t/parallel-tests-console-output.sh index 5a78efdbd..22650082a 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 fcfa38d7f..aa9ac120c 100755 --- a/t/parallel-tests-driver-install.sh +++ b/t/parallel-tests-driver-install.sh @@ -17,7 +17,7 @@ # Check that auxiliary script 'test-driver' gets automatically installed # in the correct directory by 'parallel-tests' option. -. ./defs || Exit 1 +. ./defs || exit 1 : Try first with parallel-tests defined in AM_INIT_AUTOMAKE. @@ -44,7 +44,7 @@ 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. @@ -79,7 +79,7 @@ END $ACLOCAL $AUTOMAKE --add-missing --copy dir/GNUmakefile 2>stderr \ - || { cat stderr >&2; Exit 1; } + || { cat stderr >&2; exit 1; } cat stderr >&2 ls -l . dir build-aux # For debugging. diff --git a/t/parallel-tests-dry-run-1.sh b/t/parallel-tests-dry-run-1.sh index 6fdcb9820..3f6172de2 100755 --- a/t/parallel-tests-dry-run-1.sh +++ b/t/parallel-tests-dry-run-1.sh @@ -17,7 +17,7 @@ # Check parallel-tests interactions with "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 20ccb5dc4..0bd6523a0 100755 --- a/t/parallel-tests-dry-run-2.sh +++ b/t/parallel-tests-dry-run-2.sh @@ -17,7 +17,7 @@ # Check parallel-tests interactions with "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 : } @@ -57,11 +57,10 @@ for target in check recheck test-suite.log; do test ! -f test-suite.log done -# Creative quoting below to please maintainer-check. -echo exit '0' > foo.test -echo exit '1' > bar.test +echo 'exit 0' > foo.test +echo 'exit 1' > bar.test -$MAKE check && Exit 1 +$MAKE check && exit 1 chmod a-w . @@ -71,17 +70,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 +90,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 diff --git a/t/parallel-tests-empty-testlogs.sh b/t/parallel-tests-empty-testlogs.sh index 619eae556..0ed2ff255 100755 --- a/t/parallel-tests-empty-testlogs.sh +++ b/t/parallel-tests-empty-testlogs.sh @@ -18,7 +18,7 @@ # - empty TESTS # - empty TEST_LOGS -. ./defs || Exit 1 +. ./defs || exit 1 cat >> configure.ac << 'END' AC_CONFIG_FILES([sub1/Makefile sub2/Makefile]) @@ -62,7 +62,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 5a3af46cb..e4eb26045 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. diff --git a/t/parallel-tests-exit-statuses.sh b/t/parallel-tests-exit-statuses.sh index 8d8e6a972..bd5bb7685 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 @@ -77,7 +77,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 @@ -85,7 +85,7 @@ st=1 XFAIL_TESTS="$failure_statuses 99" $MAKE -e 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-xfail-1 diff exp-xfail-1 got-xfail-1 @@ -94,7 +94,7 @@ XFAIL_TESTS="$failure_statuses" TESTS="0 77 $failure_statuses" \ $MAKE -e 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 c9d13da70..52eb2b03f 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 @@ -121,10 +121,10 @@ cat stdout cat stderr >&2 ls -l if using_gmake; then - test $st -gt 0 || Exit 1 + test $st -gt 0 || exit 1 else # Don't trust exit status of "make -k" for non-GNU make. - $MAKE check && Exit 1 + $MAKE check && exit 1 : For shells with busted 'set -e'. fi @@ -162,7 +162,7 @@ st=0 RECHECK_LOGS= $MAKE -e check >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 || : @@ -173,7 +173,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 5683658f4..dd5df9b07 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 @@ -112,6 +112,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 d2dba94ae..aaa0d9872 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 @@ -64,6 +64,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 108d6eab6..2e6bfac19 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. @@ -102,7 +102,7 @@ do_check () log=$1; shift env "$@" $MAKE -e check >output 2>&1 || st=$? cat output - $FGREP '::OOPS::' output && Exit 1 # Possible infinite recursion. + $FGREP '::OOPS::' output && exit 1 # Possible infinite recursion. # Check that at least we don't create a botched global log file. test ! -f "$log" if using_gmake; then @@ -128,7 +128,7 @@ do_check () err_seen=yes break done - test $err_seen = yes || Exit 1 + test $err_seen = yes || exit 1 fi } diff --git a/t/parallel-tests-harderror.sh b/t/parallel-tests-harderror.sh index fc7a3c31a..8e1e014d7 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]) @@ -64,13 +64,13 @@ 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 # The '-e' is wanted here. -DISABLE_HARD_ERRORS='' $MAKE -e check && Exit 1 +DISABLE_HARD_ERRORS='' $MAKE -e check && exit 1 cat test-suite.log grep '^ERROR: bar$' test-suite.log cd .. @@ -85,8 +85,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-interrupt.tap b/t/parallel-tests-interrupt.tap index 50b734e0f..bce25b3be 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 10519e072..9c4ffce00 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 -T_LOG_FLAGS=--bad $MAKE -e check && Exit 1 +T_LOG_FLAGS=--bad $MAKE -e check && 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 72fba680c..08e2c9d3d 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-compiler-example.sh b/t/parallel-tests-log-compiler-example.sh index 60dd7bd50..0d66b646c 100755 --- a/t/parallel-tests-log-compiler-example.sh +++ b/t/parallel-tests-log-compiler-example.sh @@ -18,7 +18,7 @@ # LOG_COMPILER and LOG_FLAGS given in the manual. required=python -. ./defs || Exit 1 +. ./defs || exit 1 cat >> configure.ac <<END AC_SUBST([PERL], ['$PERL']) @@ -58,7 +58,7 @@ $MAKE check || st=$? cat foo.log cat bar.log cat baz.log -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-log-override-1.sh b/t/parallel-tests-log-override-1.sh index 55f60829f..1fa5d9a05 100755 --- a/t/parallel-tests-log-override-1.sh +++ b/t/parallel-tests-log-override-1.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,7 +73,7 @@ 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. TEST_SUITE_LOG=zardoz.log $MAKE -e check diff --git a/t/parallel-tests-log-override-2.sh b/t/parallel-tests-log-override-2.sh index eccefccee..e690da9f9 100755 --- a/t/parallel-tests-log-override-2.sh +++ b/t/parallel-tests-log-override-2.sh @@ -18,7 +18,7 @@ # - $(TEST_SUITE_LOG) and $(TESTS) # - $(TEST_SUITE_LOG) and $(TEST_LOGS) -. ./defs || Exit 1 +. ./defs || exit 1 cat >> configure.ac <<'END' AC_OUTPUT @@ -61,7 +61,7 @@ for test_list_override in \ 'TEST_LOGS=pass.log skip.log' do env TEST_SUITE_LOG=partial.log "$test_list_override" \ - $MAKE -e check >stdout || { cat stdout; Exit 1; } + $MAKE -e check >stdout || { cat stdout; exit 1; } cat stdout ls -l count_test_results total=2 pass=1 fail=0 skip=1 xfail=0 xpass=0 error=0 @@ -76,8 +76,8 @@ do grep '^SKIP: skip\.test$' stdout $FGREP 'SKIP: skip' partial.log $FGREP '% skipped test %' partial.log - $EGREP '(pass2|skip2|fail)\.test' stdout && Exit 1 - $EGREP '(pass2|skip2|fail)' partial.log && Exit 1 + $EGREP '(pass2|skip2|fail)\.test' stdout && exit 1 + $EGREP '(pass2|skip2|fail)' partial.log && exit 1 rm -f *.log done diff --git a/t/parallel-tests-log-override-recheck.sh b/t/parallel-tests-log-override-recheck.sh index 5fc39a4d5..493fbfea0 100755 --- a/t/parallel-tests-log-override-recheck.sh +++ b/t/parallel-tests-log-override-recheck.sh @@ -17,7 +17,7 @@ # Check parallel-tests features: runtime redefinition of $(TEST_SUITE_LOG) # for the recheck target. -. ./defs || Exit 1 +. ./defs || exit 1 cat >> configure.ac <<'END' AC_OUTPUT @@ -61,35 +61,35 @@ filter_stdout () } ./configure -$MAKE check >stdout && { cat stdout; Exit 1; } +$MAKE check >stdout && { cat stdout; exit 1; } cat stdout chmod a-rw test-suite.log TEST_SUITE_LOG=my.log $MAKE -e recheck >stdout \ - && { cat stdout; Exit 1; } + && { cat stdout; exit 1; } cat stdout ls -l filter_stdout count_test_results total=2 pass=0 fail=1 skip=0 xfail=0 xpass=0 error=1 for x in stdout my.log; do - $FGREP foofoo $x && Exit 1 + $FGREP foofoo $x && exit 1 $FGREP barbar $x $FGREP bazbaz $x done chmod a-rw my.log BAZ_EXIT_STATUS=0 TEST_SUITE_LOG=my2.log $MAKE -e recheck >stdout \ - && { cat stdout; Exit 1; } + && { cat stdout; exit 1; } cat stdout ls -l count_test_results total=2 pass=1 fail=0 skip=0 xfail=0 xpass=0 error=1 filter_stdout -$FGREP foofoo stdout && Exit 1 +$FGREP foofoo stdout && exit 1 $FGREP barbar stdout $FGREP bazbaz stdout -$FGREP foofoo my2.log && Exit 1 +$FGREP foofoo my2.log && exit 1 $FGREP barbar my2.log -$FGREP bazbaz my2.log && Exit 1 +$FGREP bazbaz my2.log && exit 1 chmod u+r test-suite.log my.log $FGREP bazbaz test-suite.log diff --git a/t/parallel-tests-many.sh b/t/parallel-tests-many.sh index 13eee3474..420a54a20 100755 --- a/t/parallel-tests-many.sh +++ b/t/parallel-tests-many.sh @@ -18,7 +18,7 @@ # 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 @@ env TESTS=$deepdir/$tname-1.test $MAKE -e check \ && 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 e8e203033..fe1036b07 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. -AM_COLOR_TESTS=always $MAKE -e check && Exit 1 +AM_COLOR_TESTS=always $MAKE -e check && 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-spurious-summary.sh b/t/parallel-tests-no-spurious-summary.sh index 6400b3b95..008852924 100755 --- a/t/parallel-tests-no-spurious-summary.sh +++ b/t/parallel-tests-no-spurious-summary.sh @@ -17,7 +17,7 @@ # Check that ':test-results:' directives in test scripts' output doesn't # originate spurious results in the testsuite summary. -. ./defs || Exit 1 +. ./defs || exit 1 cat >> configure.ac << 'END' AC_OUTPUT @@ -55,7 +55,7 @@ cat stdout cat test-suite.log cat foo.log cat bar.log -test $st -eq 0 || Exit $st +test $st -eq 0 || exit $st grep '^:test-result:XFAIL$' foo.log grep '^:test-result: SKIP$' foo.log diff --git a/t/parallel-tests-once.sh b/t/parallel-tests-once.sh index 51912fbd1..67fcbab10 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-recheck-depends-on-all.sh b/t/parallel-tests-recheck-depends-on-all.sh index 9464a360d..df3cdfc8d 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,7 +63,7 @@ $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 @@ -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 9335d61fc..88a98522e 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-subdir.sh b/t/parallel-tests-subdir.sh index 2698a53df..d57133f97 100755 --- a/t/parallel-tests-subdir.sh +++ b/t/parallel-tests-subdir.sh @@ -17,7 +17,7 @@ # Check that the parallel-tests driver 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 28dd34991..4dda0dfda 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 9e9e8432a..b5931b86c 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 e6fd2ade9..dadc87471 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 98591e672..895d4769e 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" @@ -60,7 +60,7 @@ for files in \ $MAKE check rm -f test-suite.log chmod a-r $files - $MAKE test-suite.log || { ls -l; Exit 1; } + $MAKE test-suite.log || { ls -l; exit 1; } ls -l grep '^foofoofoo$' foo.log grep '^:test-result: PASS' foo.trs @@ -68,7 +68,7 @@ for files in \ grep '^:test-result: SKIP' bar.trs grep '^SKIP: bar' test-suite.log grep '^barbarbar$' test-suite.log - $EGREP ':.*foo|foofoofoo' test-suite.log && Exit 1 + $EGREP ':.*foo|foofoofoo' test-suite.log && exit 1 : For shells with busted 'set -e'. done diff --git a/t/parallel-tests.sh b/t/parallel-tests.sh index b152fc53a..f6ebb85a2 100755 --- a/t/parallel-tests.sh +++ b/t/parallel-tests.sh @@ -23,7 +23,7 @@ # - TEST_LOGS redefinition at runtime # - RECHECK_LOGS redefinition at runtime -. ./defs || Exit 1 +. ./defs || exit 1 cat >> configure.ac << 'END' AC_OUTPUT @@ -64,14 +64,14 @@ $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 @@ -87,7 +87,7 @@ test ! -f test-suite.log # Note that this usage has a problem: the summary will only # take bar.log into account, because the $(TEST_SUITE_LOG) rule # does not "see" baz.log. Hmm. -env TESTS='bar.test' $MAKE -e check >stdout && { cat stdout; Exit 1; } +env TESTS='bar.test' $MAKE -e check >stdout && { cat stdout; exit 1; } cat stdout grep '^FAIL: baz\.test$' stdout grep '^ERROR: bar\.test$' stdout @@ -103,49 +103,49 @@ 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. -env RECHECK_LOGS= $MAKE -e check > stdout && { cat stdout; Exit 1; } +env RECHECK_LOGS= $MAKE -e check > 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. -env RECHECK_LOGS= $MAKE -e check > stdout && { cat stdout; Exit 1; } +env RECHECK_LOGS= $MAKE -e check > 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 # Lazily rerunning only foo should only rerun this one test. -env RECHECK_LOGS=foo.log $MAKE -e check > stdout && { cat stdout; Exit 1; } +env RECHECK_LOGS=foo.log $MAKE -e check > stdout && { cat stdout; exit 1; } cat stdout grep 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 $MAKE clean -env TEST_LOGS=baz.log $MAKE -e check > stdout && { cat stdout; Exit 1; } +env TEST_LOGS=baz.log $MAKE -e check > 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 -env TESTS=baz.test $MAKE -e check > stdout && { cat stdout; Exit 1; } +env TESTS=baz.test $MAKE -e check > 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 9746024d7..e8e4203ca 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 a793dec2a..5e28cc0ff 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,7 +77,7 @@ $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 diff --git a/t/parallel-tests3.sh b/t/parallel-tests3.sh index 6a6a9983c..b606276fa 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 bb5a876ab..1a88ddfcd 100755 --- a/t/parallel-tests5.sh +++ b/t/parallel-tests5.sh @@ -21,7 +21,7 @@ # It merely serves as demonstration. :-) required='cc native GNUmake' -. ./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 46b455c0e..4f46cebe6 100755 --- a/t/parallel-tests6.sh +++ b/t/parallel-tests6.sh @@ -19,7 +19,7 @@ # BSD make will expand '$(TESTS:=.log)' to '.log' unless overridden. # See parallel-tests10.test for a similar issue. -. ./defs || Exit 1 +. ./defs || exit 1 cat >> configure.ac << 'END' AC_OUTPUT END @@ -33,10 +33,10 @@ $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 +exit 0 diff --git a/t/parallel-tests8.sh b/t/parallel-tests8.sh index 7363929d3..3e047598a 100755 --- a/t/parallel-tests8.sh +++ b/t/parallel-tests8.sh @@ -24,7 +24,7 @@ # manual for the ugliness in this area, when VPATH comes into # play. :-/ -. ./defs || Exit 1 +. ./defs || exit 1 cat >> configure.ac << 'END' AC_OUTPUT diff --git a/t/parallel-tests9.sh b/t/parallel-tests9.sh index 42d0e2d9c..b22e82d4d 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 diff --git a/t/parse.sh b/t/parse.sh index 20ac2fedc..ec5bcbb9a 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/percent.sh b/t/percent.sh index bdba44ede..a4bad3540 100755 --- a/t/percent.sh +++ b/t/percent.sh @@ -17,7 +17,7 @@ # Test to make sure that -Wportability understands %-style pattern # rules. -. ./defs || Exit 1 +. ./defs || exit 1 cat >>configure.ac <<EOF AC_PROG_CC diff --git a/t/percent2.sh b/t/percent2.sh index 19af61a52..4ed52c1d8 100755 --- a/t/percent2.sh +++ b/t/percent2.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/perf/cond.sh b/t/perf/cond.sh index 7c8261e26..cf9c76081 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 6fd793b02..e3383beda 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 cefef170c..679a05a79 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 7ee11163c..fce2a6be0 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 7a8df81da..74dea56a1 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 e9ce944a0..20516c3e7 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 4c0b8886c..5ee5d4f64 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 102076a6d..206944488 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 fc7a496a0..52e82c51b 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 59c82d855..32c64ea91 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 b8b18a5bd..914e3b789 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]) @@ -53,7 +53,7 @@ grep AM_CPPFLAGS stderr # -Wno-obsolete: echo 'AUTOMAKE_OPTIONS = -Wno-obsolete' >> Makefile.am AUTOMAKE_fails -grep AM_CPPFLAGS stderr && Exit 1 +grep AM_CPPFLAGS stderr && exit 1 # !CHECK should still be mentioned. grep ':.*!CHECK$' stderr diff --git a/t/pluseq6.sh b/t/pluseq6.sh index 2b65e1ac3..2db9c6f10 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 e6e299ce6..c7ea2ad4e 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 724e4d510..da0ad8962 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 981a86899..4bbb78a85 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 82be4e62c..51b791e17 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 7e3cf2f54..b8e69d749 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 f1cc55b36..c9acd411f 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 f3e89a7d7..4b6b1d613 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 54958145c..fdf858e07 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 99642c26a..6e8e56b06 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 79c95e2ee..c9083cbd3 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 ccd61b9b4..d3abfa18b 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/posixsubst-tests.sh b/t/posixsubst-tests.sh index a51176b83..c6318637c 100755 --- a/t/posixsubst-tests.sh +++ b/t/posixsubst-tests.sh @@ -18,7 +18,7 @@ # with the TESTS special variable. # For gen-testsuite-part: ==> try-with-serial-tests <== -. ./defs || Exit 1 +. ./defs || exit 1 cat >> configure.ac << 'END' AC_OUTPUT @@ -54,7 +54,7 @@ $AUTOCONF $AUTOMAKE -a ./configure -$MAKE check >out 2>&1 && { cat out; Exit 1; } +$MAKE check >out 2>&1 && { cat out; exit 1; } cat out ls -l grep '^FAIL: foo1\.test *$' out diff --git a/t/postproc.sh b/t/postproc.sh index 7eaa4f871..2b60d885d 100755 --- a/t/postproc.sh +++ b/t/postproc.sh @@ -18,7 +18,7 @@ # and renamed. required=cc -. ./defs || Exit 1 +. ./defs || exit 1 cat >configure.ac <<END AC_INIT([$me], [1.0]) @@ -43,6 +43,6 @@ cat myMakefile.old >> myMakefile.in ./configure -test -f .deps/fred.Po || test -f _deps/fred.Po || Exit 1 +test -f .deps/fred.Po || test -f _deps/fred.Po || exit 1 : diff --git a/t/ppf77.sh b/t/ppf77.sh index 70266d639..73a32cb61 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 @@ -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 97e28ebc2..a7dcee8db 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 657221d2f..2054fb31e 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 51e3c1723..c4fb9c103 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 @@ -59,6 +59,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 cacdb824a..cb3b2230f 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/pr243.sh b/t/pr243.sh index 01ba6447f..ee593f576 100755 --- a/t/pr243.sh +++ b/t/pr243.sh @@ -27,7 +27,7 @@ # the colon in the CONFIG_FILES variable. required=cc -. ./defs || Exit 1 +. ./defs || exit 1 cat > configure.ac << END AC_INIT([$me], [1.0]) diff --git a/t/pr266.sh b/t/pr266.sh index ac5687894..5d8efada4 100755 --- a/t/pr266.sh +++ b/t/pr266.sh @@ -18,7 +18,7 @@ # Dependency tracking -vs- nonstandard Makefile names required=cc -. ./defs || Exit 1 +. ./defs || exit 1 cat > configure.ac << END AC_INIT([$me], [1.0]) diff --git a/t/pr279-2.sh b/t/pr279-2.sh index 5618d7625..2d5221bc6 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 338313184..f3bc52fce 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 1cd26aebb..62eb739be 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 a676a3a69..d9a5dd1f3 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 1495b0b75..423be7d07 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 @@ -53,28 +53,28 @@ cwd=$(pwd) || fatal_ "getting current working directory" # A rule in the Makefile should create subdir. test ! -d subdir -$MAKE >stdout || { cat stdout; Exit 1; } +$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 7be09110c..b9aa97df4 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 abcff807d..04b4ee934 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 849ee5fc2..20a1d4a68 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 diff --git a/t/pr401b.sh b/t/pr401b.sh index 382d1181e..48228a28f 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 diff --git a/t/pr401c.sh b/t/pr401c.sh index 12afade9d..a606f8446 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 @@ -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 2feaf6df2..3e7f1e6e4 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 @@ -18,7 +18,7 @@ # "make distcheck" fails when two source dirs exist. required=cc -. ./defs || Exit 1 +. ./defs || exit 1 subdirs="foo bar" @@ -60,13 +60,13 @@ $AUTOMAKE -a if test "$line" = ".c.o:"; then read next if test -z "$next"; then - Exit 1 + exit 1 else : # For shells with broken 'set -e'. fi break fi - done) < foo/Makefile.in || Exit 1 + done) < foo/Makefile.in || exit 1 cd build ../configure @@ -23,7 +23,7 @@ # ltconfig, ltmain.sh, mdate-sh, missing, and mkinstalldirs. 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 26c088a0e..907cd788f 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 7b0021abb..5b43157f8 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 e7ea63461..23b56c349 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 407c8738f..dadf38dcd 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 989ca4bad..778d1a1c1 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 e1a8f444f..b107f4dd3 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 f9417d8f3..f355da05d 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 80dab29e2..9905a8cc3 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 0c699422d..9a33ac715 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 4008b4743..afb730049 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 7de6d99bf..89b80250c 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 03617fb14..f2cef307a 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 5fa3bf68f..9e554e25d 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 3a09f45d3..c4c7ce0ee 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 ab3fe7779..4d303d532 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 5dd7e5f5c..89d4ffc69 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 f54ffc756..5c2b56f83 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 9dfe0a70d..13ddc8e80 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 25dd4fe8b..de20b40e2 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([], [:], [:]) diff --git a/t/python-pr10995.sh b/t/python-pr10995.sh index 375b79295..a822ce1e5 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 diff --git a/t/python-vars.sh b/t/python-vars.sh index 97a45c90d..35cd5d700 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 15653a674..90d090e58 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 @@ -181,7 +181,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 0fe5d12d1..a3add40f9 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 cc1fd5f12..5df42a1c7 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 diff --git a/t/python11.sh b/t/python11.sh index aff3c9c7c..e86d30e7f 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 d7b0cc773..898c673dc 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 3b13b33f7..71ba25fd2 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 33c427599..8667cf909 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 4294bb2ef..d084861d5 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 80429f9c6..8e1e03089 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 366c9b133..39190d920 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 245cf4fec..b2bc7dae6 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 93f0c96f2..b3b1421fd 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 f999cb684..dd1174a3c 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 a992aab5f..41f32e58d 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 5a9c16585..0dc04d307 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 e2c521337..9472631ba 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 8f53b6ce3..d940ddf2b 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-all-1.sh b/t/remake-all-1.sh index f1a85bc17..9596ba801 100755 --- a/t/remake-all-1.sh +++ b/t/remake-all-1.sh @@ -17,7 +17,7 @@ # Check that the "all" target triggers rebuilt of outdated Makefiles. # See also sister test 'remake-all-2.test'. -. ./defs || Exit 1 +. ./defs || exit 1 mkfile=Makefile @@ -45,7 +45,7 @@ $EGREP "^all-am:.* $mkfile( |$)" $mkfile.in sub/$mkfile.in $AUTOCONF ./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-all-2.sh b/t/remake-all-2.sh index 930653232..2fad99e79 100755 --- a/t/remake-all-2.sh +++ b/t/remake-all-2.sh @@ -18,7 +18,7 @@ # This handle the case in which the makefiles are not called 'Makefile'. # See also sister test 'remake-all-1.test'. -. ./defs || Exit 1 +. ./defs || exit 1 mkfile=foobar @@ -53,7 +53,7 @@ $EGREP "^all-am:.* $mkfile( |$)" $mkfile.in sub/$mkfile.in $AUTOCONF ./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 c56760842..b3b7c6c74 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 1d048be04..0b5506270 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 3ca850730..868d36e50 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 4bd77d6fc..f754a3794 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 975d50374..312d0f9ba 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 23a02bc18..2fdab58d3 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 97f0c037e..e0c7f0657 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]) diff --git a/t/remake-gnulib-remove-header.sh b/t/remake-gnulib-remove-header.sh index 04f341042..b23534680 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]) diff --git a/t/remake-m4-pr10111.sh b/t/remake-m4-pr10111.sh index 09a2a4c9f..8a28925b6 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 d5a12639f..cd6453bf0 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 diff --git a/t/remake-renamed-am.sh b/t/remake-renamed-am.sh index f1106f48e..e93bc7435 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,7 +44,7 @@ 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 diff --git a/t/remake-renamed-m4-file.sh b/t/remake-renamed-m4-file.sh index 87721f55d..bb82129b8 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 diff --git a/t/remake-renamed-m4-macro-and-file.sh b/t/remake-renamed-m4-macro-and-file.sh index 9f80b31c7..e857d2344 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 diff --git a/t/remake-renamed-m4-macro.sh b/t/remake-renamed-m4-macro.sh index 5ec71d692..281dde257 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 a5053e07c..e9bde45bf 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 116790f46..24d5c4c0a 100755 --- a/t/remake-subdir-gnu.sh +++ b/t/remake-subdir-gnu.sh @@ -21,7 +21,7 @@ # related test 'aclocal5.test' required=GNUmake -. ./defs || Exit 1 +. ./defs || exit 1 magic1='::MagicString::One::' magic2='__MagicString__Two__' @@ -74,7 +74,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 7bbc1d40a..41cc40a6d 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 eb21f382c..5026d1684 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 if using_gmake; then remake=$MAKE @@ -75,7 +75,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-subdir2.sh b/t/remake-subdir2.sh index 0a5665d97..a14a2f1c1 100755 --- a/t/remake-subdir2.sh +++ b/t/remake-subdir2.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__' @@ -76,7 +76,7 @@ cd .. debug_info $FGREP $magic2 sub/build.mk $FGREP $magic2 sub/build.in -$FGREP $magic1 sub/build.in sub/build.mk && Exit 1 -$FGREP $magic2 build.in build.mk && Exit 1 +$FGREP $magic1 sub/build.in sub/build.mk && exit 1 +$FGREP $magic2 build.in build.mk && exit 1 : diff --git a/t/remake.sh b/t/remake.sh index 620d5f8de..b883d2ad5 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 358554f3e..830d6ca2b 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__ @@ -75,7 +75,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 @@ -83,24 +83,24 @@ 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 using_gmake || $remake $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 9eeeb9d53..7aeab7916 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__ @@ -74,7 +74,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 @@ -82,24 +82,24 @@ 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 using_gmake || $remake $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 dfb43f48e..e88c31c27 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__ @@ -77,7 +77,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 @@ -85,15 +85,15 @@ 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 @@ -101,9 +101,9 @@ for vpath in : false; do echo "AC_DEFUN([AM_UNUSED], [NoSuchMacro])" > $top_srcdir/m4/bar.m4 using_gmake || $remake $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 3b97df9c9..8f29499c8 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 73d85d5b8..02cef718e 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__ @@ -108,7 +108,7 @@ else $MAKE zardoz fi $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 @@ -126,10 +126,10 @@ echo "BAZ = $magic3" > bot.in is_gmake || $MAKE zardoz $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 fede0920a..0a900f725 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/=' diff --git a/t/remake2.sh b/t/remake2.sh index 228b14f56..ff88d780a 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 96294fb29..e19d8ea73 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 cac2abcc6..9cbd10553 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 43f856994..10fdf11c7 100755 --- a/t/remake4.sh +++ b/t/remake4.sh @@ -25,7 +25,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 dba802a89..b1e8dd8db 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 if using_gmake; then remake="$MAKE" @@ -65,7 +65,7 @@ grep 'AUTOCONF.*=.*false' Makefile : > rebuild_ok ./configure --no-create $remake -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 b6a3340e9..b6c580ca3 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 " --run " stdout) -eq 1 } diff --git a/t/remake7.sh b/t/remake7.sh index fbd15e66b..9ccf5d1c4 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 1b32a5e93..65fd4bd30 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 diff --git a/t/remake8b.sh b/t/remake8b.sh index 5f687bada..64f135edc 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 diff --git a/t/remake9a.sh b/t/remake9a.sh index 2f4349a1a..3e811b766 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__ @@ -87,7 +87,7 @@ for vpath in : false; do > $srcdir/tweak-configure-in remake_ $FGREP FINGERPRINT Makefile # For debugging. - $FGREP $magic1 Makefile && Exit 1 + $FGREP $magic1 Makefile && exit 1 $FGREP $magic2 Makefile test x"$(./foo.sh)" = x"$magic2" @@ -97,8 +97,8 @@ for vpath in : false; do mv -f t $srcdir/configure.ac using_gmake || remake_ $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 4e0bfdcf3..c90a9820e 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 if using_gmake; then remake_() { $MAKE nil; } @@ -89,7 +89,7 @@ for vpath in : false; do > $srcdir/tweak-makefile-am remake_ $FGREP FINGERPRINT Makefile # For debugging. - $FGREP $magic1 Makefile && Exit 1 + $FGREP $magic1 Makefile && exit 1 $FGREP $magic2 Makefile test x"$(./foo.sh)" = x"$magic2" @@ -99,8 +99,8 @@ for vpath in : false; do mv -f t $srcdir/Makefile.am using_gmake || remake_ $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 5ed7893e7..c39bac1f9 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__ @@ -91,7 +91,7 @@ for vpath in : false; do > $srcdir/tweak-acinclude-m4 remake_ $FGREP FINGERPRINT Makefile # For debugging. - $FGREP $magic1 Makefile && Exit 1 + $FGREP $magic1 Makefile && exit 1 $FGREP $magic2 Makefile test x"$(./foo.sh)" = x"$magic2" @@ -100,8 +100,8 @@ for vpath in : false; do echo "AC_DEFUN([my_fingerprint], [DummyValue])" > $srcdir/acinclude.m4 using_gmake || remake_ $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 5f4892bba..23441ac5d 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__ @@ -91,7 +91,7 @@ for vpath in : false; do > $srcdir/tweak-aclocal-m4 remake_ $FGREP FINGERPRINT Makefile # For debugging. - $FGREP $magic1 Makefile && Exit 1 + $FGREP $magic1 Makefile && exit 1 $FGREP $magic2 Makefile test x"$(./foo.sh)" = x"$magic2" @@ -100,8 +100,8 @@ for vpath in : false; do echo 'AC_DEFUN([my_fingerprint], [DummyValue])' >> $srcdir/aclocal.m4 using_gmake || remake_ $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 8ad576500..53dc6662f 100755 --- a/t/repeated-options.sh +++ b/t/repeated-options.sh @@ -18,7 +18,7 @@ # generate broken or incorrect makefiles. required='cc bzip2' -. ./defs || Exit 1 +. ./defs || exit 1 cat >configure.ac <<END AC_INIT([$me], [1.0]) @@ -61,8 +61,8 @@ END cp "$am_scriptdir"/compile "$am_scriptdir"/test-driver . $ACLOCAL -$AUTOMAKE --foreign --foreign -Wall 2>stderr || { cat stderr >&2; Exit 1; } -test -s stderr && { cat stderr >&2; Exit 1; } +$AUTOMAKE --foreign --foreign -Wall 2>stderr || { cat stderr >&2; exit 1; } +test -s stderr && { cat stderr >&2; exit 1; } rm -f stderr $AUTOCONF @@ -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 @@ -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 a9442a29b..5734fd199 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 5e547a509..a7cbb97e0 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 d4f328c61..09b127261 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 48083586c..996cc9a2f 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 d1bfa23a1..9f0ae1191 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 d379c4380..b2bc7f2d8 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 @@ -91,7 +91,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 @@ -137,7 +137,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 +166,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 23b9dc7cb..cbe0aa58a 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 6a0fbd3c3..96b831a57 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 @@ -39,7 +39,7 @@ do_check () || 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 +48,28 @@ 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 "self-check-dir\.tap" Makefile || Exit 1 - case $(pwd) in '"$cwd"') : ;; *) Exit 1;; esac' + 'test ! -d t/_self.dir || exit 1 + test ! -f t/_self.dir || exit 1 + test ! -r t/_self.dir || exit 1 + grep "self-check-dir\.tap" 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 c6ac98024..4169998a2 100755 --- a/t/self-check-env-sanitize.tap +++ b/t/self-check-env-sanitize.tap @@ -19,7 +19,7 @@ # some testsuite-influential variables are set in the environment. am_create_testdir=no -. ./defs || Exit 1 +. ./defs || exit 1 set -x exec 5>&1 diff --git a/t/self-check-exit.tap b/t/self-check-exit.tap index 0ad5651a1..e78ca0b2f 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. @@ -84,20 +86,20 @@ if $AM_TEST_RUNNER_SHELL -c 'set -e; trap "exit \$?" 0; non-existent-program'; t else maybe_todo="" reason="" fi -$AM_TEST_RUNNER_SHELL -c "$init; non-existent-prog; :" "$dummy_test_script" +$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 : 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 ffab44d81..95ed31329 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 +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 5c0dded07..9077ca846 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 842c411bb..a5f84b311 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 0ac8e20c7..bd75fa9b3 100755 --- a/t/self-check-me.tap +++ b/t/self-check-me.tap @@ -19,7 +19,7 @@ # can be overridden by the test script. am_create_testdir=no -. ./defs || Exit 1 +. ./defs || exit 1 plan_ 14 diff --git a/t/self-check-reexec.tap b/t/self-check-reexec.tap index 3feeb62e1..f46797f84 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 e5998b55c..11211ec4b 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 8162a4ebe..ead4eed70 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 3591656e6..2bd3bc2c5 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 4ec471007..95cee71ed 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 'TEST_SUITE_LOG|TEST_LOGS|\.log.*:' $1 && Exit 1 - grep 'recheck.*:' $1 && Exit 1 + $EGREP 'TEST_SUITE_LOG|TEST_LOGS|\.log.*:' $1 && exit 1 + grep 'recheck.*:' $1 && exit 1 grep '^check-TESTS: \$(TESTS)$' $1 } diff --git a/t/silent-amopts.sh b/t/silent-amopts.sh index f71ad13bb..c7414537b 100755 --- a/t/silent-amopts.sh +++ b/t/silent-amopts.sh @@ -17,7 +17,7 @@ # Check that automake complaints if the 'silent-rules' option is # used in AUTOMAKE_OPTIONS. -. ./defs || Exit 1 +. ./defs || exit 1 echo AUTOMAKE_OPTIONS = silent-rules > Makefile.am diff --git a/t/silent-configsite.sh b/t/silent-configsite.sh index 813753b74..4adc60137 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' AM_SILENT_RULES diff --git a/t/silent-lex.sh b/t/silent-lex.sh index ccc9a8f24..ca2164f76 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 mkdir sub @@ -70,16 +70,16 @@ $AUTOMAKE --add-missing $AUTOCONF # Ensure per-target rules are used, to ensure their coverage below. -$FGREP 'foo2-foo.c' Makefile.in || Exit 99 -$FGREP 'bar2-bar.c' sub/Makefile.in || Exit 99 +$FGREP 'foo2-foo.c' Makefile.in || exit 99 +$FGREP 'bar2-bar.c' sub/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 'LEX .*bar\.' stdout @@ -95,11 +95,11 @@ grep 'CCLD .*bar2' 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 @@ -113,27 +113,27 @@ grep 'CCLD .*bar2' stdout $MAKE clean rm -f *foo.c sub/*bar.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 b418ae9ce..e78081285 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 'CXX .*foo1\.' stdout grep 'CXX .*baz1\.' stdout @@ -76,17 +76,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 diff --git a/t/silent-many-generic.sh b/t/silent-many-generic.sh index 242c8fe07..c30ae3c81 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 'CXX .*foo1\.' stdout grep 'CXX .*baz1\.' stdout @@ -77,17 +77,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 diff --git a/t/silent-nested-vars.sh b/t/silent-nested-vars.sh index c579e2cd7..08ba070ae 100755 --- a/t/silent-nested-vars.sh +++ b/t/silent-nested-vars.sh @@ -17,7 +17,7 @@ # Check silent-rules mode, on 'make' implementations that do not # support nested variables (Bug#9928, Bug#10237). -. ./defs || Exit 1 +. ./defs || exit 1 cat >>configure.ac <<'EOF' AM_SILENT_RULES @@ -96,31 +96,31 @@ a = $(b$(c)) all: touch bar END -$MAKE && Exit 99 +$MAKE && exit 99 mv -f Makefile foo.mk -$MAKE -f foo.mk && Exit 99 -cat foo.mk | $MAKE -f - && Exit 99 -test -f bar && Exit 99 +$MAKE -f foo.mk && exit 99 +cat foo.mk | $MAKE -f - && exit 99 +test -f bar && exit 99 sed '/a =/d' foo.mk > Makefile -$MAKE && test -f bar || Exit 99 +$MAKE && test -f bar || exit 99 rm -f bar Makefile foo.mk $ACLOCAL $AUTOMAKE --add-missing $AUTOCONF -./configure --enable-silent-rules >stdout || { cat stdout; Exit 1; } +./configure --enable-silent-rules >stdout || { cat stdout; exit 1; } cat stdout grep '^checking whether \./mymake supports nested variables\.\.\. no *$' \ stdout $EGREP 'CC|AM_V|GEN' Makefile # For debugging. grep '^AM_V_CC = *\$(am__v_CC_0) *$' Makefile grep '^AM_V_GEN = *\$(am__v_GEN_0) *$' Makefile -$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 -grep 'echo .*oop' stdout && Exit 1 +$EGREP ' (-c|-o)' stdout && exit 1 +grep 'mv ' stdout && exit 1 +grep 'echo .*oop' stdout && exit 1 grep 'CC .*foo\.' stdout grep 'CC .*bar\.' stdout grep 'CCLD .*foo' stdout @@ -128,7 +128,7 @@ grep 'CCLD .*bar' stdout grep 'PKG-GEN .*oop' stdout $MAKE distclean -./configure --disable-silent-rules > stdout || { cat stdout; Exit 1; } +./configure --disable-silent-rules > stdout || { cat stdout; exit 1; } cat stdout grep '^checking whether \./mymake supports nested variables\.\.\. no *$' \ stdout @@ -136,12 +136,12 @@ $EGREP 'CC|AM_V|GEN' Makefile # For debugging. grep '^AM_V_CC = *\$(am__v_CC_1) *$' Makefile grep '^AM_V_GEN = *\$(am__v_GEN_1) *$' Makefile -$MAKE >stdout || { cat stdout; Exit 1; } +$MAKE >stdout || { cat stdout; exit 1; } cat stdout grep ' -c' stdout grep ' -o foo' stdout grep ' -o bar' stdout grep 'echo .*>oop' stdout -$EGREP '(CC|LD) ' stdout && Exit 1 +$EGREP '(CC|LD) ' stdout && exit 1 : diff --git a/t/silent-nowarn.sh b/t/silent-nowarn.sh index 5a547bc13..9eb759d6b 100755 --- a/t/silent-nowarn.sh +++ b/t/silent-nowarn.sh @@ -18,7 +18,7 @@ # make variable expansions. This should happen regardless of whether and # where these warnings are requested. -. ./defs || Exit 1 +. ./defs || exit 1 cat > configure.ac <<END AC_INIT([$me], [1.0]) diff --git a/t/silent-obsolescent-warns.sh b/t/silent-obsolescent-warns.sh index a95f1186e..38d845c91 100755 --- a/t/silent-obsolescent-warns.sh +++ b/t/silent-obsolescent-warns.sh @@ -16,7 +16,7 @@ # Some checks about silent-rules mode and warnings. -. ./defs || Exit 1 +. ./defs || exit 1 cat >>configure.ac <<'EOF' AM_SILENT_RULES diff --git a/t/silent-yacc-headers.sh b/t/silent-yacc-headers.sh index 6a738cb8d..e89fe5af7 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 @@ -61,11 +61,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 @@ -79,11 +79,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 @@ -95,11 +95,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. @@ -110,11 +110,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 @@ -126,7 +126,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 @@ -134,40 +134,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 639b6789d..2a0761b13 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 mkdir sub @@ -67,16 +67,16 @@ $AUTOMAKE --add-missing $AUTOCONF # Ensure per-target rules are used, to ensure their coverage below. -$FGREP 'foo2-foo.c' Makefile.in || Exit 99 -$FGREP 'bar2-bar.c' sub/Makefile.in || Exit 99 +$FGREP 'foo2-foo.c' Makefile.in || exit 99 +$FGREP 'bar2-bar.c' sub/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 'YACC .*bar\.' stdout @@ -92,11 +92,11 @@ grep 'CCLD .*bar2' 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 @@ -110,27 +110,27 @@ grep 'CCLD .*bar2' stdout $MAKE clean rm -f *foo.[ch] sub/*bar.[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 f914c445c..639bef466 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 @@ -60,10 +60,10 @@ $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)' stdout && Exit 1 -grep 'mv ' stdout && Exit 1 +$EGREP ' (-c|-o)' stdout && exit 1 +grep 'mv ' stdout && exit 1 grep 'CC .*foo\.' stdout grep 'CC .*bar\.' stdout grep 'CC .*baz\.' stdout @@ -74,10 +74,10 @@ grep 'CCLD .*baz' stdout grep 'CCLD .*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 -$EGREP '(CC|LD) ' stdout && Exit 1 +$EGREP '(CC|LD) ' stdout && exit 1 : diff --git a/t/silent2.sh b/t/silent2.sh index 6565a2701..550907f7e 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 @@ -61,10 +61,10 @@ $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)' stdout && Exit 1 -grep 'mv ' stdout && Exit 1 +$EGREP ' (-c|-o)' stdout && exit 1 +grep 'mv ' stdout && exit 1 grep 'CC .*foo\.' stdout grep 'CC .*bar\.' stdout grep 'CC .*baz\.' stdout @@ -75,10 +75,10 @@ grep 'CCLD .*baz' stdout grep 'CCLD .*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 -$EGREP '(CC|LD) ' stdout && Exit 1 +$EGREP '(CC|LD) ' stdout && exit 1 : diff --git a/t/silent3.sh b/t/silent3.sh index 564a49001..fe3f28b58 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 @@ -63,10 +63,10 @@ $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)' stdout && Exit 1 -grep 'mv ' stdout && Exit 1 +$EGREP ' (-c|-o)' stdout && exit 1 +grep 'mv ' stdout && exit 1 grep ' CC .*foo\.' stdout grep ' CC .*bar\.' stdout grep ' CC .*baz\.' stdout @@ -77,11 +77,11 @@ grep ' CCLD .*baz' stdout grep ' CCLD .*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 libfoo' 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 44b7eb3a0..10afe75ab 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 @@ -64,10 +64,10 @@ $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)' stdout && Exit 1 -grep 'mv ' stdout && Exit 1 +$EGREP ' (-c|-o)' stdout && exit 1 +grep 'mv ' stdout && exit 1 grep ' CC .*foo\.' stdout grep ' CC .*bar\.' stdout grep ' CC .*baz\.' stdout @@ -78,11 +78,11 @@ grep ' CCLD .*baz' stdout grep ' CCLD .*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 libfoo' 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 1d67a0cd0..3593adf5d 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' AM_SILENT_RULES @@ -69,17 +69,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 02ef287de..898a4423b 100755 --- a/t/silent7.sh +++ b/t/silent7.sh @@ -16,7 +16,7 @@ # Check user extensibility of silent-rules mode. -. ./defs || Exit 1 +. ./defs || exit 1 cat >>configure.ac <<'EOF' AM_SILENT_RULES @@ -42,46 +42,46 @@ $AUTOMAKE --add-missing $AUTOCONF ./configure --disable-silent-rules -$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/silent8.sh b/t/silent8.sh index a2fdb44c1..76bf62c80 100755 --- a/t/silent8.sh +++ b/t/silent8.sh @@ -17,7 +17,7 @@ # Check texinfo rules in silent-rules mode. required='makeinfo-html tex texi2dvi-o dvips' -. ./defs || Exit 1 +. ./defs || exit 1 cat >>configure.ac <<'EOF' AM_SILENT_RULES @@ -44,23 +44,23 @@ $AUTOCONF ./configure --disable-silent-rules # Make sure that all labels work in silent-mode. -$MAKE V=0 dvi html info ps pdf >stdout || { cat stdout; Exit 1; } +$MAKE V=0 dvi html info ps pdf >stdout || { cat stdout; exit 1; } cat stdout -grep 'DVIPS foo.ps' stdout || Exit 1 -grep 'MAKEINFO foo.html' stdout || Exit 1 +grep 'DVIPS foo.ps' stdout || exit 1 +grep 'MAKEINFO foo.html' stdout || exit 1 # NetBSD make will print './foo.info' instead of 'foo.info'. -grep 'MAKEINFO.*foo.info' stdout || Exit 1 -grep 'TEXI2DVI foo.dvi' stdout || Exit 1 -grep 'TEXI2PDF foo.pdf' stdout || Exit 1 +grep 'MAKEINFO.*foo.info' stdout || exit 1 +grep 'TEXI2DVI foo.dvi' stdout || exit 1 +grep 'TEXI2PDF foo.pdf' stdout || exit 1 # Now make sure the labels don't appear in verbose mode. -$MAKE clean || Exit 1 -$MAKE V=1 dvi html info ps pdf >stdout || { cat stdout; Exit 1; } +$MAKE clean || exit 1 +$MAKE V=1 dvi html info ps pdf >stdout || { cat stdout; exit 1; } cat stdout -grep 'DVIPS foo.ps' stdout && Exit 1 -grep 'MAKEINFO foo.html' stdout && Exit 1 -grep 'MAKEINFO.*foo.info' stdout && Exit 1 -grep 'TEXI2DVI foo.dvi' stdout && Exit 1 -grep 'TEXI2PDF foo.pdf' stdout && Exit 1 +grep 'DVIPS foo.ps' stdout && exit 1 +grep 'MAKEINFO foo.html' stdout && exit 1 +grep 'MAKEINFO.*foo.info' stdout && exit 1 +grep 'TEXI2DVI foo.dvi' stdout && exit 1 +grep 'TEXI2PDF foo.pdf' stdout && exit 1 : diff --git a/t/silent9.sh b/t/silent9.sh index 70195a1a8..a8aa393f4 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 @@ -63,10 +63,10 @@ $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)' stdout && Exit 1 -grep 'mv ' stdout && Exit 1 +$EGREP ' (-c|-o)' stdout && exit 1 +grep 'mv ' stdout && exit 1 grep ' CC .*foo\.' stdout grep ' CC .*bar\.' stdout grep ' CC .*baz\.' stdout @@ -77,11 +77,11 @@ grep ' CCLD .*baz' stdout grep ' CCLD .*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 libfoo' 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 d99f1e9cf..462afd7a3 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 @@ -74,11 +74,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\.' stdout grep 'CXX .*baz\.' stdout @@ -92,13 +92,13 @@ 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 ' 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 a41cc2d13..11f834d60 100755 --- a/t/silentcxx.sh +++ b/t/silentcxx.sh @@ -20,7 +20,7 @@ # and forces the use of gcc depmode. required=c++ -. ./defs || Exit 1 +. ./defs || exit 1 mkdir sub @@ -75,11 +75,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\.' stdout grep 'CXX .*baz\.' stdout @@ -93,13 +93,13 @@ 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 ' 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 ce6f6a044..a37a53fc4 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 @@ -59,15 +59,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 .*bar\.' stdout @@ -76,17 +76,17 @@ grep 'F77LD .*bar1' stdout grep 'F77LD .*foo2' 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 8bb06b262..7f6f4bab8 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 @@ -59,15 +59,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 .*bar\.' stdout @@ -76,17 +76,17 @@ grep 'FCLD .*bar1' stdout grep 'FCLD .*foo2' 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/sourcefile-in-subdir.sh b/t/sourcefile-in-subdir.sh index d9b160fa8..831300e90 100755 --- a/t/sourcefile-in-subdir.sh +++ b/t/sourcefile-in-subdir.sh @@ -16,7 +16,7 @@ # Test to make sure subdir source file generates explicit dependency. -. ./defs || Exit 1 +. ./defs || exit 1 cat > Makefile.am << 'END' bin_PROGRAMS = zardoz widdershins diff --git a/t/space.sh b/t/space.sh index c46ade12f..96bf9ba91 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 1486f4c9c..28d576cd4 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/specflg.sh b/t/specflg.sh index 9d5c73ca0..c56c6aa59 100755 --- a/t/specflg.sh +++ b/t/specflg.sh @@ -16,7 +16,7 @@ # Test of flags specific to executable. -. ./defs || Exit 1 +. ./defs || exit 1 cat >> configure.ac << 'END' AC_PROG_CC @@ -40,12 +40,12 @@ grep 'required.*compile' stderr $AUTOMAKE # Look for $(COMPILE) -c in .c.o rule. -grep 'COMPILE. [^-]' Makefile.in && Exit 1 +grep 'COMPILE. [^-]' Makefile.in && exit 1 # Look for foo-foo.o. -grep '[^-]foo\.o' Makefile.in && Exit 1 +grep '[^-]foo\.o' Makefile.in && exit 1 # Regression test for missing space. -$FGREP ')-c' Makefile.in && Exit 1 +$FGREP ')-c' Makefile.in && exit 1 -Exit 0 +exit 0 diff --git a/t/specflg10.sh b/t/specflg10.sh index 3b8fc5be4..4e0fed893 100755 --- a/t/specflg10.sh +++ b/t/specflg10.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/specflg2.sh b/t/specflg2.sh index 9f9569c8d..4560715c1 100755 --- a/t/specflg2.sh +++ b/t/specflg2.sh @@ -16,7 +16,7 @@ # Test library-specific flags. -. ./defs || Exit 1 +. ./defs || exit 1 cat >> configure.ac << 'END' AC_PROG_CC @@ -46,14 +46,14 @@ grep 'required.*compile' stderr $AUTOMAKE # Look for $(COMPILE) -c in .c.o rule. -grep 'COMPILE. [^-]' Makefile.in && Exit 1 +grep 'COMPILE. [^-]' Makefile.in && exit 1 # Look for libfoo_a-foo.o. grep foo Makefile.in -grep '[^-]foo\.o' Makefile.in && Exit 1 +grep '[^-]foo\.o' Makefile.in && exit 1 # Look for libfoo_a-bar.o. grep bar Makefile.in -grep '[^-]bar\.o' Makefile.in && Exit 1 +grep '[^-]bar\.o' Makefile.in && exit 1 -Exit 0 +exit 0 diff --git a/t/specflg3.sh b/t/specflg3.sh index 9e7887264..9c56acaf5 100755 --- a/t/specflg3.sh +++ b/t/specflg3.sh @@ -16,7 +16,7 @@ # Test exe-specific flags with dependency tracking. -. ./defs || Exit 1 +. ./defs || exit 1 cat >> configure.ac << 'END' AC_PROG_CC @@ -36,8 +36,8 @@ $ACLOCAL $AUTOMAKE $FGREP ' -o foo-foo' Makefile.in -$FGREP 'foo.o.o' Makefile.in && Exit 1 -$FGREP 'foo.$(OBJEXT).$(OBJEXT)' Makefile.in && Exit 1 +$FGREP 'foo.o.o' Makefile.in && exit 1 +$FGREP 'foo.$(OBJEXT).$(OBJEXT)' Makefile.in && exit 1 $FGREP '$(foo_CFLAGS)' Makefile.in : diff --git a/t/specflg6.sh b/t/specflg6.sh index 5566ae31b..958e887bf 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 8caf93018..7261d1891 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 d0c198f04..598970ada 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 96e7a2e22..c8cde9e0f 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 a2b475278..18abba245 100755 --- a/t/spell.sh +++ b/t/spell.sh @@ -16,7 +16,7 @@ # Test to make sure misspellings in _SOURCES variables cause failure. -. ./defs || Exit 1 +. ./defs || exit 1 cat > Makefile.am << 'END' bin_PROGRAMS = zardoz foo diff --git a/t/spell2.sh b/t/spell2.sh index a4b0a4605..c468b2b06 100755 --- a/t/spell2.sh +++ b/t/spell2.sh @@ -16,7 +16,7 @@ # Test to make sure misspellings in _SOURCES variables cause failure. -. ./defs || Exit 1 +. ./defs || exit 1 echo AC_PROG_CC >> configure.ac diff --git a/t/spell3.sh b/t/spell3.sh index a96fa036f..c12703b9c 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 fb68f3103..f6f99eb66 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-rm.tap b/t/spy-rm.tap index af7ba2a5e..f279745e8 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 @@ -67,7 +67,7 @@ # So it seems only non-overlapping ::-rule may be portable. This is # what we check now. -. ./defs || Exit 1 +. ./defs || exit 1 cat >Makefile <<\EOF a :: b diff --git a/t/src-acsubst.sh b/t/src-acsubst.sh index 97d536c89..13531ac0a 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 59a373a35..c6663914b 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 AM_CONFIG_HEADER([1.h diff --git a/t/stdinc.sh b/t/stdinc.sh index ec9948391..d030e64c4 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 d2268d209..b3f458a90 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 ce5158f70..6cce9162d 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 8c365f0a0..27e44dd17 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 6f5a143da..ab70ee3fd 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 abc2c86aa..6170627dc 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 9c43496f7..2397545d4 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 897901610..543449dba 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 0ef238bf1..48b4b0dbe 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 a74c746d0..2a9049cec 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 ee9e0b0d5..a4dca9030 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 7f5e34a62..7ad605957 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 1b5fceaee..4eba4f894 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 459f6395a..f933f77db 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 191c01836..74dac71da 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]) diff --git a/t/subdir-order.sh b/t/subdir-order.sh index 0321c25c6..7a84b34bf 100644 --- 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([ @@ -140,7 +140,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 15f2f933a..b8389ddd7 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 eb9f4fe65..661f8fed9 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]) diff --git a/t/subdir.sh b/t/subdir.sh index 34b6ece88..249481aa3 100755 --- a/t/subdir.sh +++ b/t/subdir.sh @@ -17,7 +17,7 @@ # Test to make sure install-sh and mkinstalldirs correctly found in # subdirs. -. ./defs || Exit 1 +. ./defs || exit 1 mkdir zot diff --git a/t/subdir10.sh b/t/subdir10.sh index 4ba791ad8..396aecc24 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/subdirbuiltsources.sh b/t/subdirbuiltsources.sh index 2f507083e..84f65a680 100755 --- a/t/subdirbuiltsources.sh +++ b/t/subdirbuiltsources.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/subobj-clean-lt-pr10697.sh b/t/subobj-clean-lt-pr10697.sh index 4d8b18cf7..4ac463070 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 @@ -120,7 +120,7 @@ for i in 1 2; 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 -f sub$i/$j.c || exit 99 # Sanity check done done diff --git a/t/subobj-clean-pr10697.sh b/t/subobj-clean-pr10697.sh index a545658f7..ff419d201 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 @@ -115,7 +115,7 @@ 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 -f sub$i/$j.c || exit 99 # Sanity check done done diff --git a/t/subobj.sh b/t/subobj.sh index b7f6597d4..7ac839b6a 100755 --- a/t/subobj.sh +++ b/t/subobj.sh @@ -16,7 +16,7 @@ # Test of subdir objects with C. -. ./defs || Exit 1 +. ./defs || exit 1 cat >> configure.ac << 'END' AC_PROG_CC @@ -30,14 +30,14 @@ wish_SOURCES = generic/a.c generic/b.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 compile is installed, and that Automake says so. grep 'install.*compile' stderr test -f compile grep '^generic/a\.\$(OBJEXT):' Makefile.in -grep '[^/]a\.\$(OBJEXT)' Makefile.in && Exit 1 +grep '[^/]a\.\$(OBJEXT)' Makefile.in && exit 1 # Opportunistically test for a different bug. grep '^generic/b\.\$(OBJEXT):.*dirstamp' Makefile.in diff --git a/t/subobj10.sh b/t/subobj10.sh index db6bf7267..cefb0ab06 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 AC_INIT([$me], [1.0]) diff --git a/t/subobj11a.sh b/t/subobj11a.sh index aeb4fa957..474ed82fc 100755 --- a/t/subobj11a.sh +++ b/t/subobj11a.sh @@ -27,7 +27,7 @@ # 'subobj11c.test'. required=cc -. ./defs || Exit 1 +. ./defs || exit 1 cat >> configure.ac << 'END' AC_PROG_CC @@ -62,7 +62,7 @@ if test x"$depdir" != x; then depdir=src/$depdir else echo "$me: cannot extract value of DEPDIR from Makefile" >&2 - Exit 1 + exit 1 fi ls -l "$depdir" diff --git a/t/subobj11b.sh b/t/subobj11b.sh index eef884f02..b1495b08b 100755 --- a/t/subobj11b.sh +++ b/t/subobj11b.sh @@ -26,7 +26,7 @@ # See also "semantic" sister test 'subobj11a.test', and related test # 'subobj11c.test'. -. ./defs || Exit 1 +. ./defs || exit 1 cat >> configure.ac << 'END' AC_PROG_CC @@ -61,7 +61,7 @@ $AUTOMAKE -a # Be lax in the regexp, to account for automake conditionals, the # use of @am__include@, and similar stuff. -grep 'include.*//.*foobar' Makefile.in && Exit 1 +grep 'include.*//.*foobar' Makefile.in && exit 1 # These checks depend on automake internals, but presently this is # the only way to test the code path we are interested in. diff --git a/t/subobj11c.sh b/t/subobj11c.sh index 9f59c5f6c..0b47c2eb9 100755 --- a/t/subobj11c.sh +++ b/t/subobj11c.sh @@ -19,7 +19,7 @@ # included makefile fragments (containing dependency info). # See also related tests 'subobj11a.test' and 'subobj11b.test'. -. ./defs || Exit 1 +. ./defs || exit 1 cat >> configure.ac << 'END' AC_PROG_CC diff --git a/t/subobj2.sh b/t/subobj2.sh index 3a3f86192..646c6cf2c 100755 --- a/t/subobj2.sh +++ b/t/subobj2.sh @@ -16,7 +16,7 @@ # Test of subdir objects with C++. -. ./defs || Exit 1 +. ./defs || exit 1 cat >> configure.ac << 'END' AC_PROG_CXX @@ -32,7 +32,7 @@ $ACLOCAL $AUTOMAKE $FGREP 'generic/a.$(OBJEXT)' Makefile.in -grep '[^/]a\.\$(OBJEXT)' Makefile.in && Exit 1 +grep '[^/]a\.\$(OBJEXT)' Makefile.in && exit 1 grep '.*-c -o' Makefile.in : diff --git a/t/subobj4.sh b/t/subobj4.sh index 975f8fbb8..4399eefc0 100755 --- a/t/subobj4.sh +++ b/t/subobj4.sh @@ -17,7 +17,7 @@ # Make sure '../foo/foo.cpp' generates a rule. # Report from Dave Brolley. -. ./defs || Exit 1 +. ./defs || exit 1 cat >> configure.ac << 'END' AC_PROG_CC diff --git a/t/subobj5.sh b/t/subobj5.sh index 3b05b6a74..6736cb1b9 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/subobj6.sh b/t/subobj6.sh index 2f902f20a..cf265f761 100755 --- a/t/subobj6.sh +++ b/t/subobj6.sh @@ -18,7 +18,7 @@ # From Robert Collins. required=cc -. ./defs || Exit 1 +. ./defs || exit 1 cat >> configure.ac << 'END' AM_PROG_CC_C_O diff --git a/t/subobj7.sh b/t/subobj7.sh index 863cae031..1ce58aeca 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 35b566f50..58b1e41f3 100755 --- a/t/subobj8.sh +++ b/t/subobj8.sh @@ -16,7 +16,7 @@ # Make sure 'compile' is included when subdir-objects is used in a subdir. -. ./defs || Exit 1 +. ./defs || exit 1 cat > configure.ac << END AC_INIT([$me], [1.0]) diff --git a/t/subobj9.sh b/t/subobj9.sh index 6964a80cc..2d8f8fbe2 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_INIT([$me], [1.0]) @@ -73,17 +73,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 9d3b63de3..7601664d5 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 f1b2ac31c..3d107cfb8 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_PROG_CC diff --git a/t/subpkg.sh b/t/subpkg.sh index 82bf33818..72fcb0ac7 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 diff --git a/t/subpkg2.sh b/t/subpkg2.sh index af89fc173..8afcc5af9 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 38dc455b9..6ebc4bd23 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 f8e9a2c49..97f452c61 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-no-trailing-empty-line.sh b/t/subst-no-trailing-empty-line.sh index aed52bcd7..388f29732 100755 --- a/t/subst-no-trailing-empty-line.sh +++ b/t/subst-no-trailing-empty-line.sh @@ -21,7 +21,7 @@ # These checks have been introduced in commit 'Release-1-9-254-g9d0eaef' # into the former test 'subst2.test'. -. ./defs || Exit 1 +. ./defs || exit 1 # These are deliberately quite long, so that the xxx_PROGRAMS definition # in Makefile.am below will be split on multiple lines, with the last @@ -80,15 +80,15 @@ test $($EGREP -c "^[ $tab]*@$v2@ @$v3@[ $tab]*$bs?$" Makefile.in) -eq 3 sed -n '/^am__EXEEXT.*=/,/[^\\]$/p' Makefile } >t-programs cat t-programs -grep '^ *$' t-programs && Exit 1 +grep '^ *$' t-programs && exit 1 -$MAKE print-programs >stdout || { cat stdout; Exit 1; } +$MAKE print-programs >stdout || { cat stdout; exit 1; } cat stdout grep '^BEG1: x :END1$' stdout grep '^BEG2: :END2$' stdout grep '^BEG3: zardoz x :END3$' stdout -am__empty=X $MAKE -e print-programs >stdout || { cat stdout; Exit 1; } +am__empty=X $MAKE -e print-programs >stdout || { cat stdout; exit 1; } cat stdout grep '^BEG1: x X :END1$' stdout grep '^BEG2: X :END2$' stdout diff --git a/t/subst.sh b/t/subst.sh index f46f2ed9a..db83d7334 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 f20133614..8ee3324f3 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 ab3631e14..739b3689c 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 2fef1b9d5..f44b8516a 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 a205c085d..06fcdf1dc 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 7183a9146..4ea39e602 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. DIST_SOURCES should contain $(helldl_SOURCES). -grep am__helldl_SOURCES_DIST Makefile && Exit 1 +grep am__helldl_SOURCES_DIST Makefile && exit 1 grep 'DIST_SOURCES.*\$(helldl_SOURCES)' Makefile : diff --git a/t/substtarg.sh b/t/substtarg.sh index 5fd4f826a..757885c14 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.tap b/t/suffix-chain.tap index 604e8a9c2..535e36e86 100755 --- a/t/suffix-chain.tap +++ b/t/suffix-chain.tap @@ -19,7 +19,7 @@ # See automake bug#7824 and bug#7670. required=cc -. ./defs || Exit 1 +. ./defs || exit 1 plan_ 8 diff --git a/t/suffix.sh b/t/suffix.sh index 899118de0..28191b7ca 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.tap b/t/suffix10.tap index 72d0accb8..a65092415 100755 --- a/t/suffix10.tap +++ b/t/suffix10.tap @@ -18,7 +18,7 @@ # (related to PR/37) required='cc libtoolize yacc' -. ./defs || Exit 1 +. ./defs || exit 1 plan_ 7 diff --git a/t/suffix11.tap b/t/suffix11.tap index d365fbcc7..26694ebdc 100755 --- a/t/suffix11.tap +++ b/t/suffix11.tap @@ -19,7 +19,7 @@ # We also check for suffixes containing '-'. required=cc -. ./defs || Exit 1 +. ./defs || exit 1 plan_ 10 diff --git a/t/suffix12.sh b/t/suffix12.sh index 5882df7d6..22ec98520 100755 --- a/t/suffix12.sh +++ b/t/suffix12.sh @@ -18,7 +18,7 @@ # Reported by John Ratliff. required=cc -. ./defs || Exit 1 +. ./defs || exit 1 cat >>configure.ac <<EOF AC_PROG_CC diff --git a/t/suffix13.sh b/t/suffix13.sh index 60222052a..bcdbc9a0b 100755 --- a/t/suffix13.sh +++ b/t/suffix13.sh @@ -19,7 +19,7 @@ # 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 5bf24d3b1..8ac0431c0 100755 --- a/t/suffix2.sh +++ b/t/suffix2.sh @@ -19,7 +19,7 @@ # See also related test 'suffix.test'. required=libtoolize -. ./defs || Exit 1 +. ./defs || exit 1 cat >> configure.ac << 'END' AC_PROG_CC diff --git a/t/suffix3.tap b/t/suffix3.tap index 168c84264..2498ae1b5 100755 --- a/t/suffix3.tap +++ b/t/suffix3.tap @@ -17,7 +17,7 @@ # Test to make sure that suffix rules chain. required=c++ -. ./defs || Exit 1 +. ./defs || exit 1 plan_ 10 diff --git a/t/suffix4.sh b/t/suffix4.sh index 4523096a2..2defd0884 100755 --- a/t/suffix4.sh +++ b/t/suffix4.sh @@ -20,7 +20,7 @@ # Also make sure that .SUFFIXES is automatically adjusted with # extensions from implicit rules. -. ./defs || Exit 1 +. ./defs || exit 1 cat > Makefile.am << 'END' .k.o: diff --git a/t/suffix5.sh b/t/suffix5.sh index 8608a86b5..fec51e929 100755 --- a/t/suffix5.sh +++ b/t/suffix5.sh @@ -19,7 +19,7 @@ # Based on a report from Arkadiusz Miskiewicz <misiek@pld.ORG.PL>. required='cc libtool' -. ./defs || Exit 1 +. ./defs || exit 1 cat >> configure.ac << 'END' AC_SUBST([LINK], [:]) diff --git a/t/suffix6.sh b/t/suffix6.sh index 29ffc4d40..4ca09f497 100755 --- a/t/suffix6.sh +++ b/t/suffix6.sh @@ -19,7 +19,7 @@ # '.$(OBJEXT)'. See also related "semantic" tests suffix6b.test # and suffix6c.test. -. ./defs || Exit 1 +. ./defs || exit 1 cat > Makefile.am << 'END' SUFFIXES = a b .$(OBJEXT) c .o .obj diff --git a/t/suffix6b.sh b/t/suffix6b.sh index 319e02179..bb11cdfea 100755 --- a/t/suffix6b.sh +++ b/t/suffix6b.sh @@ -18,7 +18,7 @@ # extensions. Se also related "grepping" test suffix6.test. required=GNUmake # Other makes might not grok dot-less suffix rules. -. ./defs || Exit 1 +. ./defs || exit 1 cat >> configure.ac << 'END' # $(LINK) is not defined automatically by Automake, since the *_SOURCES diff --git a/t/suffix6c.sh b/t/suffix6c.sh index 80f3bf019..7500543d1 100755 --- a/t/suffix6c.sh +++ b/t/suffix6c.sh @@ -17,7 +17,7 @@ # Test to make sure that '.o' and '.obj' are handled like '.$(OBJEXT)'. # See also related "grepping" test suffix6.test. -. ./defs || Exit 1 +. ./defs || exit 1 cat >> configure.ac << 'END' # $(LINK) is not defined automatically by Automake, since the *_SOURCES diff --git a/t/suffix7.sh b/t/suffix7.sh index bef1031d2..30a18c0d7 100755 --- a/t/suffix7.sh +++ b/t/suffix7.sh @@ -17,7 +17,7 @@ # Test to make sure Automake supports implicit rules "confusing" # extensions. Inspired by a mail from Alex Hornby. -. ./defs || Exit 1 +. ./defs || exit 1 cat > Makefile.am << 'END' SUFFIXES = .idl S.cpp C.h @@ -31,7 +31,7 @@ $AUTOMAKE # Make sure Automake has NOT recognized .cpp and .idlC as two new # extensions. -grep 'SUFFIXES.* \.cpp' Makefile.in && Exit 1 -grep 'SUFFIXES.* \.idlC' Makefile.in && Exit 1 +grep 'SUFFIXES.* \.cpp' Makefile.in && exit 1 +grep 'SUFFIXES.* \.idlC' Makefile.in && exit 1 : diff --git a/t/suffix8.tap b/t/suffix8.tap index 288dd99df..fdaf08714 100755 --- a/t/suffix8.tap +++ b/t/suffix8.tap @@ -19,7 +19,7 @@ # From PR/37. required='cc libtoolize' -. ./defs || Exit 1 +. ./defs || exit 1 plan_ 10 diff --git a/t/suffix9.sh b/t/suffix9.sh index 2c1d73dde..a0135daba 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 b57f02a43..ad7de70c0 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 46e26db9c..930b1072f 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" diff --git a/t/syntax.sh b/t/syntax.sh index 5b51a7a60..e2404ba6f 100755 --- a/t/syntax.sh +++ b/t/syntax.sh @@ -16,7 +16,7 @@ # Test for error for bad syntax. -. ./defs || Exit 1 +. ./defs || exit 1 cat > Makefile.am << 'END' foo = q \ @@ -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 7d4ee6440..521d2ef2b 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 5915d46c0..9b3fe4724 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]) diff --git a/t/tap-ambiguous-directive.sh b/t/tap-ambiguous-directive.sh index 75a259cbe..74f258fb7 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 8771ddf33..abc4ec8c0 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 -TESTS=all.test $MAKE -e check >stdout && { cat stdout; Exit 1; } +TESTS=all.test $MAKE -e check >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 82cf4e42f..09b2c7429 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 e8e3756d8..5b49c33cf 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 bd0d1fccb..d0d3096a4 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" @@ -51,7 +51,7 @@ ERROR: c.test - Bail out! FUBAR! END TESTS='a.test b.test c.test' $MAKE -e 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 diff --git a/t/tap-bailout-suppress-badexit.sh b/t/tap-bailout-suppress-badexit.sh index c7e55db0a..c83ba8a81 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 bff4d64cc..69ac88f59 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 bbdd54218..cd9aa146b 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 TESTS='foo.test bar.test baz.test' $MAKE -e 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 317eaa234..91dfd2442 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' TESTS='a.test b.test c.test d.test e.test' $MAKE -e 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 2e12e6ec0..b3b79de89 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 @@ -80,7 +80,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 @@ -127,7 +127,7 @@ Bail out! ok 1 END -TESTS=bail.test $MAKE -e check >stdout && { cat stdout; Exit 1; } +TESTS=bail.test $MAKE -e 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 @@ -137,16 +137,16 @@ 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 TEST_LOGS from the command line, making it point to a test # (ok.test) that has to be generated at make time. rm -f *.log *.test -TEST_LOGS=ok.log $MAKE -e check >stdout || { cat stdout; Exit 1; } +TEST_LOGS=ok.log $MAKE -e 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 @@ -157,7 +157,7 @@ test ! -f success.log test ! -f 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 5a8e1bc37..2fa45d184 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" @@ -142,10 +142,10 @@ test_no_color () cat stdout | grep '====' cat stdout | grep '[Ss]ee .*test-suite\.log' cat stdout | grep '[Tt]estsuite summary' - ) | grep "$esc" && Exit 1 + ) | grep "$esc" && exit 1 : For shells with broken 'set -e' else - cat stdout | grep "$esc" && Exit 1 + cat stdout | grep "$esc" && exit 1 : For shells with broken 'set -e' fi } @@ -153,12 +153,12 @@ test_no_color () # 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; } + && { cat stdout; exit 1; } cat stdout test_color TERM=ansi $MAKE -e check >stdout \ - && { cat stdout; Exit 1; } + && { cat stdout; exit 1; } cat stdout test_no_color diff --git a/t/tap-common-setup.sh b/t/tap-common-setup.sh index 8400da04b..6bf168e1a 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 cat >> configure.ac << END AC_OUTPUT diff --git a/t/tap-deps.sh b/t/tap-deps.sh index 6ebe0f916..ee76e938f 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 inversed 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 fc2d36acf..7c29aa9cc 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 ./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 e23d96b89..10b4f5b01 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 -i "#.*all\\.test|a comment|(Tests|Shell) " stdout && Exit 1 +$EGREP -i "#.*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 TEST_LOG_DRIVER_FLAGS="--no-comments" $MAKE -e check >stdout \ - || { cat stdout; Exit 1; } + || { cat stdout; exit 1; } cat stdout -$EGREP -i "#.*all\\.test|a comment|(Tests|Shell) " stdout && Exit 1 +$EGREP -i "#.*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 22d542f59..69c56f00c 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 0607112d3..f874ff853 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) \ @@ -73,7 +73,7 @@ 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" @@ -83,7 +83,7 @@ case $MAKE in *\ -j*) skip_ "can't work easily with concurrent make";; esac # Prevent Sun Distributed Make from trying to run in parallel. DMAKE_MODE=serial; export DMAKE_MODE -$MAKE check >stdout && { cat stdout; Exit 1; } +$MAKE check >stdout && { cat stdout; exit 1; } cat stdout cat > exp <<'END' @@ -109,7 +109,7 @@ grep '^Please report to bug-automake@gnu\.org$' stdout env \ TESTS='foo.test baz.test' \ TEST_LOG_DRIVER_FLAGS='--comments --ignore-exit' \ - $MAKE -e check >stdout || { cat stdout; Exit 1; } + $MAKE -e check >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 bb54ebf1f..b1d9227bf 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 e3f1e155a..c92a152aa 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 bad40edb1..976656d25 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 1c72f7969..30806635d 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 6067af283..2fb1ad9fb 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 27179760f..09493841f 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 e17cc78a9..f879cceab 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 4bf014f8a..88ef41209 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 8267a3d14..85db2cb34 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 TESTS="$(echo *.test)" $MAKE -e 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 6d7a4dd27..ba232c3b3 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. -TESTS="$tests" $MAKE -e check >stdout && { cat stdout; Exit 1; } +TESTS="$tests" $MAKE -e 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 -TESTS="$tests" $MAKE -e test-suite.log && Exit 1 +TESTS="$tests" $MAKE -e test-suite.log && exit 1 cat test-suite.log have_rst_section () diff --git a/t/tap-log.sh b/t/tap-log.sh index 92d63ec01..4a4f7e6bf 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,7 +85,7 @@ END chmod a+x *.test -TEST_SUITE_LOG=my.log $MAKE -e check && Exit 1 +TEST_SUITE_LOG=my.log $MAKE -e check && exit 1 ls -l # For debugging. test ! -f test-suite.log test ! -f global.log @@ -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 @@ -132,7 +132,7 @@ 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 @@ -141,7 +141,7 @@ test ! -f test-suite.log # 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 diff --git a/t/tap-merge-stdout-stderr.sh b/t/tap-merge-stdout-stderr.sh index bca96a24c..1fe4b8563 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'. TEST_LOG_DRIVER_FLAGS=--no-merge $MAKE -e check >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 31a702c3b..ddd74c8a7 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 baa7e2807..b25ffce87 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 @@ -122,7 +122,7 @@ for try in 0 1; do # 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; } + $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 @@ -147,7 +147,7 @@ for try in 0 1; do # 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; } + $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 b34e3c18d..bb06248a7 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 ./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 b9ef141c7..cf8918c74 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 -TESTS='a.test b.test' $MAKE -e check >stdout && { cat stdout; Exit 1; } +TESTS='a.test b.test' $MAKE -e 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 cbd2fcee1..9859e7290 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 06f400b78..166b78534 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 7f435e929..7602affb1 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 -TESTS='a.test b.test' $MAKE -e check >stdout || { cat stdout; Exit 1; } +TESTS='a.test b.test' $MAKE -e 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 a2cc0a58d..a1174bcde 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 11661a19b..765442a5e 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 5fa587d16..e9a109151 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 eb6b0807a..e82b26b99 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 0c07510a7..3f994980f 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-summary.sh b/t/tap-no-spurious-summary.sh index a6437d81d..85e1bbaa2 100755 --- a/t/tap-no-spurious-summary.sh +++ b/t/tap-no-spurious-summary.sh @@ -18,7 +18,7 @@ # - ':test-results:' directives in test scripts' output doesn't # originate spurious results in the testsuite summary -. ./defs || Exit 1 +. ./defs || exit 1 . "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh" @@ -34,7 +34,7 @@ cat > all.test <<'END' ok 1 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-no-spurious.sh b/t/tap-no-spurious.sh index ea2993d43..ebb58cf87 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 f52127ce2..f73bb0395 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 bd1bf8d78..219a15918 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 bbd0d0ece..fd1c3b62d 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 cd220a7d5..60292a76c 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 20bba0a59..e884a1e07 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 TESTS='a.test b.test c.test d.test' $MAKE -e 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 6014cc56c..7b800d5bc 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 env TEST_LOG_DRIVER_FLAGS='--ignore-exit' $MAKE -e check -$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 aa9fe5387..993e750e8 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=\''"\$@!&()[]<>#;,:.^?*/' @@ -46,7 +46,7 @@ ok # SKIP who cares? $weirdchars END -TESTS=ok.test $MAKE -e check || { cat ok.log; Exit 1; } +TESTS=ok.test $MAKE -e 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 601d5b745..86ba401e8 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 TESTS="$pos-repeated.test" $MAKE -e 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 env TESTS="leading-repeated.test trailing-repeated.test" \ - $MAKE -e check >stdout && { cat stdout; Exit 1; } + $MAKE -e check >stdout && { 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 env TESTS="1.test 2.test 3.test 4.test" \ - $MAKE -e check >stdout && { cat stdout; Exit 1; } + $MAKE -e check >stdout && { 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 -e check >stdout && { cat stdout; Exit 1; } +$MAKE -e 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 -e check >stdout && { cat stdout; Exit 1; } +$MAKE -e 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 -e check >stdout && { cat stdout; Exit 1; } +$MAKE -e 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 e0f6272e3..21fd01312 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 949c25104..84047a664 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 env TESTS='a.test b.test c.test d.test e.test f.test' \ - $MAKE -e check >stdout || { cat stdout; Exit 1; } + $MAKE -e check >stdout || { 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 99fd8c583..68a0f474f 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) -TESTS="$tests_list" $MAKE -e check >stdout && { cat stdout; Exit 1; } +TESTS="$tests_list" $MAKE -e 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 3a63821cf..77f16a74a 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 env TEST_LOG_DRIVER_FLAGS="$tap_flags" TESTS="$tests" \ - $MAKE -e check >stdout || { cat stdout; Exit 1; } + $MAKE -e check >stdout || { 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 a117fe02b..106cad078 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 -TESTS='foo.test bar.test' $MAKE -e check >stdout || { cat stdout; Exit 1; } +TESTS='foo.test bar.test' $MAKE -e 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 185658d7d..40fc8c30d 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 env TEST_LOG_DRIVER_FLAGS="$tap_flags" TESTS='top.test bot.test' \ - $MAKE -e check >stdout || { cat stdout; Exit 1; } + $MAKE -e 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 cd646238c..7c1e017b9 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 TESTS='foo.test foo2.test bar.test' $MAKE -e 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 58ce0e7f6..1b208648f 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 351aaba7e..255443d7b 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 f53534c48..a67712b8d 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 -TESTS="$(echo *.test)" $MAKE -e check >stdout || { cat stdout; Exit 1; } +TESTS="$(echo *.test)" $MAKE -e 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 52917d53c..af337336a 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 -TESTS='foo.test bar.test' $MAKE -e check >stdout || { cat stdout; Exit 1; } +TESTS='foo.test bar.test' $MAKE -e 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 f216f88a3..3a403c729 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 ead8613e3..2ce46863c 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 -TESTS='foo.test bar.test' $MAKE -e check >stdout && { cat stdout; Exit 1; } +TESTS='foo.test bar.test' $MAKE -e 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 cfb1c609f..01e5895fb 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 4640ee57d..d9c54963e 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 TESTS='foo.test bar.test baz.test' $MAKE -e 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 2c1d9debc..9e6704b28 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 env TESTS='foo.test bar.test baz.test wget.test curl.test mu.test' \ - $MAKE -e check >stdout || { cat stdout; Exit 1; } + $MAKE -e 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 2cad91ca1..ecd3bef44 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-logs.sh b/t/tap-recheck-logs.sh index 7fb2b807f..e774f7310 100755 --- a/t/tap-recheck-logs.sh +++ b/t/tap-recheck-logs.sh @@ -17,7 +17,7 @@ # TAP support: # - RECHECK_LOGS -. ./defs || Exit 1 +. ./defs || exit 1 cat > Makefile.am << 'END' TEST_LOG_COMPILER = cat @@ -58,21 +58,21 @@ grep_summary () grep '^# ERROR: *1$' stdout } -$MAKE -e check && Exit 1 +$MAKE -e check && exit 1 test -f foo.log test -f bar.log test -f baz.log rm -f foo.log bar.log -env RECHECK_LOGS= $MAKE -e check > stdout && { cat stdout; Exit 1; } +env RECHECK_LOGS= $MAKE -e 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 @@ -80,38 +80,38 @@ 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. -env RECHECK_LOGS= $MAKE -e check > stdout && { cat stdout; Exit 1; } +env RECHECK_LOGS= $MAKE -e 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 -env RECHECK_LOGS= $MAKE -e check > stdout && { cat stdout; Exit 1; } +env RECHECK_LOGS= $MAKE -e 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. -env RECHECK_LOGS= $MAKE -e check > stdout && { cat stdout; Exit 1; } +env RECHECK_LOGS= $MAKE -e 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 # The following should re-run foo.test (and only foo.test), even if its # log file is up-to-date. : > older -env RECHECK_LOGS=foo.log $MAKE -e check > stdout && { cat stdout; Exit 1; } +env RECHECK_LOGS=foo.log $MAKE -e 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 older grep_summary diff --git a/t/tap-recheck.sh b/t/tap-recheck.sh index 98a960e5b..58118c422 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 @@ -90,7 +90,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 } @@ -119,7 +119,7 @@ for vpath in : false; do 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. diff --git a/t/tap-result-comment.sh b/t/tap-result-comment.sh index 21bc81030..42907518e 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 fce48bf69..1dfc52df2 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 8faa9c0ee..c085da0c9 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 TESTS='a.test b.test c.test d.test e.test' $MAKE -e 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 31580ca6e..b54013a32 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 d36aa1364..b9c882589 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 62206ab38..81a8128ef 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 dce485c99..e00e4b89a 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 -XFAIL_TESTS=all.test $MAKE -e check >stdout && { cat stdout; Exit 1; } +XFAIL_TESTS=all.test $MAKE -e 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 3108fc667..2b1f627b8 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 82889c290..c69a40ad6 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 27c1804e4..aa86dca5d 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 0bf8ac737..c35234e9d 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* @@ -16,7 +16,7 @@ # Check the tar-ustar option. -. ./defs || Exit 1 +. ./defs || exit 1 cat > configure.ac << 'END' AC_INIT([tar], [1.0]) @@ -16,7 +16,7 @@ # Check the tar-pax option. -. ./defs || Exit 1 +. ./defs || exit 1 cat > configure.ac << 'END' AC_INIT([tar2], [1.0]) @@ -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 97a95d893..9b975d51d 100755 --- a/t/target-cflags.sh +++ b/t/target-cflags.sh @@ -18,7 +18,7 @@ # Assar Westerlund <assar@sics.se> 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 43e227da1..031cbc151 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 e384ac792..501fcc9b7 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 @@ -59,7 +59,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' @@ -81,7 +81,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 5538105b5..1bc4727e8 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' @@ -79,7 +79,7 @@ chmod a+x foo bar.test baz.sh $AUTOMAKE -a test -f test-driver -grep DRIVER Makefile.in || Exit 99 # For debugging. +grep DRIVER Makefile.in || exit 99 # For debugging. grep '^my_LOG_DRIVER *=' Makefile.in \ && fatal_ 'unexpected $(my_LOG_DRIVER) in Makefile.in' @@ -108,10 +108,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 3b0839708..5441abfbc 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 a42e0d098..d1b4e5c43 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 } @@ -120,7 +120,7 @@ for vpath in : false; do 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. diff --git a/t/test-driver-custom-multitest-recheck2.sh b/t/test-driver-custom-multitest-recheck2.sh index 5ceb3393a..eab6aacc8 100755 --- a/t/test-driver-custom-multitest-recheck2.sh +++ b/t/test-driver-custom-multitest-recheck2.sh @@ -21,7 +21,7 @@ # See also related tests 'test-driver-custom-multitest-recheck.test' and # 'parallel-tests-recheck-override.test'. -. ./defs || Exit 1 +. ./defs || exit 1 cp "$am_testauxdir"/trivial-test-driver . \ || fatal_ "failed to fetch auxiliary script trivial-test-driver" @@ -83,7 +83,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 @@ -95,7 +95,7 @@ for vpath in : false; do : An empty '$(TESTS)' or '$(TEST_LOGS)' means that no test should be run. for var in TESTS TEST_LOGS; do - env "$var=" $MAKE -e recheck >stdout || { cat stdout; Exit 1; } + env "$var=" $MAKE -e 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 @@ -106,7 +106,7 @@ for vpath in : false; do : a.test was successful the first time, no need to re-run it. env TESTS=a.test $MAKE -e recheck >stdout \ - || { cat stdout; Exit 1; } + || { 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 @@ -116,7 +116,7 @@ for vpath in : false; do : b.test failed, it should be re-run. And make it pass this time. echo OK > b.ok TEST_LOGS=b.log $MAKE -e recheck >stdout \ - || { cat stdout; Exit 1; } + || { cat stdout; exit 1; } cat stdout test ! -r a.run test -f b.run @@ -127,14 +127,14 @@ for vpath in : false; do : No need to re-run a.test or b.test anymore. TEST_LOGS=b.log $MAKE -e recheck >stdout \ - || { cat stdout; Exit 1; } + || { 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 TESTS='a.test b.test' $MAKE -e recheck >stdout \ - || { cat stdout; Exit 1; } + || { 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 @@ -148,7 +148,7 @@ for vpath in : false; do # a ':' away after the first iteration, even if it is redirected. echo dummy > c.err env TEST_LOGS='a.log c.log' $MAKE -e recheck >stdout \ - && { cat stdout; Exit 1; } + && { 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 @@ -162,7 +162,7 @@ for vpath in : false; do # Use 'echo', not ':'; see comments above for why. echo dummy > c.ok env TESTS='c.test a.test' $MAKE -e recheck >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 test ! -r a.run @@ -173,7 +173,7 @@ for vpath in : false; do : 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 diff --git a/t/test-driver-custom-multitest.sh b/t/test-driver-custom-multitest.sh index 28e170081..da8a88fc9 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" @@ -119,14 +119,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 @@ -159,7 +159,7 @@ for vpath in : false; do test $(grep -c '%% ' test-suite.log) -eq 4 TESTS='pass.t pass3-skip2-xfail.t' $MAKE -e 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-no-extra-driver.sh b/t/test-driver-custom-no-extra-driver.sh index 4d7367d2a..a44febd54 100755 --- a/t/test-driver-custom-no-extra-driver.sh +++ b/t/test-driver-custom-no-extra-driver.sh @@ -18,7 +18,7 @@ # installed or referenced if it's not used, i.e., if the user has # defined his own '*LOG_DRIVER' variables. -. ./defs || Exit 1 +. ./defs || exit 1 cat >> configure.ac <<'END' AC_PROG_CC @@ -55,8 +55,8 @@ $ACLOCAL for opts in '' '--add-missing' '-a -c'; do $AUTOMAKE $opts - $FGREP test-driver Makefile.in sub[12]/Makefile.in && Exit 1 - find . | $FGREP test-driver && Exit 1 + $FGREP test-driver Makefile.in sub[12]/Makefile.in && exit 1 + find . | $FGREP test-driver && exit 1 : For shells with busted 'set -e'. done diff --git a/t/test-driver-custom-xfail-tests.sh b/t/test-driver-custom-xfail-tests.sh index d8455deab..c19e69f8a 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], []) @@ -141,7 +141,7 @@ $AUTOMAKE ./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 @@ -150,7 +150,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 d56d661a2..714f05860 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 @@ -140,4 +140,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 75f6a87f4..fed309e74 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 @@ -45,7 +45,7 @@ $AUTOMAKE ./configure # The testsuite driver does not exist. -$MAKE check && Exit 1 +$MAKE check && exit 1 test ! -f test-suite.log # The testsuite driver exists and create the test log files, but fails. @@ -58,7 +58,7 @@ exit 1 END chmod a+x oops -$MAKE check && Exit 1 +$MAKE check && exit 1 test ! -f test-suite.log : diff --git a/t/test-driver-is-distributed.sh b/t/test-driver-is-distributed.sh index 12f9c0b9d..2208a04d4 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 b2d8588cc..ab774db99 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-driver-trs-suffix-registered.sh b/t/test-driver-trs-suffix-registered.sh index 801300bd7..78acca23a 100755 --- a/t/test-driver-trs-suffix-registered.sh +++ b/t/test-driver-trs-suffix-registered.sh @@ -20,7 +20,7 @@ # - .test if $(TEST_EXTENSIONS) is not defined # - stuff in $(TEST_EXTENSIONS) otherwise -. ./defs || Exit 1 +. ./defs || exit 1 : > Makefile.am diff --git a/t/test-extensions-cond.sh b/t/test-extensions-cond.sh index c8d58ac8b..dda019333 100755 --- a/t/test-extensions-cond.sh +++ b/t/test-extensions-cond.sh @@ -16,7 +16,7 @@ # Expose bug in conditional definition of TEST_EXTENSIONS. -. ./defs || Exit 1 +. ./defs || exit 1 cat >> configure.ac << 'END' AM_CONDITIONAL([COND], [:]) @@ -62,7 +62,7 @@ for i in 1 2 3; do AUTOMAKE_fails $i lineno=$(sed -n 's/^## lineno //p' $i.am) \ && test 0 -lt "$lineno" \ - || Exit 99 + || exit 99 grep "^$i\\.am:$lineno:.*TEST_EXTENSIONS.*conditional content" stderr done diff --git a/t/test-extensions.sh b/t/test-extensions.sh index c4444899b..8f8c4131b 100755 --- a/t/test-extensions.sh +++ b/t/test-extensions.sh @@ -18,7 +18,7 @@ # and do not diagnose valid (albeit more unusual) ones. # See automake bug#9400. -. ./defs || Exit 1 +. ./defs || exit 1 cat >> configure.ac <<'END' AC_OUTPUT @@ -63,9 +63,9 @@ done # Verify that we accept valid suffixes, even if intermixed with # invalid ones. -$EGREP '\.(sh|test|t33)' stderr && Exit 1 +$EGREP '\.(sh|test|t33)' stderr && exit 1 # Verify that we don't try to handle invalid suffixes. -$EGREP '(LOG_COMPILER|non-POSIX var|bad character)' stderr && Exit 1 +$EGREP '(LOG_COMPILER|non-POSIX var|bad character)' stderr && exit 1 : diff --git a/t/test-harness-vpath-rewrite.sh b/t/test-harness-vpath-rewrite.sh index 0058b6dc7..85e4bbb98 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 4a4dec360..b622ee70f 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,7 +88,7 @@ $AUTOMAKE -a ./configure -TEST_SUITE_LOG=my.log $MAKE -e check && Exit 1 +TEST_SUITE_LOG=my.log $MAKE -e check && exit 1 ls -l # For debugging. test ! -f test-suite.log test ! -f global.log @@ -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 @@ -146,7 +146,7 @@ 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 @@ -155,7 +155,7 @@ test ! -f test-suite.log # 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 diff --git a/t/test-logs-repeated.sh b/t/test-logs-repeated.sh index 30aefca67..881f67f92 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 af435ae3c..74bb6ffa5 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 d3c05f00f..8b6a3c8e2 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 @@ -122,7 +122,7 @@ cat > zar-doz.x << 'END' :test-result: XFAIL END -$MAKE check && Exit 1 +$MAKE check && exit 1 cat test-suite.log have_result <<END @@ -143,7 +143,7 @@ cat > foo.test << 'END' END : > zar-doz.x -$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 0a106b3fc..8675747a8 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 # 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 03f93d78e..2410e03fa 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 @@ -53,10 +53,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 } @@ -74,7 +74,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 @@ -99,7 +99,7 @@ cat > bar.test <<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 @@ -118,7 +118,7 @@ END cat > bar.test <<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 @@ -147,11 +147,11 @@ cat > foo.test <<END :test-result: ERROR END : > bar.test -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.test -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. @@ -169,7 +169,7 @@ END done cat foo.test # For debugging. cat bar.test # 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 2491da5b3..441a83894 100755 --- a/t/test-missing.sh +++ b/t/test-missing.sh @@ -18,7 +18,7 @@ # - non-existent scripts listed in TESTS get diagnosed # See also related test 'test-missing2.test'. -. ./defs || Exit 1 +. ./defs || exit 1 cat >> configure.ac << 'END' AC_OUTPUT @@ -37,7 +37,7 @@ $AUTOMAKE -a ./configure -$MAKE check >output 2>&1 && { cat output; Exit 1; } +$MAKE check >output 2>&1 && { cat output; exit 1; } cat output test -f ok.log grep '^PASS: ok\.test' output @@ -45,13 +45,13 @@ $FGREP 'zardoz.log' output test ! -f test-suite.log TESTS='zardoz2.test' $MAKE -e check >output 2>&1 \ - && { cat output; Exit 1; } + && { cat output; exit 1; } cat output $FGREP 'zardoz2.log' output test ! -f test-suite.log TEST_LOGS='zardoz3.log' $MAKE -e check >output 2>&1 \ - && { cat output; Exit 1; } + && { cat output; exit 1; } cat output $FGREP 'zardoz3.log' output test ! -f test-suite.log @@ -63,7 +63,7 @@ test ! -f test-suite.log $MAKE check rm -f zardoz.test -$MAKE check >output 2>&1 && { cat output; Exit 1; } +$MAKE check >output 2>&1 && { cat output; exit 1; } cat output $FGREP 'zardoz.log' output test ! -f test-suite.log diff --git a/t/test-missing2.sh b/t/test-missing2.sh index 6dd4b9d72..75920731d 100755 --- a/t/test-missing2.sh +++ b/t/test-missing2.sh @@ -19,7 +19,7 @@ # all the $(TEST_LOGS) have a dummy dependency. # See also related test 'test-missing.test'. -. ./defs || Exit 1 +. ./defs || exit 1 cat >> configure.ac << 'END' AC_OUTPUT @@ -36,13 +36,13 @@ $AUTOMAKE -a ./configure -$MAKE foobar1.log foobar2.log || Exit 99 -test ! -f foobar1.log || Exit 99 -test ! -f foobar1.trs || Exit 99 -test ! -f foobar2.log || Exit 99 -test ! -f foobar2.trs || Exit 99 +$MAKE foobar1.log foobar2.log || exit 99 +test ! -f foobar1.log || exit 99 +test ! -f foobar1.trs || exit 99 +test ! -f foobar2.log || exit 99 +test ! -f foobar2.trs || exit 99 -$MAKE check >output 2>&1 && { cat output; Exit 1; } +$MAKE check >output 2>&1 && { cat output; exit 1; } cat output grep 'test-suite\.log.*foobar1\.log' output grep 'test-suite\.log.*foobar1\.trs' output diff --git a/t/test-trs-basic.sh b/t/test-trs-basic.sh index b8d13d81d..2a1c10692 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 @@ -100,7 +100,7 @@ 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 diff --git a/t/test-trs-recover.sh b/t/test-trs-recover.sh index a1321944d..9247b1e31 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 @@ -66,13 +66,13 @@ test ! -f 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 -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 +87,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 @@ -110,7 +110,7 @@ test ! -f 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 @@ -118,7 +118,7 @@ test ! -f baz.trs test ! -f 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 +131,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 +153,7 @@ test -f baz.trs rm -f foo.trs update_stamp touch bar.test -RECHECK_LOGS= $MAKE -e check >stdout || { cat stdout; Exit 1; } +RECHECK_LOGS= $MAKE -e 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 +161,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/test-trs-recover2.sh b/t/test-trs-recover2.sh index 3cbbbf6b9..ef231fcd8 100755 --- a/t/test-trs-recover2.sh +++ b/t/test-trs-recover2.sh @@ -17,7 +17,7 @@ # Check parallel harness features: # - recovery from unreadable '.trs' files, in various scenarios -. ./defs || Exit 1 +. ./defs || exit 1 cat >> configure.ac <<END AC_OUTPUT @@ -41,7 +41,7 @@ $AUTOMAKE -a : > t chmod a-r t -test ! -r t || Exit 77 +test ! -r t || exit 77 rm -f t : Create the required log files. @@ -70,7 +70,7 @@ test -r bar.trs : Again, but using "make recheck" this time. rm -f foo.trs chmod a-r bar.trs -$MAKE recheck >stdout || { cat stdout; Exit 1; } +$MAKE recheck >stdout || { cat stdout; exit 1; } cat stdout test -f foo.trs test -r foo.trs @@ -82,12 +82,12 @@ grep '^PASS: bar\.test' stdout : Recreate by remaking the global test log. chmod a-r foo.trs rm -f test-suite.log -$MAKE test-suite.log >stdout || { cat stdout; Exit 1; } +$MAKE test-suite.log >stdout || { cat stdout; exit 1; } cat stdout test -f foo.trs test -r foo.trs grep '^PASS: foo\.test' stdout -grep 'bar\.test' stdout && Exit 1 +grep 'bar\.test' stdout && exit 1 # Also test that have only run before should be counted in the final # testsuite summary. grep '^# TOTAL: *2$' stdout @@ -95,7 +95,7 @@ grep '^# TOTAL: *2$' stdout : Setup for the next check. : > baz.test sed 's/^TESTS =.*/& baz.test/' Makefile > t -diff t Makefile && Exit 99 +diff t Makefile && exit 99 mv -f t Makefile $MAKE check test -f foo.trs @@ -108,13 +108,13 @@ $sleep touch stamp $sleep touch bar.test -RECHECK_LOGS= $MAKE -e check >stdout || { cat stdout; Exit 1; } +RECHECK_LOGS= $MAKE -e check >stdout || { cat stdout; exit 1; } cat stdout test -r foo.trs is_newest bar.trs bar.test grep '^PASS: foo\.test' stdout grep '^PASS: bar\.test' stdout -grep 'baz\.test' stdout && Exit 1 +grep 'baz\.test' stdout && exit 1 # Also test that have only run before should be counted in the final # testsuite summary. grep '^# TOTAL: *3$' stdout diff --git a/t/tests-environment-and-log-compiler.sh b/t/tests-environment-and-log-compiler.sh index 65855ce8a..9184a5ef9 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 93643d11d..a5d888d4d 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 6c42fd4ea..5780e570f 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 62ca4ee9c..d6f219dae 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 0f0070808..c73ca45f8 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 b101206bb..938c91e2e 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 8d2ce74d7..265eebfa4 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 1958dd494..1851226ac 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 -TEST_SUITE_LOG=bar/bar.log $MAKE -e check >stdout && { cat stdout; Exit 1; } +TEST_SUITE_LOG=bar/bar.log $MAKE -e 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 .. -TEST_SUITE_LOG=foo.log $MAKE -e check >stdout && { cat stdout; Exit 1; } +TEST_SUITE_LOG=foo.log $MAKE -e 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 6a89862bf..aa0797057 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 357e6b7e1..cab5f1a68 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 9efefa25a..fc37be1fe 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-no-clutter.sh b/t/txinfo-no-clutter.sh index ae5e9f2d1..3de21b488 100755 --- a/t/txinfo-no-clutter.sh +++ b/t/txinfo-no-clutter.sh @@ -18,7 +18,7 @@ # Related to automake bug#11146. required='makeinfo tex texi2dvi-o dvips' -. ./defs || Exit 1 +. ./defs || exit 1 mkdir sub @@ -93,7 +93,7 @@ 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)$' lst && Exit 1 + $EGREP -v '^(foo|sub/bar|baz)\.(texi|dvi|ps|pdf|html|info)$' lst && exit 1 $MAKE clean done diff --git a/t/txinfo-unrecognized-extension.sh b/t/txinfo-unrecognized-extension.sh index 251658049..96b5f91a6 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 e6667cbed..31990c427 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 6908ab847..903d6f5b9 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 77f9af785..6c06942e4 100755 --- a/t/txinfo13.sh +++ b/t/txinfo13.sh @@ -19,7 +19,7 @@ # from Vincent Lefevre). required='makeinfo tex texi2dvi-o' -. ./defs || Exit 1 +. ./defs || exit 1 echo AC_OUTPUT >> configure.ac diff --git a/t/txinfo16.sh b/t/txinfo16.sh index 173a87a86..f294bfff7 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 diff --git a/t/txinfo17.sh b/t/txinfo17.sh index 1de7e9a3f..d21676920 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,5 +35,5 @@ END $ACLOCAL $AUTOMAKE --add-missing -grep 'example' Makefile.in && Exit 1 +grep 'example' Makefile.in && exit 1 grep 'texinfo:' Makefile.in diff --git a/t/txinfo19.sh b/t/txinfo19.sh index a77c41945..011c65547 100755 --- a/t/txinfo19.sh +++ b/t/txinfo19.sh @@ -17,7 +17,7 @@ # Test support for DJGPP's .iNN info files. required=makeinfo -. ./defs || Exit 1 +. ./defs || exit 1 echo AC_OUTPUT >> configure.ac diff --git a/t/txinfo2.sh b/t/txinfo2.sh index 0daebd9a8..37c295342 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 5c07880c1..4add0c260 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,14 +62,14 @@ cat > main.texi << 'END' END # makeinfo will bail out, but we should conserve the old info files. -$MAKE && Exit 1 +$MAKE && exit 1 test -f main test -f main-1 # Restore main.texi, and break sub/main.texi. cp main.texi sub/main.texi mv main.old main.texi -$MAKE && Exit 1 +$MAKE && exit 1 test -f main test ! -f main-1 test -f sub/main diff --git a/t/txinfo21.sh b/t/txinfo21.sh index 6436dd8f0..9936c0e66 100755 --- a/t/txinfo21.sh +++ b/t/txinfo21.sh @@ -18,7 +18,7 @@ # install-DOC flavors. required='makeinfo-html tex texi2dvi' -. ./defs || Exit 1 +. ./defs || exit 1 cat >>configure.ac <<\EOF AC_CONFIG_FILES([rec/Makefile]) diff --git a/t/txinfo22.sh b/t/txinfo22.sh index c33898b67..3c2d70c68 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]) diff --git a/t/txinfo23.sh b/t/txinfo23.sh index e5c17611d..02b2ca175 100755 --- a/t/txinfo23.sh +++ b/t/txinfo23.sh @@ -20,7 +20,7 @@ # (See also txinfo24.test and txinfo25.test). required='makeinfo tex texi2dvi-o' -. ./defs || Exit 1 +. ./defs || exit 1 cat >> configure.ac << 'END' AC_OUTPUT diff --git a/t/txinfo24.sh b/t/txinfo24.sh index 709cee71f..e7bc9642a 100755 --- a/t/txinfo24.sh +++ b/t/txinfo24.sh @@ -19,7 +19,7 @@ # (See also txinfo23.test and txinfo25.test). required='makeinfo tex texi2dvi-o' -. ./defs || Exit 1 +. ./defs || exit 1 cat >> configure.ac << 'END' AC_OUTPUT diff --git a/t/txinfo25.sh b/t/txinfo25.sh index 7aa66ae9d..15f554494 100755 --- a/t/txinfo25.sh +++ b/t/txinfo25.sh @@ -21,7 +21,7 @@ # (See also txinfo23.test and txinfo24.test). required='makeinfo tex texi2dvi-o' -. ./defs || Exit 1 +. ./defs || exit 1 cat >> configure.ac << 'END' AC_OUTPUT diff --git a/t/txinfo26.sh b/t/txinfo26.sh index 223a4eaa6..cc88a6e57 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 diff --git a/t/txinfo27.sh b/t/txinfo27.sh index f94c0bcce..bfc075ae3 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 97b36d50a..e6613b40e 100755 --- a/t/txinfo28.sh +++ b/t/txinfo28.sh @@ -20,7 +20,7 @@ # Report from Ralf Corsepius. required='makeinfo tex texi2dvi-o' -. ./defs || Exit 1 +. ./defs || exit 1 # This setting, when honored by GNU ls, used to cause an infinite loop # in mdate-sh. diff --git a/t/txinfo29.sh b/t/txinfo29.sh index eab87dd13..3e27362bf 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/txinfo3.sh b/t/txinfo3.sh index 88e1bacfe..5d7694fe1 100755 --- a/t/txinfo3.sh +++ b/t/txinfo3.sh @@ -17,7 +17,7 @@ # Test to make sure .info-less @setfilename works. required='makeinfo tex texi2dvi' -. ./defs || Exit 1 +. ./defs || exit 1 cat >> configure.ac << 'END' AC_OUTPUT @@ -44,7 +44,7 @@ grep '^INFO_DEPS.*textutils$' Makefile.in # We should not use single suffix inference rules (with separate # dependencies), this confuses Solaris make. -grep '^\.texi:$' Makefile.in && Exit 1 +grep '^\.texi:$' Makefile.in && exit 1 grep 'textutils: *textutils\.texi' Makefile.in ./configure diff --git a/t/txinfo30.sh b/t/txinfo30.sh index 1766cacb0..db8f708f2 100755 --- a/t/txinfo30.sh +++ b/t/txinfo30.sh @@ -17,7 +17,7 @@ # Make sure 'missing texinfo' does not create empty files. # Report from Bob Proulx. -. ./defs || Exit 1 +. ./defs || exit 1 echo info_TEXINFOS = bar.texi >Makefile.am echo grepme >bar.info @@ -57,7 +57,7 @@ test -f bar.info # We should not create a missing bar.info. rm -f bar.info -$MAKE && Exit 1 +$MAKE && exit 1 test ! -f bar.info : diff --git a/t/txinfo31.sh b/t/txinfo31.sh index 191bca4ee..e8186e54b 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 6f0c5a3a4..9f2134a43 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 4bdd76734..28c9f1a18 100755 --- a/t/txinfo33.sh +++ b/t/txinfo33.sh @@ -18,7 +18,7 @@ # Similar to txinfo25.test. required='makeinfo tex texi2dvi-o 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 diff --git a/t/txinfo4.sh b/t/txinfo4.sh index f92f9c1a4..e6c67b95f 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/txinfo5.sh b/t/txinfo5.sh index d51561711..0eb02689c 100755 --- a/t/txinfo5.sh +++ b/t/txinfo5.sh @@ -20,7 +20,7 @@ # See also sister test txinfo5b.test. # Report from Ian Taylor. -. ./defs || Exit 1 +. ./defs || exit 1 cat >> configure.ac << 'END' AM_MAINTAINER_MODE diff --git a/t/txinfo5b.sh b/t/txinfo5b.sh index a99f60758..c41a75f6b 100755 --- a/t/txinfo5b.sh +++ b/t/txinfo5b.sh @@ -18,7 +18,7 @@ # See also sister test txinfo5.test. # Report from Ian Taylor. -. ./defs || Exit 1 +. ./defs || exit 1 cat >> configure.ac << 'END' AM_MAINTAINER_MODE diff --git a/t/txinfo6.sh b/t/txinfo6.sh index b289efee4..ca3184dc6 100755 --- a/t/txinfo6.sh +++ b/t/txinfo6.sh @@ -16,7 +16,7 @@ # Test to make sure '.txi' extension works. -. ./defs || Exit 1 +. ./defs || exit 1 cat > Makefile.am << 'END' info_TEXINFOS = foo.txi diff --git a/t/txinfo7.sh b/t/txinfo7.sh index 2a5dc9dc0..93d199c1c 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 4b186bc38..6b1c6face 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/txinfo9.sh b/t/txinfo9.sh index 6d9c28b4c..97770f4ce 100755 --- a/t/txinfo9.sh +++ b/t/txinfo9.sh @@ -16,7 +16,7 @@ # Make sure we only create texinfo-related targets once. -. ./defs || Exit 1 +. ./defs || exit 1 cat > Makefile.am << 'END' info_TEXINFOS = maude.texi liver.txi heart.texinfo diff --git a/t/uninstall-fail.sh b/t/uninstall-fail.sh index 7eac34252..8f160c886 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 >output 2>&1 && { cat output; Exit 1; } +$MAKE uninstall >output 2>&1 && { cat output; exit 1; } cat output if test $rm_f_is_silent_on_error = yes; then : "rm -f" is silent on errors, skip the grepping of make output @@ -73,7 +73,7 @@ fi chmod a-rwx $inst/share (cd $inst/share) && skip_ "cannot make directories fully unreadable" -$MAKE uninstall >output 2>&1 && { cat output; Exit 1; } +$MAKE uninstall >output 2>&1 && { cat output; exit 1; } cat output # # Some shells, like Solaris 10 /bin/sh and /bin/ksh, do not report diff --git a/t/uninstall-pr9578.sh b/t/uninstall-pr9578.sh index 1be2a26f5..6d852c4f6 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 @@ -48,19 +48,19 @@ test ! -d 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 $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 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 diff --git a/t/unused.sh b/t/unused.sh index 271273fe5..79c7b41b2 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 @@ -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 : @@ -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 @@ -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 a091c4c67..c86c4e616 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 GNUmake" -. ./defs || Exit 1 +. ./defs || exit 1 cat >> configure.ac << 'END' AC_PROG_CC diff --git a/t/vala-libs.sh b/t/vala-libs.sh index 00befdd4b..f6a7ba9b3 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 GNUmake" -. ./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 c353aab25..2580bd074 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 GNUmake' -. ./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 992c41ff0..e1dbb5d48 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++ GNUmake' -. ./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 8b6aff58a..3b659a88d 100755 --- a/t/vala-parallel.sh +++ b/t/vala-parallel.sh @@ -17,7 +17,7 @@ # Vala support with parallel make. required='valac cc GNUmake' -. ./defs || Exit 1 +. ./defs || exit 1 cat >> configure.ac <<'END' AC_PROG_CC diff --git a/t/vala-vapi.sh b/t/vala-vapi.sh index 637e73a58..1862b71bc 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 GNUmake' -. ./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 f2da4af24..9a7ff7687 100755 --- a/t/vala-vpath.sh +++ b/t/vala-vpath.sh @@ -18,7 +18,7 @@ # See automake bug#8753. required="cc valac GNUmake" -. ./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 @@ -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 cf52c5044..1c5bdb9e1 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 GNUmake" -. ./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 220c76bf4..481815060 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 GNUmake" -. ./defs || Exit 1 +. ./defs || exit 1 mkdir src diff --git a/t/vala4.sh b/t/vala4.sh index 2d3951abb..a727ec58a 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 1943b8662..3c55cf170 100755 --- a/t/vala5.sh +++ b/t/vala5.sh @@ -17,7 +17,7 @@ # Test per-target flags. required="pkg-config valac gcc GNUmake" -. ./defs || Exit 1 +. ./defs || exit 1 mkdir src @@ -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/vars3.sh b/t/vars3.sh index 246ea7095..be30006e4 100755 --- a/t/vars3.sh +++ b/t/vars3.sh @@ -17,7 +17,7 @@ # Check that Automake warns about variables containing spaces # and other non-POSIX characters. -. ./defs || Exit 1 +. ./defs || exit 1 cat >Makefile.am <<'EOF' L01 = $(shell echo *) @@ -37,18 +37,18 @@ EOF $ACLOCAL # Make sure this warning is print in the 'portability' category. $AUTOMAKE --warnings=no-error,none,portability 2>stderr \ - || { cat stderr >&2; Exit 1; } + || { cat stderr >&2; exit 1; } cat stderr >&2 # Lines number are printed in error message. # Use them to make sure errors are diagnosed against the right lines. # No error expected apart from those on these lines. -grep -v '^Makefile\.am:[145789]:' stderr | grep . && Exit 1 +grep -v '^Makefile\.am:[145789]:' stderr | grep . && exit 1 # Now check some individual values. grep ':1:.*shell echo' stderr -grep 'nextvariableisbad' stderr && Exit 1 +grep 'nextvariableisbad' stderr && exit 1 grep ':4:.*addsuffix' stderr grep ':5:.*bad boy' stderr grep ':7:.*three errors' stderr @@ -58,7 +58,7 @@ grep ':8:.*o u c h' stderr grep ':8:.*wildcard' stderr grep ':9:.*another Error' stderr -$EGREP 'ok|thisis|here' stderr && Exit 1 +$EGREP 'ok|thisis|here' stderr && exit 1 # None of these errors be diagnosed with '-Wno-portability'. $AUTOMAKE -Wno-portability diff --git a/t/vartar.sh b/t/vartar.sh index ebac14ba0..1c9dc3bed 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' install = install diff --git a/t/vartypo2.sh b/t/vartypo2.sh index 7941fbbd9..90facaada 100755 --- a/t/vartypo2.sh +++ b/t/vartypo2.sh @@ -18,7 +18,7 @@ # Libtool variant. required=libtoolize -. ./defs || Exit 1 +. ./defs || exit 1 cat >>configure.ac <<'END' AM_PROG_AR @@ -53,7 +53,7 @@ AUTOMAKE_fails --add-missing # Makefile.am:5: warning: variable 'libfoo_la_DEPENDENCIES' is defined but no program or # Makefile.am:5: library has 'libfoo_la' as canonical name (possible typo) -grep 'as canonical' stderr | grep -v ' .libfoo_la. ' && Exit 1 +grep 'as canonical' stderr | grep -v ' .libfoo_la. ' && exit 1 test $(grep -c 'variable.*is defined but' stderr) -eq 6 # If we add a global -Wnone, all warnings should disappear. diff --git a/t/vartypos.sh b/t/vartypos.sh index c323fff52..16317fb32 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 cat >>configure.ac <<'END' AC_PROG_RANLIB @@ -72,7 +72,7 @@ AUTOMAKE_fails -Wno-extra-portability # Makefile.am:13: library has 'libfoo_a' as canonical name (possible typo) grep 'as canonical' stderr | grep -v ' .foo. ' | grep -v ' .libfoo_a. ' \ - && Exit 1 + && exit 1 test $(grep -c 'variable.*is defined but' stderr) -eq 13 # If we add a global -Wnone, all warnings should disappear. diff --git a/t/version.sh b/t/version.sh index 431eb0dae..acfbbe6eb 100755 --- a/t/version.sh +++ b/t/version.sh @@ -17,7 +17,7 @@ # Test to make sure [...] is ok in version number. Report from Jim # Meyering. -. ./defs || Exit 1 +. ./defs || exit 1 cat > configure.ac << 'END' AC_INIT diff --git a/t/version2.sh b/t/version2.sh index 273bd3670..b690dc9a2 100755 --- a/t/version2.sh +++ b/t/version2.sh @@ -17,7 +17,7 @@ # Test to make sure 3rd arg to AM_INIT_AUTOMAKE not picked up in # version. From Joel Weber. -. ./defs || Exit 1 +. ./defs || exit 1 cat > configure.ac << 'END' AC_INIT diff --git a/t/version3.sh b/t/version3.sh index 2839467b4..2b5294d10 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 7fa429e17..f04305e1e 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 8d33c44fc..74fa088cc 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 28929204b..812dc017b 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 1e66280d4..28f754847 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.sh b/t/vpath.sh index 4bfc9be90..dcb08ffb0 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 cat > Makefile.am << 'END' VPATH = zardoz @@ -28,6 +28,6 @@ $AUTOMAKE grep VPATH Makefile.in # For debugging. grep '^VPATH = zardoz$' Makefile.in -grep 'VPATH.*@srcdir@' Makefile.in && Exit 1 +grep 'VPATH.*@srcdir@' Makefile.in && exit 1 : diff --git a/t/vtexi.sh b/t/vtexi.sh index 9d1bc2448..5928ddd83 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 @@ -57,6 +57,6 @@ $EGREP 'stamp-vti:.*\$\(top_srcdir\)/configure( .*)?$' Makefile.in # etc. once led to '\$\(srcdir\)/mdate-sh'. # Filter out '$(srcdir)/mdate-sh'; there should be no occurrences # of '.../mdate-sh' left then. -sed 's,\$(srcdir)/mdate-sh,,g' Makefile.in | grep '/mdate-sh' && Exit 1 +sed 's,\$(srcdir)/mdate-sh,,g' Makefile.in | grep '/mdate-sh' && exit 1 : diff --git a/t/vtexi2.sh b/t/vtexi2.sh index 18f1e9ed1..30f679fb7 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 5bea2811b..ba50eb362 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 dcdcf8543..864818f67 100755 --- a/t/vtexi4.sh +++ b/t/vtexi4.sh @@ -22,7 +22,7 @@ # texi2dvi. required='makeinfo tex texi2dvi-o 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 3d3885d45..8824fa7b5 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 9f973c6db..756cac83b 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 a5886701a..4c15ecd7e 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 774fd3aae..a2b6b403e 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 4d64059e0..d1b2b8ca3 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 d0af92411..087a70d72 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 584f864d0..68ceb2a84 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_CONFIG_FILES([sub/Makefile]) @@ -49,8 +49,8 @@ AUTOMAKE_fails # sub/Makefile.am:2: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' grep '^Makefile.am:.*foo_SOURCES' stderr grep '^sub/Makefile.am:.*INCLUDES' stderr -grep '^sub/Makefile.am:.*foo_SOURCES' stderr && Exit 1 -grep '^Makefile.am:.*INCLUDES' stderr && Exit 1 +grep '^sub/Makefile.am:.*foo_SOURCES' stderr && exit 1 +grep '^Makefile.am:.*INCLUDES' stderr && exit 1 # Only three lines of warnings. test $(grep -v 'warnings are treated as errors' stderr | wc -l) -eq 3 diff --git a/t/werror.sh b/t/werror.sh index 606fed620..01d76fc03 100755 --- a/t/werror.sh +++ b/t/werror.sh @@ -16,7 +16,7 @@ # Test to make sure -Werror and --add-missing work together. -. ./defs || Exit 1 +. ./defs || exit 1 : > Makefile.am diff --git a/t/werror2.sh b/t/werror2.sh index 67e0e01f7..52ec1811a 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 @@ -42,7 +42,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 b5e35e370..a22ff8470 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 9a9a1665c..1b930d5e9 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 72153cada..4a4c2e97d 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 5f89dc9c6..cca400a75 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 1b494e82c..0643edce6 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 diff --git a/t/yacc-basic.sh b/t/yacc-basic.sh index 34c7565b2..520533e20 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 diff --git a/t/yacc-bison-skeleton-cxx.sh b/t/yacc-bison-skeleton-cxx.sh index f5d85459b..609ebc24e 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 8cf957bda..5bf909239 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 399f02657..68b7b1f45 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 diff --git a/t/yacc-clean.sh b/t/yacc-clean.sh index 530f87fb1..cddd1592e 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 diff --git a/t/yacc-cxx.sh b/t/yacc-cxx.sh index 94e5dad89..85f3ab59d 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 diff --git a/t/yacc-d-basic.sh b/t/yacc-d-basic.sh index a633f411a..868cd3eff 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 diff --git a/t/yacc-d-cxx.sh b/t/yacc-d-cxx.sh index 1f667c832..474a4fffd 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 () { diff --git a/t/yacc-d-vpath.sh b/t/yacc-d-vpath.sh index 78a486a70..a1950520d 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 3ac02541d..3c4bfd4fc 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 diff --git a/t/yacc-depend.sh b/t/yacc-depend.sh index 04ddb522d..f7254a2e4 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 5d9aa3808..70f3f14cc 100755 --- a/t/yacc-depend2.sh +++ b/t/yacc-depend2.sh @@ -19,7 +19,7 @@ # with NetBSD make). 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 6cb11eebe..850b027b9 100755 --- a/t/yacc-dist-nobuild-subdir.sh +++ b/t/yacc-dist-nobuild-subdir.sh @@ -19,7 +19,7 @@ # Exposes automake bug#8485. required='cc yacc' -. ./defs || Exit 1 +. ./defs || exit 1 # This test is bounded to fail for any implementation that # triggers automake bug#7884. @@ -86,7 +86,7 @@ chmod u+w . # extractors, to improve coverage. ../configure --enable-dependency-tracking YACC=false $MAKE -ls -l sub/*.[ch] && Exit 1 +ls -l sub/*.[ch] && exit 1 env DISTCHECK_CONFIGURE_FLAGS='YACC=false' $MAKE distcheck diff --git a/t/yacc-dist-nobuild.sh b/t/yacc-dist-nobuild.sh index 52abb87a1..40b833245 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 >out 2>&1 && { cat out; Exit 1; } +$MAKE >out 2>&1 && { cat out; exit 1; } cat out $FGREP parse.c out diff --git a/t/yacc-line.sh b/t/yacc-line.sh index d12215766..4ef2c011f 100755 --- a/t/yacc-line.sh +++ b/t/yacc-line.sh @@ -20,7 +20,7 @@ # See also sister test 'lex-line.test'. required='cc yacc' -. ./defs || Exit 1 +. ./defs || exit 1 cat >> configure.ac << 'END' AC_CONFIG_FILES([sub/Makefile]) @@ -97,15 +97,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.*"\.\./dir/quux\.y"' bar-quux.c diff --git a/t/yacc-mix-c-cxx.sh b/t/yacc-mix-c-cxx.sh index d1229421e..df7b8d923 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 @@ -166,7 +166,7 @@ for try in 0 1; do esac else echo "$me: invalid value of \$try '$try'" >&2 - Exit 99 + exit 99 fi $srcdir/configure diff --git a/t/yacc-nodist.sh b/t/yacc-nodist.sh index 2124357d5..53d9bb675 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 f1c8cac28..44b73b32b 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-weirdnames.sh b/t/yacc-weirdnames.sh index 82270fe96..ab43af3e5 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 @@ -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 bfab7522d..11a1bcbe7 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 3f9a20478..9a4de2abe 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 diff --git a/t/yacc5.sh b/t/yacc5.sh index ab24b563d..4382ded62 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 @@ -53,7 +53,7 @@ $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. @@ -69,10 +69,10 @@ $ACLOCAL $AUTOMAKE -a # 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 a3602e9fa..e1cb3767a 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 diff --git a/t/yacc8.sh b/t/yacc8.sh index 6640d32fa..3f12c5437 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 3100ce360..326a8d93e 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 diff --git a/t/yaccpp.sh b/t/yaccpp.sh index c065a50da..2395b561a 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 65ab53bf9..aacaddaf0 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 fb27c0bab..a16487251 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 || : diff --git a/t/yflags-conditional.sh b/t/yflags-conditional.sh index 0cd09d29a..676561395 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 78820caba..5b120dde4 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 8a98903dc..a8404b784 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 3f4755ed1..8682637ed 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 d3bd0d447..789cc2c70 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 fbc39f56f..b1ba9a3e2 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 @@ -51,8 +51,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 a933447d3..9ceed4d9a 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 @@ -51,8 +51,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++ |