From 1072f686df5bb1035620af4a22007feb290d1f12 Mon Sep 17 00:00:00 2001 From: Stefano Lattarini Date: Sun, 7 Aug 2011 23:05:37 +0200 Subject: [PATCH] testsuite: fix another spurious failure on Solaris make * tests/parallel-tests-log-override-recheck.test: Filter make output before grepping it, for make implementations that, like Solaris' one, print the whole of the failed recipe on failure. --- ChangeLog | 7 +++++++ tests/parallel-tests-log-override-recheck.test | 9 +++++++++ 2 files changed, 16 insertions(+) diff --git a/ChangeLog b/ChangeLog index 1f77ef2b4..61e01d0a5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2011-08-07 Stefano Lattarini + + testsuite: fix another spurious failure on Solaris make + * tests/parallel-tests-log-override-recheck.test: Filter make + output before grepping it, for make implementations that, like + Solaris' one, print the whole of the failed recipe on failure. + 2011-08-07 Stefano Lattarini testsuite: fix two spurious failures on Solaris make diff --git a/tests/parallel-tests-log-override-recheck.test b/tests/parallel-tests-log-override-recheck.test index db73718c4..da3bcd287 100755 --- a/tests/parallel-tests-log-override-recheck.test +++ b/tests/parallel-tests-log-override-recheck.test @@ -56,6 +56,13 @@ $ACLOCAL $AUTOCONF $AUTOMAKE -a +# Filter make output before grepping it, for make implementations that, +# like Solaris' one, print the whole of the failed recipe on failure. +filter_stdout () +{ + grep -v 'bases=.*;' stdout > t && mv -f t stdout +} + ./configure $MAKE check >stdout && { cat stdout; Exit 1; } cat stdout @@ -65,6 +72,7 @@ TEST_SUITE_LOG=my.log $MAKE -e recheck >stdout \ && { cat stdout; Exit 1; } cat stdout ls -l +filter_stdout count_test_results total=2 pass=0 fail=1 skip=0 xfail=0 xpass=0 error=1 for x in stdout my.log; do $FGREP foofoo $x && Exit 1 @@ -78,6 +86,7 @@ BAZ_EXIT_STATUS=0 TEST_SUITE_LOG=my2.log $MAKE -e recheck >stdout \ cat stdout ls -l count_test_results total=2 pass=1 fail=0 skip=0 xfail=0 xpass=0 error=1 +filter_stdout $FGREP foofoo stdout && Exit 1 $FGREP barbar stdout $FGREP bazbaz stdout -- 2.47.2