diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-06-28 13:05:29 +0200 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-06-28 13:07:31 +0200 |
| commit | d25fac43a7c239fe8f56b2ce1b87ef3e3d4d7ef0 (patch) | |
| tree | ba36d0900395e4179abb5cc9b7e6c3f394a34a7c /t/python11.sh | |
| parent | 78900b933039b7001443be126b63862430ec2648 (diff) | |
| parent | c2a52bf0e8e87b8f347ca22b9ab2da7613bc4336 (diff) | |
| download | automake-d25fac43a7c239fe8f56b2ce1b87ef3e3d4d7ef0.tar.gz | |
Merge branch 'simplify-exit-trap-workaround' into maint
* simplify-exit-trap-workaround:
tests: simpler workaround for shells losing the exit status in exit trap
+ Extra non-trivial edits:
* t/am-missing-prog.sh: Use 'exit, not 'Exit'.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Diffstat (limited to 't/python11.sh')
| -rwxr-xr-x | t/python11.sh | 6 |
1 files changed, 3 insertions, 3 deletions
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 |