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/silent-texi.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/silent-texi.sh')
| -rw-r--r-- | t/silent-texi.sh | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/t/silent-texi.sh b/t/silent-texi.sh index cbc6813b9..dc425a877 100644 --- a/t/silent-texi.sh +++ b/t/silent-texi.sh @@ -47,11 +47,7 @@ $AUTOCONF ./configure --disable-silent-rules # Silent mode output. -st=0 -$MAKE V=0 dvi html info ps pdf >stdout 2>stderr || st=$? -cat stdout -cat stderr >&2 -test $st -eq 0 +run_make -O -E -- V=0 dvi html info ps pdf grep '^ DVIPS foo\.ps$' stdout grep '^ MAKEINFO foo\.html$' stdout # NetBSD make will print './foo.info' instead of 'foo.info'. @@ -73,8 +69,7 @@ $EGREP '(zardoz|foo)\.log|3\.14|Copyright|This is|[Oo]utput ' \ # Verbose mode output. $MAKE clean || exit 1 -$MAKE V=1 dvi html info ps pdf >output 2>&1 || { cat output; exit 1; } -cat output +run_make -M V=1 dvi html info ps pdf $EGREP '(DVIPS|MAKEINFO|TEXI2(PDF|DVI)) ' output && exit 1 # Verbose output from TeX. grep '[Oo]utput .*foo\.pdf' output |