* lib/am/check.am (check-TESTS): Fix matching of XFAIL_TESTS

against currently running test for the first and last element
of $(TESTS): add spacing so Solaris make does VPATH expansion
on these words, too.
* tests/check6.test: Update.

diff --git a/ChangeLog b/ChangeLog
index 68acb6f8011eb7459203ff8fa6ce712251294438..df888d5978f1ba4b43741c080c41b5a839ec96a1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-09-01  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       * lib/am/check.am (check-TESTS): Fix matching of XFAIL_TESTS
+       against currently running test for the first and last element
+       of $(TESTS): add spacing so Solaris make does VPATH expansion
+       on these words, too.
+       * tests/check6.test: Update.
+
 2006-08-30  Paul Eggert  <eggert@cs.ucla.edu>
 
        For PR automake/501:

diff --git a/lib/am/check.am b/lib/am/check.am
index 7c23ab77d49c4878adf9b902db6a390617359ccb..61c3031804518af3ef3f5129af77bf02c945dea0 100644 (file)
--- a/lib/am/check.am
+++ b/lib/am/check.am
@@ -21,7 +21,9 @@
 check-TESTS: $(TESTS)
        @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[        ]'; \
        srcdir=$(srcdir); export srcdir; \
-       list='$(TESTS)'; \
+## Make sure Solaris VPATH-expands all members of this list, even
+## the first and the last one; thus the spaces around $(TESTS)
+       list=' $(TESTS) '; \
        if test -n "$$list"; then \
          for tst in $$list; do \
            if test -f ./$$tst; then dir=./; \

diff --git a/tests/check6.test b/tests/check6.test
index 81fb0088f144eed3fee1aa0e6ea29e274975b332..973713b7b77b61aa56c4b08d547f245e403d3e14 100755 (executable)
--- a/tests/check6.test
+++ b/tests/check6.test
@@ -19,6 +19,7 @@
 # Boston, MA 02110-1301, USA.
 
 # Test for PR 400: XFAIL_TESTS delimited by TABs.
+# Also test that Solaris make VPATH rewriting is honored
 
 . ./defs || exit 1
 
@@ -50,3 +51,8 @@ $AUTOMAKE -a
 
 ./configure
 $MAKE check
+$MAKE distclean
+mkdir build
+cd build
+../configure
+$MAKE check