- Tweak tests a bit

diff --git a/ext/xmlwriter/tests/001.phpt b/ext/xmlwriter/tests/001.phpt
index 2c9f96aa427afa181e38be8399905ae0f029a802..d26096ed1f68dda4c067c2afbddc0e402f28244b 100644 (file)
--- a/ext/xmlwriter/tests/001.phpt
+++ b/ext/xmlwriter/tests/001.phpt
@@ -16,9 +16,9 @@ xmlwriter_end_document($xw);
 $output_bytes = xmlwriter_flush($xw, true);
 echo file_get_contents($doc_dest);
 unlink('001.xml');
-echo "---Done---\n";
 ?>
+===DONE===
 --EXPECT--
 <?xml version="1.0" encoding="utf8"?>
 <tag1/>
----Done--- 
+===DONE===

diff --git a/ext/xmlwriter/tests/002.phpt b/ext/xmlwriter/tests/002.phpt
index ce21abf3754a985633ea2a65b03db4fdc194f035..1d769a5c22522def16f97102f51926f6582a8f6d 100644 (file)
--- a/ext/xmlwriter/tests/002.phpt
+++ b/ext/xmlwriter/tests/002.phpt
@@ -14,9 +14,9 @@ xmlwriter_end_document($xw);
 
 // Force to write and empty the buffer
 echo xmlwriter_flush($xw, true);
-echo "---Done---\n";
 ?>
+===DONE===
 --EXPECT--
 <?xml version="1.0" encoding="utf8"?>
 <tag1/>
----Done--- 
+===DONE===

diff --git a/ext/xmlwriter/tests/003.phpt b/ext/xmlwriter/tests/003.phpt
index 8436c2e66d31237e90981ac8212227562f0db9b8..2ab3a9d776ffaa99c6dcda9b358756ddea4af331 100644 (file)
--- a/ext/xmlwriter/tests/003.phpt
+++ b/ext/xmlwriter/tests/003.phpt
@@ -27,9 +27,9 @@ xmlwriter_end_document($xw);
 
 // Force to write and empty the buffer
 echo xmlwriter_flush($xw, true);
-echo "---Done---\n";
 ?>
+===DONE===
 --EXPECT--
 <?xml version="1.0" encoding="utf8"?>
 <tag1 attr1="attr1_value" att2="att2_value">Test text for tag1<tag2/></tag1>
----Done--- 
+===DONE===

diff --git a/ext/xmlwriter/tests/004.phpt b/ext/xmlwriter/tests/004.phpt
index f9d512739af8711999178d913496dc1fa53d9d8c..13e471da9d2a28c3cbae2a2e18e0dad8ebec8a6a 100644 (file)
--- a/ext/xmlwriter/tests/004.phpt
+++ b/ext/xmlwriter/tests/004.phpt
@@ -28,8 +28,8 @@ if ($md5_out != $md5_res) {
 } else {
        echo "ok.\n";
 }
-echo "---Done---\n";
 ?>
+===DONE===
 --EXPECT--
 ok.
----Done--- 
+===DONE===

diff --git a/ext/xmlwriter/tests/005.phpt b/ext/xmlwriter/tests/005.phpt
index 8ea2d1ed96a19090fad48431d3379b51801fad16..6874c5d2c3c7d20b335fc62473ceec331bb50db7 100644 (file)
--- a/ext/xmlwriter/tests/005.phpt
+++ b/ext/xmlwriter/tests/005.phpt
@@ -1,7 +1,10 @@
 --TEST--
 XMLWriter: libxml2 XML Writer, comments 
 --SKIPIF--
-<?php if (!extension_loaded("xmlwriter")) print "skip"; ?>
+<?php
+if (!extension_loaded("xmlwriter")) die("skip"); 
+if (!function_exists("xmlwriter_start_comment")) die("skip: libxml2 2.6.7+ required");
+?>
 --FILE--
 <?php 
 /* $Id$ */
@@ -21,9 +24,9 @@ xmlwriter_end_document($xw);
 $output_bytes = xmlwriter_flush($xw, true);
 echo file_get_contents($doc_dest);
 unlink('001.xml');
-echo "---Done---\n";
 ?>
+===DONE===
 --EXPECT--
 <?xml version="1.0" encoding="utf8"?>
 <tag1><!--comment--><!--comment #2--></tag1>
----Done--- 
+===DONE===

