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/silent-lex.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/silent-lex.sh')
| -rw-r--r-- | t/silent-lex.sh | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/t/silent-lex.sh b/t/silent-lex.sh index 320e91f1d..3bfc40029 100644 --- a/t/silent-lex.sh +++ b/t/silent-lex.sh @@ -73,8 +73,7 @@ $FGREP 'bar2-bar.c' sub/Makefile.in || exit 99 ./configure --enable-silent-rules -$MAKE >stdout || { cat stdout; exit 1; } -cat stdout +run_make -O $EGREP ' (-c|-o)' stdout && exit 1 $EGREP '(mv|ylwrap) ' stdout && exit 1 @@ -93,8 +92,7 @@ grep 'CCLD .*bar2' stdout # different set of rules. $MAKE clean -$MAKE >stdout || { cat stdout; exit 1; } -cat stdout +run_make -O $EGREP ' (-c|-o)' stdout && exit 1 $EGREP '(mv|ylwrap) ' stdout && exit 1 @@ -111,8 +109,7 @@ grep 'CCLD .*bar2' stdout $MAKE clean rm -f *foo.c sub/*bar.c -$MAKE V=1 >stdout || { cat stdout; exit 1; } -cat stdout +run_make -O V=1 grep ' -c ' stdout grep ' -o ' stdout @@ -125,8 +122,7 @@ $EGREP '(LEX|CC|CCLD) ' stdout && exit 1 # different set of rules. $MAKE clean -$MAKE V=1 >stdout || { cat stdout; exit 1; } -cat stdout +run_make -O V=1 # Don't look for ylwrap, as probably lex hasn't been re-run. grep ' -c ' stdout |