diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2013-05-23 21:33:03 +0200 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2013-05-23 21:43:32 +0200 |
| commit | b757a99bd3c2d77c319bb7876f0ad324ac3b93a9 (patch) | |
| tree | 229b2ded9b652a8bffb3fc88f9b973d322e50d60 /t/subobj9.sh | |
| parent | ac3a5a12598bb44a6c748964d2ed46eb899dbc04 (diff) | |
| parent | a0db09fe9eb8b03415a5dd00ff031f5a17096108 (diff) | |
| download | automake-b757a99bd3c2d77c319bb7876f0ad324ac3b93a9.tar.gz | |
Merge branch 'master' into ng/master
* master:
tests: avoid few lingering $MAKE redirections
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
tests: remove some code duplication
cosmetics: remove a couple of extra whitespaces in tests
tests: two minor fixups
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Diffstat (limited to 't/subobj9.sh')
| -rw-r--r-- | t/subobj9.sh | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/t/subobj9.sh b/t/subobj9.sh index e7932fe78..681ec8526 100644 --- a/t/subobj9.sh +++ b/t/subobj9.sh @@ -69,15 +69,13 @@ export AUTOCONF AUTOMAKE # Opportunistically check that --tag=CXX is used when supported. if ./libtool --help | grep tag=TAG; then - $MAKE print >stdout || { cat stdout; exit 1; } - cat stdout + run_make -O print grep 'BEG1: .*--tag=CXX.*--mode=compile.* :1END' stdout grep 'BEG2: .*--tag=CXX.*--mode=link.* :2END' stdout fi $MAKE -$MAKE distcheck >output 2>&1 || { cat output; exit 1; } -cat output +run_make -M distcheck # GNU Make used to complain that the Makefile contained two rules # for 'src/.dirstamp' and './/src/.dirstamp'. grep 'overriding commands' output && exit 1 |