From b96d850ae6e35ecc96babc232aa7622adeece0ee Mon Sep 17 00:00:00 2001 From: Stefano Lattarini Date: Tue, 3 May 2011 18:24:29 +0200 Subject: [PATCH] tests: ensure verbose printing of captured make output * tests/libtool7.test: Ensure verbose printing of captured make output. * tests/libtool9.test: Likewise. --- ChangeLog | 7 +++++++ tests/libtool7.test | 15 ++++++++++++--- tests/libtool9.test | 2 +- 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index a5354c135..82ad26b1c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2011-05-03 Stefano Lattarini + + tests: ensure verbose printing of captured make output + * tests/libtool7.test: Ensure verbose printing of captured + make output. + * tests/libtool9.test: Likewise. + 2011-05-03 Stefano Lattarini tests: fix spurious failure in 'color2.test' diff --git a/tests/libtool7.test b/tests/libtool7.test index afa9b1c57..970062862 100755 --- a/tests/libtool7.test +++ b/tests/libtool7.test @@ -80,7 +80,10 @@ $AUTOCONF $AUTOMAKE --add-missing --copy ./configure "--prefix=`pwd`/_inst" -env LIBTOOLFLAGS=--silent $MAKE print >output 2>&1 +env LIBTOOLFLAGS=--silent $MAKE print >output 2>&1 || { + cat output + Exit 1 +} cat output grep '1BEG: libmod1.la mod2.la :END1' output grep '2BEG: mod2.la :END2' output @@ -88,11 +91,17 @@ grep '3BEG: .*silent.*silent.* :END3' output test 2 -le `grep mod2_la_LIBTOOLFLAGS Makefile | wc -l` $MAKE -env LIBTOOLFLAGS=--silent $MAKE install >output 2>&1 +env LIBTOOLFLAGS=--silent $MAKE install >output 2>&1 || { + cat output + Exit 1 +} cat output grep 'silent.*silent.*prg' output grep 'silent.*silent.*libmod1' output -env LIBTOOLFLAGS=--silent $MAKE uninstall >output 2>&1 +env LIBTOOLFLAGS=--silent $MAKE uninstall >output 2>&1 || { + cat output + Exit 1 +} cat output grep 'silent.*silent.*libmod1' output diff --git a/tests/libtool9.test b/tests/libtool9.test index ab03f580a..46009c146 100755 --- a/tests/libtool9.test +++ b/tests/libtool9.test @@ -88,7 +88,7 @@ $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 + $MAKE -e print >output 2>&1 || { cat output; Exit 1; } cat output grep '1BEG: libmod1.la mod2.la :END1' output grep '2BEG: mod2.la :END2' output -- 2.47.2