diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2013-05-23 20:12:17 +0200 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2013-05-23 20:12:17 +0200 |
| commit | 86e45fe19374b87b6a9adaeb3ecc93e51c7d54a7 (patch) | |
| tree | e692ec2434926772c17accc76e7581f972b8e976 /t/check8.sh | |
| parent | 8d7108702485dca61841a642202b892f8038e15c (diff) | |
| parent | 3ce4015f1bfff6277840502b080cfd2b22e05870 (diff) | |
| download | automake-86e45fe19374b87b6a9adaeb3ecc93e51c7d54a7.tar.gz | |
Merge branch 'micro' into maint
* micro:
tests: avoid '$MAKE' redirections, use 'run_make' instead
tests: avoid use of redirected 'run_make' invocations
lint: warn against redirected 'run_make' invocations
comments: next GNU make release 4.0, not 3.83
tests: fix a potential spurious failure due to global config.site
HACKING: it's OK to do testsuite refactoring in a micro version
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 743d1bd00..41fe30796 100644 --- a/t/check8.sh +++ b/t/check8.sh @@ -64,10 +64,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 @@ -84,8 +81,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). |