helly Wed Jul 20 03:33:20 2005 EDT
Modified files:
/php-src/ext/spl/tests sxe_001.phpt sxe_002.phpt sxe_003.phpt
sxe_004.phpt
Log:
- Use correct/complete skipif condition
http://cvs.php.net/diff.php/php-src/ext/spl/tests/sxe_001.phpt?r1=1.1&r2=1.2&ty=u
Index: php-src/ext/spl/tests/sxe_001.phpt
diff -u php-src/ext/spl/tests/sxe_001.phpt:1.1
php-src/ext/spl/tests/sxe_001.phpt:1.2
--- php-src/ext/spl/tests/sxe_001.phpt:1.1 Sun Jan 18 10:33:38 2004
+++ php-src/ext/spl/tests/sxe_001.phpt Wed Jul 20 03:33:19 2005
@@ -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
http://cvs.php.net/diff.php/php-src/ext/spl/tests/sxe_002.phpt?r1=1.1&r2=1.2&ty=u
Index: php-src/ext/spl/tests/sxe_002.phpt
diff -u php-src/ext/spl/tests/sxe_002.phpt:1.1
php-src/ext/spl/tests/sxe_002.phpt:1.2
--- php-src/ext/spl/tests/sxe_002.phpt:1.1 Sun Jan 18 10:33:38 2004
+++ php-src/ext/spl/tests/sxe_002.phpt Wed Jul 20 03:33:19 2005
@@ -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
http://cvs.php.net/diff.php/php-src/ext/spl/tests/sxe_003.phpt?r1=1.2&r2=1.3&ty=u
Index: php-src/ext/spl/tests/sxe_003.phpt
diff -u php-src/ext/spl/tests/sxe_003.phpt:1.2
php-src/ext/spl/tests/sxe_003.phpt:1.3
--- php-src/ext/spl/tests/sxe_003.phpt:1.2 Mon Mar 8 12:33:31 2004
+++ php-src/ext/spl/tests/sxe_003.phpt Wed Jul 20 03:33:19 2005
@@ -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
http://cvs.php.net/diff.php/php-src/ext/spl/tests/sxe_004.phpt?r1=1.1&r2=1.2&ty=u
Index: php-src/ext/spl/tests/sxe_004.phpt
diff -u php-src/ext/spl/tests/sxe_004.phpt:1.1
php-src/ext/spl/tests/sxe_004.phpt:1.2
--- php-src/ext/spl/tests/sxe_004.phpt:1.1 Wed Nov 10 14:22:26 2004
+++ php-src/ext/spl/tests/sxe_004.phpt Wed Jul 20 03:33:19 2005
@@ -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
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
