- Use correct/complete skipif condition

diff --git a/ext/spl/tests/sxe_001.phpt b/ext/spl/tests/sxe_001.phpt
index 88f83f2abebfae22ac60bc3e78b0b81136bb5918..72180d6a1e4debb14b6c8eaae996b97c2deecc69 100755 (executable)
--- a/ext/spl/tests/sxe_001.phpt
+++ b/ext/spl/tests/sxe_001.phpt
@@ -1,8 +1,11 @@
 --TEST--
 SPL: SimpleXMLIterator
 --SKIPIF--
-<?php if (!extension_loaded("spl")) print "skip"; ?>
-<?php if (!extension_loaded("simplexml")) print "skip SimpleXML not present"; ?>
+<?php
+if (!extension_loaded("spl")) print "skip";
+if (!extension_loaded("simplexml")) print "skip SimpleXML not present";
+if (!extension_loaded("libxml")) print "skip LibXML not present";
+?>
 --FILE--
 <?php 
 

diff --git a/ext/spl/tests/sxe_002.phpt b/ext/spl/tests/sxe_002.phpt
index b230e8cd8d4fe3d8cea78f4e6c8f02d4518452c3..ea9edd39f77470077ceb20aa68ef9bd6ea40a17a 100755 (executable)
--- a/ext/spl/tests/sxe_002.phpt
+++ b/ext/spl/tests/sxe_002.phpt
@@ -2,8 +2,10 @@
 SPL: SimpleXMLIterator and recursion
 --SKIPIF--
 <?php 
-       if (!extension_loaded('simplexml')) print 'skip';
-       if (!class_exists('RecursiveIteratorIterator')) print 'skip RecursiveIteratorIterator not available';
+if (!extension_loaded("spl")) print "skip";
+if (!extension_loaded('simplexml')) print 'skip';
+if (!extension_loaded("libxml")) print "skip LibXML not present";
+if (!class_exists('RecursiveIteratorIterator')) print 'skip RecursiveIteratorIterator not available';
 ?>
 --FILE--
 <?php 

diff --git a/ext/spl/tests/sxe_003.phpt b/ext/spl/tests/sxe_003.phpt
index aab7de7202534a76f94b3d8cba625ebe2e60a5cd..e222af6eb911650768359fe71f7365f5c03abd9d 100755 (executable)
--- a/ext/spl/tests/sxe_003.phpt
+++ b/ext/spl/tests/sxe_003.phpt
@@ -2,8 +2,10 @@
 SPL: SimpleXMLIterator and getChildren()
 --SKIPIF--
 <?php 
-       if (!extension_loaded('simplexml')) print 'skip';
-       if (!class_exists('RecursiveIteratorIterator')) print 'skip RecursiveIteratorIterator not available';
+if (!extension_loaded("spl")) print "skip";
+if (!extension_loaded('simplexml')) print 'skip';
+if (!extension_loaded("libxml")) print "skip LibXML not present";
+if (!class_exists('RecursiveIteratorIterator')) print 'skip RecursiveIteratorIterator not available';
 ?>
 --FILE--
 <?php 

diff --git a/ext/spl/tests/sxe_004.phpt b/ext/spl/tests/sxe_004.phpt
index 20aa5dc8ca0974741923162eb22a226137ee7d6b..98865955ad0271dc3e6462bcbb768afc37e661f8 100755 (executable)
--- a/ext/spl/tests/sxe_004.phpt
+++ b/ext/spl/tests/sxe_004.phpt
@@ -2,8 +2,10 @@
 SPL: SimpleXMLIterator and getChildren()
 --SKIPIF--
 <?php 
-       if (!extension_loaded('simplexml')) print 'skip';
-       if (!class_exists('RecursiveIteratorIterator')) print 'skip RecursiveIteratorIterator not available';
+if (!extension_loaded("spl")) print "skip";
+if (!extension_loaded('simplexml')) print 'skip';
+if (!extension_loaded("libxml")) print "skip LibXML not present";
+if (!class_exists('RecursiveIteratorIterator')) print 'skip RecursiveIteratorIterator not available';
 ?>
 --FILE--
 <?php