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/ax/depcomp.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/ax/depcomp.sh')
| -rw-r--r-- | t/ax/depcomp.sh | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/t/ax/depcomp.sh b/t/ax/depcomp.sh index 1534d5f8e..03b0b7e17 100644 --- a/t/ax/depcomp.sh +++ b/t/ax/depcomp.sh @@ -160,8 +160,7 @@ case $depcomp_with_libtool in echo lib_LTLIBRARIES = libfoo.la >> Makefile.am make_ok () { - $MAKE ${1+"$@"} >output 2>&1 || { cat output; return 1; } - cat output + run_make -M -- ${1+"$@"} $FGREP 'unknown directive' output && return 1 rm -f output # Checks for stray files possibly left around by less common |