com php-src: Avoid file conflicts in XmlWriter tests: ext/xmlwriter/tests/001.phpt ext/xmlwriter/tests/002.phpt ext/xmlwriter/tests/003.phpt
ext/xmlwriter/tests/004.phpt ext/xmlwriter/tests/005-mb.phpt ext/xmlwriter/tests/005.phpt ext/xmlwriter/tests/006.phpt ext/xmlwriter/tests/OO_001
.phpt ext/xmlwriter/tests/OO_004.phpt ext/xmlwr iter/tests/OO_005.phpt ext/xmlwriter/tests/OO_0 06.phpt

From: Date: Tue, 19 Feb 2019 14:54:11 +0000
Subject: com php-src: Avoid file conflicts in XmlWriter tests: ext/xmlwriter/tests/001.phpt ext/xmlwriter/tests/002.phpt ext/xmlwriter/tests/003.phpt
ext/xmlwriter/tests/004.phpt ext/xmlwriter/tests/005-mb.phpt ext/xmlwriter/tests/005.phpt ext/xmlwriter/tests/006.phpt ext/xmlwriter/tests/OO_001
.phpt ext/xmlwriter/tests/OO_004.phpt ext/xmlwr iter/tests/OO_005.phpt ext/xmlwriter/tests/OO_0 06.phpt
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-104740@lists.php.net to get a copy of this message
Commit: 832b89d108cdb261ab582b57ae4fd0a9e052e608 Author: Nikita Popov <nikita.ppv@gmail.com> Tue, 19 Feb 2019 14:43:52 +0100 Parents: db894844e72d60047353a28b72e3e4fce68f80a9 Branches: PHP-7.4 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=832b89d108cdb261ab582b57ae4fd0a9e052e608 Log: Avoid file conflicts in XmlWriter tests Changed paths: M ext/xmlwriter/tests/001.phpt M ext/xmlwriter/tests/002.phpt M ext/xmlwriter/tests/003.phpt M ext/xmlwriter/tests/004.phpt M ext/xmlwriter/tests/005-mb.phpt M ext/xmlwriter/tests/005.phpt M ext/xmlwriter/tests/006.phpt M ext/xmlwriter/tests/OO_001.phpt M ext/xmlwriter/tests/OO_004.phpt M ext/xmlwriter/tests/OO_005.phpt M ext/xmlwriter/tests/OO_006.phpt Diff: diff --git a/ext/xmlwriter/tests/001.phpt b/ext/xmlwriter/tests/001.phpt index e985cbf..fd2e075 100644 --- a/ext/xmlwriter/tests/001.phpt +++ b/ext/xmlwriter/tests/001.phpt @@ -15,7 +15,7 @@ xmlwriter_end_document($xw); $output_bytes = xmlwriter_flush($xw, true); echo file_get_contents($doc_dest); unset($xw); -unlink('001.xml'); +unlink($doc_dest); ?> ===DONE=== --EXPECT-- diff --git a/ext/xmlwriter/tests/002.phpt b/ext/xmlwriter/tests/002.phpt index acb2446..13c7da1 100644 --- a/ext/xmlwriter/tests/002.phpt +++ b/ext/xmlwriter/tests/002.phpt @@ -5,7 +5,7 @@ XMLWriter: libxml2 XML Writer, membuffer, flush --FILE-- <?php -$doc_dest = '001.xml'; +$doc_dest = '002.xml'; $xw = xmlwriter_open_memory($doc_dest); xmlwriter_start_document($xw, '1.0', 'UTF-8'); xmlwriter_start_element($xw, "tag1"); diff --git a/ext/xmlwriter/tests/003.phpt b/ext/xmlwriter/tests/003.phpt index 02d3c2a..f1463c7 100644 --- a/ext/xmlwriter/tests/003.phpt +++ b/ext/xmlwriter/tests/003.phpt @@ -5,7 +5,7 @@ XMLWriter: libxml2 XML Writer, membuffer, flush, attribute --FILE-- <?php -$doc_dest = '001.xml'; +$doc_dest = '003.xml'; $xw = xmlwriter_open_memory($doc_dest); xmlwriter_start_document($xw, '1.0', 'UTF-8'); xmlwriter_start_element($xw, "tag1"); diff --git a/ext/xmlwriter/tests/004.phpt b/ext/xmlwriter/tests/004.phpt index 686ea04..73c4642 100644 --- a/ext/xmlwriter/tests/004.phpt +++ b/ext/xmlwriter/tests/004.phpt @@ -5,7 +5,7 @@ XMLWriter: libxml2 XML Writer, file buffer, flush --FILE-- <?php -$doc_dest = '001.xml'; +$doc_dest = '004.xml'; $xw = xmlwriter_open_uri($doc_dest); xmlwriter_start_document($xw, '1.0', 'UTF-8'); xmlwriter_start_element($xw, "tag1"); @@ -22,7 +22,7 @@ $md5_res = md5('<?xml version="1.0" encoding="UTF-8"?> <tag1><?PHP echo $a;?></tag1> '); unset($xw); -unlink('001.xml'); +unlink($doc_dest); if ($md5_out != $md5_res) { echo "failed: $md5_res != $md5_out\n"; } else { diff --git a/ext/xmlwriter/tests/005-mb.phpt b/ext/xmlwriter/tests/005-mb.phpt index ac9f6a3..41c86f8 100644 --- a/ext/xmlwriter/tests/005-mb.phpt +++ b/ext/xmlwriter/tests/005-mb.phpt @@ -8,7 +8,7 @@ if (!function_exists("xmlwriter_start_comment")) die("skip: libxml2 2.6.7+ requi --FILE-- <?php -$doc_dest = '私はガラスを食べられます001.xml'; +$doc_dest = '私はガラスを食べられます005.xml'; $xw = xmlwriter_open_uri($doc_dest); xmlwriter_start_document($xw, '1.0', 'UTF-8'); xmlwriter_start_element($xw, "tag1"); diff --git a/ext/xmlwriter/tests/005.phpt b/ext/xmlwriter/tests/005.phpt index a2d3d17..aca59e4 100644 --- a/ext/xmlwriter/tests/005.phpt +++ b/ext/xmlwriter/tests/005.phpt @@ -8,7 +8,7 @@ if (!function_exists("xmlwriter_start_comment")) die("skip: libxml2 2.6.7+ requi --FILE-- <?php -$doc_dest = '001.xml'; +$doc_dest = '005.xml'; $xw = xmlwriter_open_uri($doc_dest); xmlwriter_start_document($xw, '1.0', 'UTF-8'); xmlwriter_start_element($xw, "tag1"); @@ -23,7 +23,7 @@ xmlwriter_end_document($xw); $output_bytes = xmlwriter_flush($xw, true); echo file_get_contents($doc_dest); unset($xw); -unlink('001.xml'); +unlink($doc_dest); ?> ===DONE=== --EXPECT-- diff --git a/ext/xmlwriter/tests/006.phpt b/ext/xmlwriter/tests/006.phpt index 2f0d65e..802dc81 100644 --- a/ext/xmlwriter/tests/006.phpt +++ b/ext/xmlwriter/tests/006.phpt @@ -7,7 +7,7 @@ if (!extension_loaded("xmlwriter")) die("skip"); --FILE-- <?php -$doc_dest = '001.xml'; +$doc_dest = '006.xml'; $xw = xmlwriter_open_uri($doc_dest); xmlwriter_start_dtd($xw, 'foo', NULL, 'urn:bar'); xmlwriter_end_dtd($xw); @@ -19,7 +19,7 @@ xmlwriter_end_element($xw); $output_bytes = xmlwriter_flush($xw, true); echo file_get_contents($doc_dest); unset($xw); -unlink('001.xml'); +unlink($doc_dest); ?> --EXPECT-- <!DOCTYPE foo SYSTEM "urn:bar"><foo><foo:bar xmlns:foo="urn:foo">dummy content</foo:bar></foo> diff --git a/ext/xmlwriter/tests/OO_001.phpt b/ext/xmlwriter/tests/OO_001.phpt index 7e30b33..bd5edf0 100644 --- a/ext/xmlwriter/tests/OO_001.phpt +++ b/ext/xmlwriter/tests/OO_001.phpt @@ -5,7 +5,7 @@ XMLWriter: libxml2 XML Writer, file buffer, flush --FILE-- <?php -$doc_dest = '001.xml'; +$doc_dest = 'OO_001.xml'; $xw = new XMLWriter(); $xw->openUri($doc_dest); $xw->startDocument('1.0', 'UTF-8', 'standalonearg'); @@ -16,7 +16,7 @@ $xw->endDocument(); $output_bytes = $xw->flush(true); echo file_get_contents($doc_dest); unset($xw); -unlink('001.xml'); +unlink($doc_dest); ?> ===DONE=== --EXPECT-- diff --git a/ext/xmlwriter/tests/OO_004.phpt b/ext/xmlwriter/tests/OO_004.phpt index 6b81855..ecda7a1 100644 --- a/ext/xmlwriter/tests/OO_004.phpt +++ b/ext/xmlwriter/tests/OO_004.phpt @@ -5,7 +5,7 @@ XMLWriter: libxml2 XML Writer, file buffer, flush --FILE-- <?php -$doc_dest = '001.xml'; +$doc_dest = 'OO_004.xml'; $xw = new XMLWriter(); $xw->openUri($doc_dest); $xw->startDocument('1.0', 'UTF-8'); @@ -23,7 +23,7 @@ $md5_res = md5('<?xml version="1.0" encoding="UTF-8"?> <tag1><?PHP echo $a;?></tag1> '); unset($xw); -unlink('001.xml'); +unlink($doc_dest); if ($md5_out != $md5_res) { echo "failed: $md5_res != $md5_out\n"; } else { diff --git a/ext/xmlwriter/tests/OO_005.phpt b/ext/xmlwriter/tests/OO_005.phpt index e3250e7..7478ac7 100644 --- a/ext/xmlwriter/tests/OO_005.phpt +++ b/ext/xmlwriter/tests/OO_005.phpt @@ -8,7 +8,7 @@ if (!function_exists("xmlwriter_start_comment")) die("skip: libxml2 2.6.7+ requi --FILE-- <?php -$doc_dest = '001.xml'; +$doc_dest = 'OO_005.xml'; $xw = new XMLWriter(); $xw->openUri($doc_dest); $xw->startDocument('1.0', 'UTF-8'); @@ -23,7 +23,7 @@ $xw->endDocument(); $output_bytes = $xw->flush(true); echo file_get_contents($doc_dest); unset($xw); -unlink('001.xml'); +unlink($doc_dest); ?> ===DONE=== --EXPECT-- diff --git a/ext/xmlwriter/tests/OO_006.phpt b/ext/xmlwriter/tests/OO_006.phpt index 4b8e0d9..4d4abe3 100644 --- a/ext/xmlwriter/tests/OO_006.phpt +++ b/ext/xmlwriter/tests/OO_006.phpt @@ -7,7 +7,7 @@ if (!extension_loaded("xmlwriter")) die("skip"); --FILE-- <?php -$doc_dest = '001.xml'; +$doc_dest = 'OO_006.xml'; $xw = new XMLWriter(); $xw->openUri($doc_dest); $xw->startDtd('foo', NULL, 'urn:bar'); @@ -20,7 +20,7 @@ $xw->endElement(); $output_bytes = $xw->flush(true); echo file_get_contents($doc_dest); unset($xw); -unlink('001.xml'); +unlink($doc_dest); ?> --EXPECT-- <!DOCTYPE foo SYSTEM "urn:bar"><foo><foo:bar xmlns:foo="urn:foo">dummy content</foo:bar></foo>

« previous php.cvs (#104740) next »