diff --git a/ext/xmlwriter/tests/OO_001.phpt b/ext/xmlwriter/tests/OO_001.phpt
index abc533156ad6848d4a8bb6c9e4b44dac4985a941..333a16a41cb22d919371f0f8bbd21a11a54fcbb4 100644 (file)
--- a/ext/xmlwriter/tests/OO_001.phpt
+++ b/ext/xmlwriter/tests/OO_001.phpt
@@ -17,9 +17,9 @@ $xw->endDocument();
 $output_bytes = $xw->flush(true);
 echo file_get_contents($doc_dest);
 unlink('001.xml');
-echo "---Done---\n";
 ?>
+===DONE===
 --EXPECT--
 <?xml version="1.0" encoding="utf8" standalone="standalonearg"?>
 <tag1/>
----Done--- 
+===DONE===

diff --git a/ext/xmlwriter/tests/OO_002.phpt b/ext/xmlwriter/tests/OO_002.phpt
index c449b9da05d3d75b8aa5188024bec94fd30cf572..515ebbb35960af832a95861797796a1eadd01d05 100644 (file)
--- a/ext/xmlwriter/tests/OO_002.phpt
+++ b/ext/xmlwriter/tests/OO_002.phpt
@@ -14,9 +14,9 @@ $xw->endDocument();
 
 // Force to write and empty the buffer
 echo $xw->flush(true);
-echo "---Done---\n";
 ?>
+===DONE===
 --EXPECT--
 <?xml version="1.0" encoding="utf8" standalone="standalone"?>
 <tag1/>
----Done--- 
+===DONE===

diff --git a/ext/xmlwriter/tests/OO_003.phpt b/ext/xmlwriter/tests/OO_003.phpt
index bd98a4c6639b5be19e32f0b77eb795855d3a265a..c0e5585fc6ecef9e38a163806b6592611f32244d 100644 (file)
--- a/ext/xmlwriter/tests/OO_003.phpt
+++ b/ext/xmlwriter/tests/OO_003.phpt
@@ -29,9 +29,9 @@ $xw->endDocument();
 
 // Force to write and empty the buffer
 echo $xw->flush(true);
-echo "---Done---\n";
 ?>
+===DONE===
 --EXPECT--
 <?xml version="1.0" encoding="utf8"?>
 <tag1 attr1="attr1_value" attr2="attr2_value">Test text for tag1<tag2/></tag1>
----Done--- 
+===DONE===

diff --git a/ext/xmlwriter/tests/OO_004.phpt b/ext/xmlwriter/tests/OO_004.phpt
index a9e8fa78dc80c2e80552b4d89328b7c38b1aa7e4..0effec37b8ca772a9b0bfcc2e97b68f639e63685 100644 (file)
--- a/ext/xmlwriter/tests/OO_004.phpt
+++ b/ext/xmlwriter/tests/OO_004.phpt
@@ -29,8 +29,8 @@ if ($md5_out != $md5_res) {
 } else {
        echo "ok.\n";
 }
-echo "---Done---\n";
 ?>
+===DONE===
 --EXPECT--
 ok.
----Done--- 
+===DONE===

diff --git a/ext/xmlwriter/tests/OO_005.phpt b/ext/xmlwriter/tests/OO_005.phpt
index b37041a637111a45d0c3f2db2cdeb0aa89272cfd..8037fc62f19c4bdc354109caffc235dfce35145a 100644 (file)
--- a/ext/xmlwriter/tests/OO_005.phpt
+++ b/ext/xmlwriter/tests/OO_005.phpt
@@ -1,7 +1,10 @@
 --TEST--
 XMLWriter: libxml2 XML Writer, comments 
 --SKIPIF--
-<?php if (!extension_loaded("xmlwriter")) print "skip"; ?>
+<?php 
+if (!extension_loaded("xmlwriter")) die("skip"); 
+if (!function_exists("xmlwriter_start_comment")) die("skip: libxml2 2.6.7+ required");
+?>
 --FILE--
 <?php 
 /* $Id$ */
@@ -21,9 +24,9 @@ $xw->endDocument();
 $output_bytes = $xw->flush(true);
 echo file_get_contents($doc_dest);
 unlink('001.xml');
-echo "---Done---\n";
 ?>
+===DONE===
 --EXPECT--
 <?xml version="1.0" encoding="utf8"?>
 <tag1><!--comment--><!--comment #2--></tag1>
----Done--- 
+===DONE===