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-nested-vars.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-nested-vars.sh')
| -rw-r--r-- | t/silent-nested-vars.sh | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/t/silent-nested-vars.sh b/t/silent-nested-vars.sh index 7dca05696..611965ea8 100644 --- a/t/silent-nested-vars.sh +++ b/t/silent-nested-vars.sh @@ -116,8 +116,7 @@ grep '^checking whether \./mymake supports nested variables\.\.\. no *$' \ $EGREP 'CC|AM_V|GEN' Makefile # For debugging. grep '^AM_V_CC = *\$(am__v_CC_0) *$' Makefile grep '^AM_V_GEN = *\$(am__v_GEN_0) *$' Makefile -$MAKE >stdout || { cat stdout; exit 1; } -cat stdout +run_make -O $EGREP ' (-c|-o)' stdout && exit 1 grep 'mv ' stdout && exit 1 grep 'echo .*oop' stdout && exit 1 @@ -136,8 +135,7 @@ $EGREP 'CC|AM_V|GEN' Makefile # For debugging. grep '^AM_V_CC = *\$(am__v_CC_1) *$' Makefile grep '^AM_V_GEN = *\$(am__v_GEN_1) *$' Makefile -$MAKE >stdout || { cat stdout; exit 1; } -cat stdout +run_make -O grep ' -c' stdout grep ' -o foo' stdout grep ' -o bar' stdout |