diff options
author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-06-28 13:27:49 +0200 |
---|---|---|
committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-06-28 13:37:53 +0200 |
commit | b21d68690612214d8edd810acf11880c3c0ad586 (patch) | |
tree | 7506c8901d7d16c4a5603a11e567b9e6315c9e9d /t/aclocal-autoconf-version-check.sh | |
parent | da9ad6fafeaf5dfa710a1a2b4176d1a049fddf13 (diff) | |
parent | d25fac43a7c239fe8f56b2ce1b87ef3e3d4d7ef0 (diff) | |
download | automake-b21d68690612214d8edd810acf11880c3c0ad586.tar.gz |
Merge branch 'maint'
* maint:
tests: simpler workaround for shells losing the exit status in exit trap
+ Extra non-trivial edits:
* Several tests: Adjusted to use 'exit' rather than 'Exit'.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Diffstat (limited to 't/aclocal-autoconf-version-check.sh')
-rwxr-xr-x | t/aclocal-autoconf-version-check.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/t/aclocal-autoconf-version-check.sh b/t/aclocal-autoconf-version-check.sh index 8173f818a..8e02ae999 100755 --- a/t/aclocal-autoconf-version-check.sh +++ b/t/aclocal-autoconf-version-check.sh @@ -17,7 +17,7 @@ # Make sure autoconf version checks in aclocal.m4 are robust. am_create_testdirs=empty -. ./defs || Exit 1 +. ./defs || exit 1 cat > configure.ac <<END m4_define([AC_AUTOCONF_VERSION], [9999a]) @@ -31,7 +31,7 @@ END : > Makefile.am $ACLOCAL -$AUTOCONF 2>stderr || { cat stderr >&2; Exit 1; } +$AUTOCONF 2>stderr || { cat stderr >&2; exit 1; } cat stderr >&2 grep 'You have another version of autoconf' stderr grep 'aclocal.m4:.*this file was generated for' stderr @@ -43,7 +43,7 @@ sed 's/^dnl!! //' < configure.ac > configure.tmp cmp configure.ac configure.tmp && fatal_ 'failed to edit configure.ac' mv -f configure.tmp configure.ac -$MAKE 2>stderr || { cat stderr >&2; Exit 1; } +$MAKE 2>stderr || { cat stderr >&2; exit 1; } cat stderr >&2 grep 'You have another version of autoconf' stderr grep 'aclocal.m4:.*this file was generated for autoconf 9999a' stderr |