Another spurious failure in one of my testcases fixed (this failure was triggered only by make implementations that perform VPATH-rewriting, such as Solaris or Heirloom make).
Patch applied to a temporary branch based off of the offending commit, merged to maint and master, and pushed. Sorry for the noise, Stefano
From 8b3470c0ed6070f6b8d7ce7878284aa0c08aac13 Mon Sep 17 00:00:00 2001 From: Stefano Lattarini <[email protected]> Date: Sun, 24 Apr 2011 10:22:05 +0200 Subject: [PATCH] tests: fix spurious failure in a test on TESTS (VPATH-related) * check-tests-in-builddir.test: When not using the parallel-tests option, do not check that VPATH components are not present in the displayed test name, since the simple-tests driver do not try to strip them. --- ChangeLog | 8 ++++++++ tests/check-tests-in-builddir.test | 19 +++++++++++++++---- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3750915..e19021c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2011-04-24 Stefano Lattarini <[email protected]> + + tests: fix spurious failure in a test on TESTS (VPATH-related) + * check-tests-in-builddir.test: When not using the parallel-tests + option, do not check that VPATH components are not present in the + displayed test name, since the simple-tests driver do not try to + strip them. + 2011-02-06 Stefano Lattarini <[email protected]> tests: tweak few tests on simple and parallel test drivers diff --git a/tests/check-tests-in-builddir.test b/tests/check-tests-in-builddir.test index 2d0e423..b588f11 100755 --- a/tests/check-tests-in-builddir.test +++ b/tests/check-tests-in-builddir.test @@ -55,16 +55,27 @@ chmod a+x bar.test $MAKE check >out 2>&1 || { cat out; Exit1; } cat out -grep '\.\./foo' out && Exit 1 -grep '^PASS: foo.test *$' out +# The simple-tests driver does not strip VPATH components from +# the name of the test, but the parallel-tests driver should. +if test x"$parallel_tests" = x"yes"; then + grep '\.\./foo' out && Exit 1 + grep '^PASS: foo.test *$' out +else + grep '^PASS: .*foo.test *$' out +fi grep '^PASS: bar.test *$' out rm -f test-suite.log foo.log bar.log FOO_EXIT_STATUS=1 $MAKE check >out 2>&1 && { cat out; Exit1; } cat out -grep '\.\./foo' out && Exit 1 -grep '^FAIL: foo.test *$' out +# See comments above. +if test x"$parallel_tests" = x"yes"; then + grep '\.\./foo' out && Exit 1 + grep '^FAIL: foo.test *$' out +else + grep '^FAIL: .*foo.test *$' out +fi grep '^PASS: bar.test *$' out rm -f test-suite.log foo.log bar.log -- 1.7.2.3
