iliaa Thu Oct 20 15:22:55 2005 EDT
Modified files:
/php-src/ext/dom/tests dom_xinclude.phpt
/php-src/ext/zlib/tests compress_zlib_wrapper.phpt
Log:
MFB51: Fixed tests to work with ZTS builds
http://cvs.php.net/diff.php/php-src/ext/dom/tests/dom_xinclude.phpt?r1=1.4&r2=1.5&ty=u
Index: php-src/ext/dom/tests/dom_xinclude.phpt
diff -u php-src/ext/dom/tests/dom_xinclude.phpt:1.4
php-src/ext/dom/tests/dom_xinclude.phpt:1.5
--- php-src/ext/dom/tests/dom_xinclude.phpt:1.4 Thu Dec 2 11:33:36 2004
+++ php-src/ext/dom/tests/dom_xinclude.phpt Thu Oct 20 15:22:54 2005
@@ -8,20 +8,25 @@
--FILE--
<?php
$dom = new domdocument;
-$dom->load(dirname(__FILE__)."/xinclude.xml");
+
+$data = file_get_contents(dirname(__FILE__)."/xinclude.xml");
+$data =
str_replace('compress.zlib://ext/dom/tests/','compress.zlib://'.dirname(__FILE__).'/',
$data);
+
+$dom->loadXML($data);
+
$dom->xinclude();
print $dom->saveXML()."\n";
foreach ($dom->documentElement->childNodes as $node) {
print $node->nodeName."\n";
}
-
---EXPECT--
+?>
+--EXPECTF--
<?xml version="1.0"?>
<foo xmlns:xi="http://www.w3.org/2001/XInclude";>
- <book xml:base="compress.zlib://ext/dom/tests/book.xml">
+ <book xml:base="compress.zlib://%sext/dom/tests/book.xml">
<title>The Grapes of Wrath</title>
<author>John Steinbeck</author>
- </book><book xml:base="compress.zlib://ext/dom/tests/book.xml">
+ </book><book xml:base="compress.zlib://%sext/dom/tests/book.xml">
<title>The Pearl</title>
<author>John Steinbeck</author>
</book>
http://cvs.php.net/diff.php/php-src/ext/zlib/tests/compress_zlib_wrapper.phpt?r1=1.2&r2=1.3&ty=u
Index: php-src/ext/zlib/tests/compress_zlib_wrapper.phpt
diff -u php-src/ext/zlib/tests/compress_zlib_wrapper.phpt:1.2
php-src/ext/zlib/tests/compress_zlib_wrapper.phpt:1.3
--- php-src/ext/zlib/tests/compress_zlib_wrapper.phpt:1.2 Wed Apr 27
04:10:41 2005
+++ php-src/ext/zlib/tests/compress_zlib_wrapper.phpt Thu Oct 20 15:22:55 2005
@@ -3,8 +3,10 @@
--FILE--
<?php
+$pfx = str_repeat('../', substr_count($_SERVER['PHP_SELF'], '../'));
+
// Relative path
-$fp = fopen("compress.zlib://ext/xsl/tests/xslt.xsl.gz", "rb");
+$fp = fopen("compress.zlib://{$pfx}ext/xsl/tests/xslt.xsl.gz", "rb");
fclose($fp);
// Absolute path
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
