From fd2df9a9478fbab1464ac4b96a10b12dce100951 Mon Sep 17 00:00:00 2001
From: David Lichteblau <david@lichteblau.com>
Date: Sun, 20 Apr 2008 18:18:52 +0200
Subject: [PATCH] Test pathname workaround

---
 TEST      | 14 ++++----------
 test.lisp |  7 ++++++-
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/TEST b/TEST
index 1a9d6b8..2f33007 100644
--- a/TEST
+++ b/TEST
@@ -12196,9 +12196,7 @@ PASS Elements__89113 [XSLT-Result-Tree]
   Expected output (1): MSFT_Conformance_Tests/Elements/Elements__89113.saxon
   Actual output: MSFT_Conformance_Tests/Elements/Elements__89113.xuriella
 
-FAIL Elements__89171 [XSLT-Result-Tree]: condition of incorrect type: 
-error opening #P"...MSFT_Conformance_Tests/Elements/Plants.xml":
-  No such file or directory
+PASS Elements__89171 [XSLT-Result-Tree]
   Stylesheet: MSFT_Conformance_Tests/Elements/ek-b-repeat.noindent-xsl
   Data: MSFT_Conformance_Tests/Elements/Plants.xml
   Expected output (1): MSFT_Conformance_Tests/Elements/Elements__89171.saxon
@@ -12210,17 +12208,13 @@ PASS Elements__89172 [XSLT-Result-Tree]: raised an xslt-error as expected
   Expected output (1): MSFT_Conformance_Tests/Elements/Elements__89172.saxon
   Actual output: MSFT_Conformance_Tests/Elements/Elements__89172.xuriella
 
-FAIL Elements__89175 [XSLT-Result-Tree]: condition of incorrect type: 
-error opening #P"...MSFT_Conformance_Tests/Elements/Plants.xml":
-  No such file or directory
+PASS Elements__89175 [XSLT-Result-Tree]
   Stylesheet: MSFT_Conformance_Tests/Elements/ek-b-copy.noindent-xsl
   Data: MSFT_Conformance_Tests/Elements/Plants.xml
   Expected output (1): MSFT_Conformance_Tests/Elements/Elements__89175.saxon
   Actual output: MSFT_Conformance_Tests/Elements/Elements__89175.xuriella
 
-FAIL Elements__89177 [XSLT-Result-Tree]: condition of incorrect type: 
-error opening #P"...MSFT_Conformance_Tests/Elements/Plants.xml":
-  No such file or directory
+PASS Elements__89177 [XSLT-Result-Tree]
   Stylesheet: MSFT_Conformance_Tests/Elements/ek-b-attribute.noindent-xsl
   Data: MSFT_Conformance_Tests/Elements/Plants.xml
   Expected output (1): MSFT_Conformance_Tests/Elements/Elements__89177.saxon
@@ -19441,4 +19435,4 @@ PASS XSLTFunctions_DocumentFuncWithEmptyArg [Mixed]
   Expected output (1): MSFT_Conformance_Tests/XSLTFunctions/XSLTFunctions_DocumentFuncWithEmptyArg.saxon
   Actual output: MSFT_Conformance_Tests/XSLTFunctions/XSLTFunctions_DocumentFuncWithEmptyArg.xuriella
 
-Passed 2854/3080 tests (3 expected failures, 223 unexpected failures).
+Passed 2857/3080 tests (3 expected failures, 220 unexpected failures).
diff --git a/test.lisp b/test.lisp
index 8eff326..fa836af 100644
--- a/test.lisp
+++ b/test.lisp
@@ -824,7 +824,12 @@
                                      (when (find-restart 'recover)
                                        (invoke-restart 'recover)))))
                      (apply-stylesheet (pathname (test-stylesheet-pathname test))
-                                       (pathname (test-data-pathname test))
+                                       (let ((p (test-data-pathname test)))
+                                         (if (search "Elements/Plants.xml" p)
+                                             (merge-pathnames
+                                              "MSFT_Conformance_Tests/Elements/plants.xml"
+                                              *tests-directory*)
+                                             (pathname p)))
                                        :output s
                                        :uri-resolver #'uri-resolver))))
                (pp (label pathname)
-- 
2.11.4.GIT