diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2013-05-23 12:10:18 +0200 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2013-05-23 20:09:29 +0200 |
| commit | 3ce4015f1bfff6277840502b080cfd2b22e05870 (patch) | |
| tree | 11d32069669ef2dd551ff22ac022722bf37fb2e1 /t/tap-recheck.sh | |
| parent | e2a000cc181b4a66564b8378cad6843d1938f80a (diff) | |
| download | automake-3ce4015f1bfff6277840502b080cfd2b22e05870.tar.gz | |
tests: avoid '$MAKE' redirections, use 'run_make' instead
The use 'run_make' with the -E, -O and -M option, it is more
idiomatic now. Also, this way, centralized fixes and improvements
done in 'run_make' will automatically propagate through most of
the testsuite.
* syntax-checks.mk (sc_tests_no_run_make_redirect): Also check against
'$MAKE' invocations that uses output redirections (and not only against
'run_make' invocation that do so).
* Several tests: Adjust (and few minor cosmetic changes as well, while
at it).
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Diffstat (limited to 't/tap-recheck.sh')
| -rw-r--r-- | t/tap-recheck.sh | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/t/tap-recheck.sh b/t/tap-recheck.sh index 481f46c2d..4a8bbc4cd 100644 --- a/t/tap-recheck.sh +++ b/t/tap-recheck.sh @@ -85,13 +85,13 @@ $AUTOMAKE do_recheck () { case $* in - --fail) on_bad_rc='&&';; - --pass) on_bad_rc='||';; + --fail) status=FAIL;; + --pass) status=0;; *) fatal_ "invalid usage of function 'do_recheck'";; esac rm -f *.run - eval "\$MAKE recheck >stdout $on_bad_rc { cat stdout; ls -l; exit 1; }; :" - cat stdout; ls -l + run_make -O -e $status recheck || { ls -l; exit 1; } + ls -l } for vpath in : false; do @@ -119,8 +119,7 @@ for vpath in : false; do count_test_results total=0 pass=0 fail=0 xpass=0 xfail=0 skip=0 error=0 : Run the tests for the first time. - $MAKE check >stdout && { cat stdout; exit 1; } - cat stdout + run_make -O -e FAIL check ls -l # All the test scripts should have run. test -f a.run |