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 7a9d8d1aa905eb2a91547f866380c12e07ff6e60..d36bdc7b12e63e1606140cf50d5fa81f437b754b 100644 (file)
--- 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 c01a25a294a81c779c12f76d21b7ac7862707d76..dab0dc80616fa50cf8e094d1016de2b6c167bd23 100644 (file)
--- 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 78365acdc1097a2f032684a969287a25ed3b42d1..3e0f0a658ea207e20285300994b0ade799d470f2 100644 (file)
--- 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 ;;                    \