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-diagnostic.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-diagnostic.sh')
| -rw-r--r-- | t/tap-diagnostic.sh | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/t/tap-diagnostic.sh b/t/tap-diagnostic.sh index 96b2a3dd3..23efdd4ba 100644 --- a/t/tap-diagnostic.sh +++ b/t/tap-diagnostic.sh @@ -52,14 +52,12 @@ PASS: all.test 4 - zardoz # all.test: Shell metacharacters here: $metacharacters END -$MAKE check >stdout || { cat stdout; exit 1; } -cat stdout +run_make -O check $EGREP -i "#.*all\\.test|a comment|(Tests|Shell) " stdout && exit 1 count_test_results total=4 pass=2 fail=0 xpass=0 xfail=1 skip=1 error=0 echo 'AM_TEST_LOG_DRIVER_FLAGS = --comments' >> Makefile -$MAKE check >stdout || { cat stdout; exit 1; } -cat stdout +run_make -O check $FGREP ' all.test' stdout > got cat exp cat got @@ -86,8 +84,7 @@ ok #TODO END -$MAKE check >stdout || { cat stdout; exit 1; } -cat stdout +run_make -O check count_test_results total=1 pass=1 fail=0 xpass=0 xfail=0 skip=0 error=0 # Diagnostic without leading whitespace, or with extra leading whitespace, @@ -107,8 +104,7 @@ ok 1 # ${tab} ${tab}${tab}foo bar${tab}baz ${tab} END -$MAKE check >stdout || { cat stdout; exit 1; } -cat stdout +run_make -O check count_test_results total=1 pass=1 fail=0 xpass=0 xfail=0 skip=0 error=0 grep "^# all.test:${ws0p}foo$" stdout |