diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-06-28 15:57:28 +0200 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-06-28 16:28:16 +0200 |
| commit | 7721f22a2c0f5b286d04427d011351602341de02 (patch) | |
| tree | b55f3e46fa9d8ef16856034337317f6b40e34d20 /t/parallel-tests-harderror.sh | |
| parent | 8eda774e3d2311513a35c49d7cad5e05c5fd9e03 (diff) | |
| parent | b21d68690612214d8edd810acf11880c3c0ad586 (diff) | |
| download | automake-7721f22a2c0f5b286d04427d011351602341de02.tar.gz | |
Merge branch 'master' into ng/master
* master:
cosmetics: remove trailing whitespace in some files
coverage: enhance tests in 'missing' script a little
coverage: tests AM_MISSING_PROG usage
docs: document AM_MISSING_PROG
tests: fix a spurious failure with Solaris make
tests: simpler workaround for shells losing the exit status in exit trap
tests: avoid several spurious failures on Solaris
tests: avoid a spurious failure on NetBSD
+ Extra non-trivial edits:
* Several tests: Adjusted to use 'exit' rather than 'Exit'.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Diffstat (limited to 't/parallel-tests-harderror.sh')
| -rwxr-xr-x | t/parallel-tests-harderror.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/t/parallel-tests-harderror.sh b/t/parallel-tests-harderror.sh index b51b27182..4ac1f6188 100755 --- a/t/parallel-tests-harderror.sh +++ b/t/parallel-tests-harderror.sh @@ -16,7 +16,7 @@ # Check parallel-tests features: DISABLE_HARD_ERRORS -. ./defs || Exit 1 +. ./defs || exit 1 cat >> configure.ac << 'END' AC_CONFIG_FILES([sub/Makefile]) @@ -62,12 +62,12 @@ DISABLE_HARD_ERRORS=x $MAKE check # But an empty values for DISABLE_HARD_ERRORS means that hard errors # are not to be counted like normal failures. -$MAKE check DISABLE_HARD_ERRORS='' && Exit 1 +$MAKE check DISABLE_HARD_ERRORS='' && exit 1 cat test-suite.log grep '^ERROR: foo$' test-suite.log cd sub -$MAKE DISABLE_HARD_ERRORS='' check && Exit 1 +$MAKE DISABLE_HARD_ERRORS='' check && exit 1 cat test-suite.log grep '^ERROR: bar$' test-suite.log cd .. @@ -82,8 +82,8 @@ $MAKE DISABLE_HARD_ERRORS=y distcheck echo 'DISABLE_HARD_ERRORS = yes' >> Makefile.am $AUTOMAKE Makefile ./config.status Makefile -VERBOSE=yes $MAKE check && Exit 1 -grep '^FAIL' test-suite.log && Exit 1 +VERBOSE=yes $MAKE check && exit 1 +grep '^FAIL' test-suite.log && exit 1 grep '^ERROR: bar$' sub/test-suite.log echo 'DISABLE_HARD_ERRORS = zardoz' >> sub/Makefile |