diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-04-14 10:03:38 +0200 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-04-14 10:40:44 +0200 |
| commit | d0eb9120eabaf7aa8f381b1fab712bd772c59785 (patch) | |
| tree | fe3a9f5db20dc35f84247e850a1473f28c0e889b /t/distcheck-pr9579.sh | |
| parent | bf0c63d0a0233f20aef5fff4bf1bb33302276eca (diff) | |
| download | automake-d0eb9120eabaf7aa8f381b1fab712bd772c59785.tar.gz | |
[ng] tests: prefer to grep make stderr for expected diagnostic
Few make implementations, like BSD's, can print diagnostic from make or
its spawned recipes on stdout rather than on stderr. Some of our tests
had been relaxed to cater for this. Now that we assume GNU make, there
is no reason to be this "sloppy" anymore.
* t/uninstall-fail.sh: Expect diagnostic from make and its recipes
to be on stderr, not possibly also on stdout.
* t/lisp3.sh: Likewise.
* t/test-missing.sh: Likewise.
* t/test-missing2.sh: Likewise.
* t/distcheck-pr10470.sh: Likewise.
* t/distcheck-pr9579.sh: Likewise.
* t/dist-missing-am.sh: Likewise.
* t/dist-missing-included-m4.sh: Likewise.
* t/dist-missing-m4.sh: Likewise.
* t/deleted-am.sh: Likewise.
* t/deleted-m4.sh: Likewise.
* t/distcheck-configure-flags-am.sh: Likewise.
* t/distcheck-configure-flags-subpkg.sh: Likewise.
* t/distcheck-configure-flags.sh: Likewise.
* t/yacc-dist-nobuild.sh: Likewise. Also, be stricter in matching
expected make diagnostic.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Diffstat (limited to 't/distcheck-pr9579.sh')
| -rwxr-xr-x | t/distcheck-pr9579.sh | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/t/distcheck-pr9579.sh b/t/distcheck-pr9579.sh index 8c789001e..fb8e4054a 100755 --- a/t/distcheck-pr9579.sh +++ b/t/distcheck-pr9579.sh @@ -54,11 +54,11 @@ $MAKE uninstall test -f inst/share/dir rm -rf inst -$MAKE distcheck >output 2>&1 && { cat output; Exit 1; } -cat output +$MAKE distcheck 2>stderr && { cat stderr >&2; Exit 1; } +cat stderr >&2 -$FGREP 'ERROR: files left after uninstall:' output -grep '/share/dir *$' output +grep 'ERROR: files left after uninstall:' stderr +grep '/share/dir *$' stderr # A few trickier corner cases. @@ -86,11 +86,11 @@ test -f inst/mu/share/info/dir test -f inst/share/info/more/dir rm -rf inst -$MAKE distcheck >output 2>&1 && { cat output; Exit 1; } -cat output +$MAKE distcheck 2>stderr && { cat stderr >&2; Exit 1; } +cat stderr >&2 -$FGREP 'ERROR: files left after uninstall:' output -grep '/mu/share/info/dir *$' output -grep '/share/info/more/dir *$' output +grep 'ERROR: files left after uninstall:' stderr +grep '/mu/share/info/dir *$' stderr +grep '/share/info/more/dir *$' stderr : |