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/check4.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/check4.sh')
-rw-r--r-- | t/check4.sh | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/t/check4.sh b/t/check4.sh index dc34a386b..42a7b0c48 100644 --- a/t/check4.sh +++ b/t/check4.sh @@ -51,21 +51,18 @@ $AUTOMAKE --add-missing ./configure --prefix "$(pwd)/inst" -$MAKE check >stdout && { cat stdout; exit 1; } -cat stdout +run_make -O -e FAIL -- check grep '^FAIL: fail\.sh *$' stdout grep '^PASS: ok\.sh *$' stdout && exit 1 # The exit status of 'make -k' can be anything # (depending on the Make implementation) -$MAKE -k check >stdout || : -cat stdout +run_make -O -e IGNORE -- -k check grep '^FAIL: fail\.sh *$' stdout grep '^PASS: ok\.sh *$' stdout # Should also works when -k is not in first position. -$MAKE -s -k check >stdout || : -cat stdout +run_make -O -e IGNORE -- -s -k check grep '^FAIL: fail\.sh *' stdout grep '^PASS: ok\.sh *' stdout @@ -75,8 +72,7 @@ if using_gmake; then # Try with a long-option that do not have a short option equivalent # (here, --no-print-directory). That should cause all options to # appear verbatim in MAKEFLAGS. - $MAKE --no-print-directory -k check >stdout || : - cat stdout + run_make -e FAIL -O -- --no-print-directory -k check grep '^FAIL: fail\.sh *$' stdout grep '^PASS: ok\.sh *$' stdout fi |