diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2013-05-22 00:09:30 +0200 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2013-05-22 00:09:30 +0200 |
| commit | 4d56c0f3b5973e386c3e5f0fb2367d2fff00bf71 (patch) | |
| tree | f0a26a6c57a6018c9405ce3a22ab9eddad70309d /t/libtool9.sh | |
| parent | 60bfe0b9af62baae3498fe8688703570ecb1a93e (diff) | |
| parent | c7cfa09349bb588b71ea7adffa385034465b1b09 (diff) | |
| download | automake-4d56c0f3b5973e386c3e5f0fb2367d2fff00bf71.tar.gz | |
Merge branch 'micro' into maint
* micro:
tests: run_make: options to do command redirection
tests: only activate 'unset' alias if required
tests: better idiom to override make macro defs on the cmdline
test-lib: minor style changes
test-lib: fix botched function name in an error message
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Diffstat (limited to 't/libtool9.sh')
| -rw-r--r-- | t/libtool9.sh | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/t/libtool9.sh b/t/libtool9.sh index bb6ac87d9..69bd72c08 100644 --- a/t/libtool9.sh +++ b/t/libtool9.sh @@ -84,9 +84,14 @@ $AUTOCONF $AUTOMAKE --add-missing --copy ./configure -env LDFLAGS=ldflags AM_LDFLAGS=am_ldflags libmod1_la_LDFLAGS=lm1_la_ldflags \ - CFLAGS=cflags AM_CFLAGS=am_cflags prg2_CFLAGS=prg2_cflags \ - $MAKE -e print >output 2>&1 || { cat output; exit 1; } +run_make \ + LDFLAGS=ldflags \ + AM_LDFLAGS=am_ldflags \ + libmod1_la_LDFLAGS=lm1_la_ldflags \ + CFLAGS=cflags \ + AM_CFLAGS=am_cflags \ + prg2_CFLAGS=prg2_cflags \ + print >output 2>&1 || { cat output; exit 1; } cat output grep '1BEG: libmod1.la mod2.la :END1' output grep '2BEG: mod2.la :END2' output |