From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Tue, 10 Mar 2009 21:02:15 +0000 (+0100)
Subject: Match XFAIL_TESTS correctly with Solaris make.
X-Git-Tag: v1.10b~6^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f6cc7d0fa6ce0a0bb64c42f79f2a840f39aab7d2;p=thirdparty%2Fautomake.git

Match XFAIL_TESTS correctly with Solaris make.

* lib/am/check.am [PARALLEL_TESTS]: VPATH rewriting may have
changed test names, so srcdir needs to be taken into account
explicitly when checking against the list of tests expected
to fail.  Fixes spurious FAILures from XFAIL_TESTS.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
---

diff --git a/ChangeLog b/ChangeLog
index 7a9d8d1aa..d36bdc7b1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2009-03-10  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
+	Match XFAIL_TESTS correctly with Solaris make.
+	* lib/am/check.am [PARALLEL_TESTS]: VPATH rewriting may have
+	changed test names, so srcdir needs to be taken into account
+	explicitly when checking against the list of tests expected
+	to fail.  Fixes spurious FAILures from XFAIL_TESTS.
+
 	Use append mode to capture parallel test output.
 	* tests/lisp8.test: Use append mode for output from `make -j',
 	to avoid dropped lines.
diff --git a/lib/am/check.am b/lib/am/check.am
index c01a25a29..dab0dc806 100644
--- a/lib/am/check.am
+++ b/lib/am/check.am
@@ -121,11 +121,10 @@ fi;							\
 TERM=$$__SAVED_TERM; export TERM;			\
 $(am__tty_colors);					\
 xfailed=PASS;						\
-for xfail in : $(XFAIL_TESTS); do			\
-  case $$f in						\
-    $$xfail | $(srcdir)/$$xfail) xfailed=XFAIL; break;	\
-  esac;							\
-done;							\
+case " $(XFAIL_TESTS) " in				\
+  *[\ \	]$$f[\ \	]* | *[\ \	]$$dir$$f[\ \	]*) \
+    xfailed=XFAIL;;					\
+esac;							\
 case $$estatus:$$xfailed in				\
     0:XFAIL) col=$$red; res=XPASS;;			\
     0:*)     col=$$grn; res=PASS ;;			\
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 78365acdc..3e0f0a658 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -989,11 +989,10 @@ fi;							\
 TERM=$$__SAVED_TERM; export TERM;			\
 $(am__tty_colors);					\
 xfailed=PASS;						\
-for xfail in : $(XFAIL_TESTS); do			\
-  case $$f in						\
-    $$xfail | $(srcdir)/$$xfail) xfailed=XFAIL; break;	\
-  esac;							\
-done;							\
+case " $(XFAIL_TESTS) " in				\
+  *[\ \	]$$f[\ \	]* | *[\ \	]$$dir$$f[\ \	]*) \
+    xfailed=XFAIL;;					\
+esac;							\
 case $$estatus:$$xfailed in				\
     0:XFAIL) col=$$red; res=XPASS;;			\
     0:*)     col=$$grn; res=PASS ;;			\