diff options
Diffstat (limited to 't/parallel-tests-basics.sh')
| -rw-r--r-- | t/parallel-tests-basics.sh | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/t/parallel-tests-basics.sh b/t/parallel-tests-basics.sh index 036d5e5c6..ac361963d 100644 --- a/t/parallel-tests-basics.sh +++ b/t/parallel-tests-basics.sh @@ -58,8 +58,7 @@ $AUTOMAKE -a ./configure -$MAKE check >stdout && { cat stdout; exit 1; } -cat stdout +run_make -O -e FAIL check 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 @@ -81,8 +80,7 @@ test ! -e 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. -run_make TESTS='bar.test' check >stdout && { cat stdout; exit 1; } -cat stdout +run_make -O -e FAIL TESTS='bar.test' check grep '^FAIL: baz\.test$' stdout grep '^ERROR: bar\.test$' stdout @@ -97,8 +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 check AM_LAZY_CHECK=yes > stdout && { cat stdout; exit 1; } -cat stdout +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 @@ -109,8 +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 check AM_LAZY_CHECK=yes > stdout && { cat stdout; exit 1; } -cat stdout +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 @@ -119,15 +115,13 @@ grep '^# FAIL: *1$' stdout grep '^# ERROR: *1$' stdout $MAKE clean -run_make check TESTS=baz > stdout && { cat stdout; exit 1; } -cat stdout +run_make -O -e FAIL check TESTS=baz grep foo.test stdout && exit 1 grep bar.test stdout && exit 1 grep baz.test stdout $MAKE clean -run_make check TESTS=baz.test > stdout && { cat stdout; exit 1; } -cat stdout +run_make -O -e FAIL TESTS=baz.test check grep foo.test stdout && exit 1 grep bar.test stdout && exit 1 grep baz.test stdout |