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/check8.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/check8.sh')
| -rw-r--r-- | t/check8.sh | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/t/check8.sh b/t/check8.sh index a48614764..2586c0b7e 100644 --- a/t/check8.sh +++ b/t/check8.sh @@ -65,10 +65,7 @@ $AUTOCONF $AUTOMAKE -a ./configure -AM_COLOR_TESTS=always $MAKE check >stdout 2>stderr && - { cat stdout; cat stderr >&2; exit 1; } -cat stdout -cat stderr >&2 +run_make -E -O -e FAIL check grep 'XPASS.* foo$' stdout grep '^[^X]*PASS.* sub/foo$' stdout grep '^[^X]*PASS.* bar' stdout @@ -85,8 +82,7 @@ $MAKE distclean mkdir build cd build ../configure -$MAKE check >stdout && { cat stdout; exit 1; } -cat stdout +run_make -O -e FAIL check # Note: we are not grepping for the space in the lines from the 'foo' # tests, due to the Solaris make VPATH rewriting (if we fix that, we # can still write a separate test for it). |