diff options
Diffstat (limited to 't/parallel-tests-basics.sh')
| -rw-r--r-- | t/parallel-tests-basics.sh | 25 |
1 files changed, 5 insertions, 20 deletions
diff --git a/t/parallel-tests-basics.sh b/t/parallel-tests-basics.sh index fc393df98..4e7c721a1 100644 --- a/t/parallel-tests-basics.sh +++ b/t/parallel-tests-basics.sh @@ -19,9 +19,8 @@ # - log files, and what goes in 'test-suite.log' # - make clean # - dependencies between tests -# - TESTS redefinition at runtime -# - TEST_LOGS redefinition at runtime -# - RECHECK_LOGS redefinition at runtime +# - TESTS redefinition at runtime (with and without test suffixes) +# - AM_LAZY_CHECK . test-init.sh @@ -36,19 +35,14 @@ foo.log: bar.log bar.log: baz.log END -# foo.test and bar.test sleep to ensure their logs are always strictly newer -# than the logs of their prerequisites, for HP-UX make. The quoting pleases -# maintainer-check. cat > foo.test <<'END' #! /bin/sh echo "this is $0" -sleep '1' exit 0 END cat > bar.test <<'END' #! /bin/sh echo "this is $0" -sleep '1' exit 99 END cat > baz.test <<'END' @@ -101,7 +95,7 @@ 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. -run_make -O -e FAIL check RECHECK_LOGS= +run_make -O -e FAIL check AM_LAZY_CHECK=yes test -f foo.log grep '^PASS: foo\.test$' stdout grep bar.test stdout && exit 1 @@ -112,7 +106,7 @@ grep '^# ERROR: *1$' stdout # Now, explicitly retry with all test logs already updated, and ensure # that the summary is still displayed. -run_make -O -e FAIL check RECHECK_LOGS= +run_make -O -e FAIL check AM_LAZY_CHECK=yes grep foo.test stdout && exit 1 grep bar.test stdout && exit 1 grep baz.test stdout && exit 1 @@ -120,17 +114,8 @@ grep '^# PASS: *1$' stdout grep '^# FAIL: *1$' stdout grep '^# ERROR: *1$' stdout -# Lazily rerunning only foo should only rerun this one test. -run_make -O -e FAIL check RECHECK_LOGS=foo.log -grep foo.test stdout -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 -run_make -O -e FAIL TEST_LOGS=baz.log check +run_make -O -e FAIL check TESTS=baz grep foo.test stdout && exit 1 grep bar.test stdout && exit 1 grep baz.test stdout |