From be0a696aac24a55f8281e9585c87a14138206eb5 Mon Sep 17 00:00:00 2001 From: Stefano Lattarini Date: Fri, 27 Jan 2012 14:14:46 +0100 Subject: [PATCH] tests: avoid possibly undeserved PASS from check8.test * tests/check8.test: Strengthen grepping of "make check" output where we know no problem with VPATH rewrites can take place. This has the advantage of ensuring that we won't match also "sub/bar" when looking for "bar" during the uncolorized tests. Suggestion by Peter Rosin. --- tests/check8.test | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/tests/check8.test b/tests/check8.test index dc8d3dda7..a9e573064 100755 --- a/tests/check8.test +++ b/tests/check8.test @@ -87,12 +87,14 @@ cd build ../configure $MAKE check >stdout && { cat stdout; Exit 1; } cat stdout -# Note: we are not grepping for the space here, due to the Solaris make VPATH -# rewriting (if we fix that, we can still write a separate test for it). +# Note: we are not grepping for the space in the lines from the 'foo' +# tests, due to the Solaris make VPATH rewriting (if we fix that, we +# can still write a separate test for it). grep 'XPASS.*foo$' stdout grep '^[^X]*PASS.*sub/foo$' stdout -grep '^[^X]*PASS.*bar' stdout -grep '^[^X]*PASS.*sub/bar' stdout -grep '^[^X]*FAIL.*baz' stdout -grep 'XFAIL.*sub/baz' stdout +grep '^[^X]*PASS.* bar' stdout +grep '^[^X]*PASS.* sub/bar' stdout +grep '^[^X]*FAIL.* baz' stdout +grep 'XFAIL.* sub/baz' stdout + : -- 2.11.4.GIT