diff options
| author | Ilia Alshanetsky <iliaa@php.net> | 2005-10-20 19:22:09 +0000 |
|---|---|---|
| committer | Ilia Alshanetsky <iliaa@php.net> | 2005-10-20 19:22:09 +0000 |
| commit | d4696abdb932205065006a645d2eb4647c7a6fe9 (patch) | |
| tree | 790267fdeab8d9029792bcf9766832b7ad1ad4b0 | |
| parent | e7925c9767e307729cac51b1aa22691325c0257d (diff) | |
| download | php-git-d4696abdb932205065006a645d2eb4647c7a6fe9.tar.gz | |
Fixed tests to work with ZTS builds
| -rw-r--r-- | ext/dom/tests/dom_xinclude.phpt | 15 | ||||
| -rw-r--r-- | ext/zlib/tests/compress_zlib_wrapper.phpt | 4 |
2 files changed, 13 insertions, 6 deletions
diff --git a/ext/dom/tests/dom_xinclude.phpt b/ext/dom/tests/dom_xinclude.phpt index 92df048bc5..f9a3dd761e 100644 --- a/ext/dom/tests/dom_xinclude.phpt +++ b/ext/dom/tests/dom_xinclude.phpt @@ -8,20 +8,25 @@ array_search('compress.zlib', stream_get_wrappers()) or die('skip compress.zlib --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> diff --git a/ext/zlib/tests/compress_zlib_wrapper.phpt b/ext/zlib/tests/compress_zlib_wrapper.phpt index 4bed91a123..de6b3d80b9 100644 --- a/ext/zlib/tests/compress_zlib_wrapper.phpt +++ b/ext/zlib/tests/compress_zlib_wrapper.phpt @@ -3,8 +3,10 @@ compress.zlib:// wrapper --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 |