diff options
author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2013-05-22 23:29:47 +0200 |
---|---|---|
committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2013-05-22 23:59:56 +0200 |
commit | e2a000cc181b4a66564b8378cad6843d1938f80a (patch) | |
tree | 4072c641c3cb1c1b07fcee0515c886c661763fc1 /t/parallel-tests-basics.sh | |
parent | 20963917dd4c0591f2983bd6a94426361bd53fa5 (diff) | |
download | automake-e2a000cc181b4a66564b8378cad6843d1938f80a.tar.gz |
tests: avoid use of redirected 'run_make' invocations
Instead, properly use the -E, -O, or -M options of run_make.
The occurrences of the 'run_make' invocations using output
redirection has been found by the recently-introduced maintainer
check 'sc_tests_no_run_make_redirect'.
* t/ax/tap-summary-aux.sh: Adjust.
* t/ax/testsuite-summary-checks.sh: Likewise.
* Several other tests: Likewise.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
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 4d0fe9502..dbd7ac8a0 100644 --- a/t/parallel-tests-basics.sh +++ b/t/parallel-tests-basics.sh @@ -87,8 +87,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 @@ -103,8 +102,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 RECHECK_LOGS= check > stdout && { cat stdout; exit 1; } -cat stdout +run_make -O -e FAIL check RECHECK_LOGS= test -f foo.log grep '^PASS: foo\.test$' stdout grep bar.test stdout && exit 1 @@ -115,8 +113,7 @@ grep '^# ERROR: *1$' stdout # Now, explicitly retry with all test logs already updated, and ensure # that the summary is still displayed. -run_make RECHECK_LOGS= check > stdout && { cat stdout; exit 1; } -cat stdout +run_make -O -e FAIL check RECHECK_LOGS= grep foo.test stdout && exit 1 grep bar.test stdout && exit 1 grep baz.test stdout && exit 1 @@ -125,8 +122,7 @@ grep '^# FAIL: *1$' stdout grep '^# ERROR: *1$' stdout # Lazily rerunning only foo should only rerun this one test. -run_make RECHECK_LOGS=foo.log check > stdout && { cat stdout; exit 1; } -cat stdout +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 @@ -135,15 +131,13 @@ grep '^# FAIL: *1$' stdout grep '^# ERROR: *1$' stdout $MAKE clean -run_make TEST_LOGS=baz.log check > stdout && { cat stdout; exit 1; } -cat stdout +run_make -O -e FAIL TEST_LOGS=baz.log check grep foo.test stdout && exit 1 grep bar.test stdout && exit 1 grep baz.test stdout $MAKE clean -run_make TESTS=baz.test check > 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 |