From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Fri, 1 Sep 2006 16:10:21 +0000 (+0000)
Subject: * lib/am/check.am (check-TESTS): Fix matching of XFAIL_TESTS
X-Git-Tag: Release-1-10~22
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f4c3177a0e6220f34562f3af37311423291efe7c;p=thirdparty%2Fautomake.git

* 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 68acb6f80..df888d597 100644
--- 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 7c23ab77d..61c303180 100644
--- 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 81fb0088f..973713b7b 100755
--- 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