From: Marcus Boerger <helly@php.net>
Date: Wed, 20 Jul 2005 07:33:19 +0000 (+0000)
Subject: - Use correct/complete skipif condition
X-Git-Tag: RELEASE_0_9~53
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=efcfe44299e3562b538d0b17c5c5b51a432ef44f;p=php

- Use correct/complete skipif condition
---

diff --git a/ext/spl/tests/sxe_001.phpt b/ext/spl/tests/sxe_001.phpt
index 88f83f2abe..72180d6a1e 100755
--- 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 b230e8cd8d..ea9edd39f7 100755
--- 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 aab7de7202..e222af6eb9 100755
--- 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 20aa5dc8ca..98865955ad 100755
--- 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