bjori Tue Jun 27 00:09:24 2006 UTC
Modified files:
/php-src/ext/dom/tests bug34276.phpt bug35342.phpt dom002.phpt
/php-src/ext/iconv/tests bug37176.phpt
/php-src/ext/mbstring/tests mb_send_mail01.phpt mb_send_mail02.phpt
mb_send_mail03.phpt mb_send_mail04.phpt
mb_send_mail05.phpt mb_send_mail06.phpt
mb_send_mail07.phpt
/php-src/ext/mysql/tests skipif.inc
/php-src/ext/simplexml/tests bug35785.phpt bug36611.phpt
bug37565.phpt profile12.phpt
profile13.phpt
/php-src/ext/spl/tests array_021.phpt array_022.phpt bug36941.phpt
bug37457.phpt
/php-src/ext/wddx/tests bug37569.phpt bug37587.phpt
/php-src/ext/xmlreader/tests bug36743.phpt
/php-src/ext/xmlrpc/tests bug37057.phpt
Log:
Fix/add SKIPIF
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/bug34276.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/dom/tests/bug34276.phpt
diff -u php-src/ext/dom/tests/bug34276.phpt:1.1
php-src/ext/dom/tests/bug34276.phpt:1.2
--- php-src/ext/dom/tests/bug34276.phpt:1.1 Sun Aug 28 16:22:03 2005
+++ php-src/ext/dom/tests/bug34276.phpt Tue Jun 27 00:09:23 2006
@@ -1,7 +1,7 @@
--TEST--
Bug # 34276: setAttributeNS and default namespace
--SKIPIF--
-<?php require_once('skipif.php'); ?>
+<?php require_once('skipif.inc'); ?>
--FILE--
<?php
$xml = <<<HERE
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/bug35342.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/dom/tests/bug35342.phpt
diff -u php-src/ext/dom/tests/bug35342.phpt:1.1
php-src/ext/dom/tests/bug35342.phpt:1.2
--- php-src/ext/dom/tests/bug35342.phpt:1.1 Wed Nov 23 03:10:45 2005
+++ php-src/ext/dom/tests/bug35342.phpt Tue Jun 27 00:09:23 2006
@@ -1,7 +1,7 @@
--TEST--
Bug # 35342: isset(DOMNodeList->length) returns false
--SKIPIF--
-<?php require_once('skipif.php'); ?>
+<?php require_once('skipif.inc'); ?>
--FILE--
<?php
$dom = new DOMDocument();
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/tests/dom002.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/dom/tests/dom002.phpt
diff -u php-src/ext/dom/tests/dom002.phpt:1.2
php-src/ext/dom/tests/dom002.phpt:1.3
--- php-src/ext/dom/tests/dom002.phpt:1.2 Tue Jan 17 12:18:52 2006
+++ php-src/ext/dom/tests/dom002.phpt Tue Jun 27 00:09:23 2006
@@ -1,7 +1,7 @@
--TEST--
Test 2: getElementsByTagName() / getElementsByTagNameNS()
--SKIPIF--
-<?php require_once('skipif.php'); ?>
+<?php require_once('skipif.inc'); ?>
--FILE--
<?php
$xml = <<<HERE
http://cvs.php.net/viewvc.cgi/php-src/ext/iconv/tests/bug37176.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/iconv/tests/bug37176.phpt
diff -u php-src/ext/iconv/tests/bug37176.phpt:1.1
php-src/ext/iconv/tests/bug37176.phpt:1.2
--- php-src/ext/iconv/tests/bug37176.phpt:1.1 Thu Apr 27 00:49:17 2006
+++ php-src/ext/iconv/tests/bug37176.phpt Tue Jun 27 00:09:23 2006
@@ -1,5 +1,7 @@
--TEST--
Bug #37176 (iconv_strpos() fails to find a string)
+--SKIPIF--
+<?php include('skipif.inc'); ?>
--FILE--
<?php
var_dump(iconv_strpos('11--','1-',0,'UTF-8'));
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_send_mail01.phpt?r1=1.6&r2=1.7&diff_format=u
Index: php-src/ext/mbstring/tests/mb_send_mail01.phpt
diff -u php-src/ext/mbstring/tests/mb_send_mail01.phpt:1.6
php-src/ext/mbstring/tests/mb_send_mail01.phpt:1.7
--- php-src/ext/mbstring/tests/mb_send_mail01.phpt:1.6 Fri Sep 26 11:08:54 2003
+++ php-src/ext/mbstring/tests/mb_send_mail01.phpt Tue Jun 27 00:09:23 2006
@@ -2,7 +2,7 @@
mb_send_mail() test 1 (lang=neutral)
--SKIPIF--
<?php
-if (@mb_send_mail() === false || !mb_language("neutral")) {
+if (!function_exists("mb_send_mail") || !mb_language("neutral")) {
die("skip mb_send_mail() not available");
}
?>
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_send_mail02.phpt?r1=1.5&r2=1.6&diff_format=u
Index: php-src/ext/mbstring/tests/mb_send_mail02.phpt
diff -u php-src/ext/mbstring/tests/mb_send_mail02.phpt:1.5
php-src/ext/mbstring/tests/mb_send_mail02.phpt:1.6
--- php-src/ext/mbstring/tests/mb_send_mail02.phpt:1.5 Wed Sep 24 02:27:43 2003
+++ php-src/ext/mbstring/tests/mb_send_mail02.phpt Tue Jun 27 00:09:23 2006
@@ -2,7 +2,7 @@
mb_send_mail() test 2 (lang=Japanese)
--SKIPIF--
<?php
-if (@mb_send_mail() === false || !mb_language("japanese")) {
+if (!function_exists("mb_send_mail") || !mb_language("japanese")) {
die("skip mb_send_mail() not available");
}
?>
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_send_mail03.phpt?r1=1.6&r2=1.7&diff_format=u
Index: php-src/ext/mbstring/tests/mb_send_mail03.phpt
diff -u php-src/ext/mbstring/tests/mb_send_mail03.phpt:1.6
php-src/ext/mbstring/tests/mb_send_mail03.phpt:1.7
--- php-src/ext/mbstring/tests/mb_send_mail03.phpt:1.6 Wed Sep 24 02:27:43 2003
+++ php-src/ext/mbstring/tests/mb_send_mail03.phpt Tue Jun 27 00:09:23 2006
@@ -2,7 +2,7 @@
mb_send_mail() test 3 (lang=English)
--SKIPIF--
<?php
-if (@mb_send_mail() === false || !mb_language("english")) {
+if (!function_exists("mb_send_mail") || !mb_language("english")) {
die("skip mb_send_mail() not available");
}
?>
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_send_mail04.phpt?r1=1.5&r2=1.6&diff_format=u
Index: php-src/ext/mbstring/tests/mb_send_mail04.phpt
diff -u php-src/ext/mbstring/tests/mb_send_mail04.phpt:1.5
php-src/ext/mbstring/tests/mb_send_mail04.phpt:1.6
--- php-src/ext/mbstring/tests/mb_send_mail04.phpt:1.5 Wed Sep 24 02:27:43 2003
+++ php-src/ext/mbstring/tests/mb_send_mail04.phpt Tue Jun 27 00:09:23 2006
@@ -2,7 +2,7 @@
mb_send_mail() test 4 (lang=German)
--SKIPIF--
<?php
-if (@mb_send_mail() === false || !mb_language("german")) {
+if (!function_exists("mb_send_mail") || !mb_language("german")) {
die("skip mb_send_mail() not available");
}
?>
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_send_mail05.phpt?r1=1.6&r2=1.7&diff_format=u
Index: php-src/ext/mbstring/tests/mb_send_mail05.phpt
diff -u php-src/ext/mbstring/tests/mb_send_mail05.phpt:1.6
php-src/ext/mbstring/tests/mb_send_mail05.phpt:1.7
--- php-src/ext/mbstring/tests/mb_send_mail05.phpt:1.6 Thu Dec 16 12:34:30 2004
+++ php-src/ext/mbstring/tests/mb_send_mail05.phpt Tue Jun 27 00:09:23 2006
@@ -2,7 +2,7 @@
mb_send_mail() test 5 (lang=Simplified Chinese)
--SKIPIF--
<?php
-if (@mb_send_mail() === false || !mb_language("Simplified Chinese")) {
+if (!function_exists("mb_send_mail") || !mb_language("Simplified Chinese")) {
die("skip mb_send_mail() not available");
}
if ([EMAIL PROTECTED]('GB2312')) {
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_send_mail06.phpt?r1=1.6&r2=1.7&diff_format=u
Index: php-src/ext/mbstring/tests/mb_send_mail06.phpt
diff -u php-src/ext/mbstring/tests/mb_send_mail06.phpt:1.6
php-src/ext/mbstring/tests/mb_send_mail06.phpt:1.7
--- php-src/ext/mbstring/tests/mb_send_mail06.phpt:1.6 Thu Dec 16 12:34:30 2004
+++ php-src/ext/mbstring/tests/mb_send_mail06.phpt Tue Jun 27 00:09:23 2006
@@ -2,7 +2,7 @@
mb_send_mail() test 6 (lang=Traditional Chinese)
--SKIPIF--
<?php
-if (@mb_send_mail() === false || !mb_language("Traditional Chinese")) {
+if (!function_exists("mb_send_mail") || !mb_language("Traditional Chinese")) {
die("skip mb_send_mail() not available");
}
if ([EMAIL PROTECTED]('BIG5')) {
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_send_mail07.phpt?r1=1.5&r2=1.6&diff_format=u
Index: php-src/ext/mbstring/tests/mb_send_mail07.phpt
diff -u php-src/ext/mbstring/tests/mb_send_mail07.phpt:1.5
php-src/ext/mbstring/tests/mb_send_mail07.phpt:1.6
--- php-src/ext/mbstring/tests/mb_send_mail07.phpt:1.5 Thu Dec 16 12:34:30 2004
+++ php-src/ext/mbstring/tests/mb_send_mail07.phpt Tue Jun 27 00:09:23 2006
@@ -2,7 +2,7 @@
mb_send_mail() test 7 (lang=Korean)
--SKIPIF--
<?php
-if (@mb_send_mail() === false || !mb_language("Korean")) {
+if (!function_exists("mb_send_mail") || !mb_language("Korean")) {
die("skip mb_send_mail() not available");
}
if ([EMAIL PROTECTED]('ISO-2022-KR')) {
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/skipif.inc?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/mysql/tests/skipif.inc
diff -u php-src/ext/mysql/tests/skipif.inc:1.2
php-src/ext/mysql/tests/skipif.inc:1.3
--- php-src/ext/mysql/tests/skipif.inc:1.2 Mon Feb 16 14:41:38 2004
+++ php-src/ext/mysql/tests/skipif.inc Tue Jun 27 00:09:23 2006
@@ -1,8 +1,11 @@
<?php
include 'connect.inc';
+if (!extension_loaded("mysql")) {
+ die('skip mysql extension not available');
+}
$link = @mysql_connect($host, $user, $passwd);
if (!$link) die('skip cannot connect');
mysql_close($link);
-?>
\ No newline at end of file
+?>
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/tests/bug35785.phpt?r1=1.5&r2=1.6&diff_format=u
Index: php-src/ext/simplexml/tests/bug35785.phpt
diff -u php-src/ext/simplexml/tests/bug35785.phpt:1.5
php-src/ext/simplexml/tests/bug35785.phpt:1.6
--- php-src/ext/simplexml/tests/bug35785.phpt:1.5 Sun Mar 5 14:01:13 2006
+++ php-src/ext/simplexml/tests/bug35785.phpt Tue Jun 27 00:09:23 2006
@@ -1,5 +1,7 @@
--TEST--
Bug #35785 (SimpleXML memory read error)
+--SKIPIF--
+<?php if (!extension_loaded("simplexml")) print "skip"; ?>
--FILE--
<?php
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/tests/bug36611.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/simplexml/tests/bug36611.phpt
diff -u php-src/ext/simplexml/tests/bug36611.phpt:1.2
php-src/ext/simplexml/tests/bug36611.phpt:1.3
--- php-src/ext/simplexml/tests/bug36611.phpt:1.2 Sun Mar 5 16:12:54 2006
+++ php-src/ext/simplexml/tests/bug36611.phpt Tue Jun 27 00:09:23 2006
@@ -1,5 +1,7 @@
--TEST--
Bug #36611 (assignment to SimpleXML object attribute changes argument type to
string)
+--SKIPIF--
+<?php if (!extension_loaded("simplexml")) print "skip"; ?>
--FILE--
<?php
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/tests/bug37565.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/simplexml/tests/bug37565.phpt
diff -u php-src/ext/simplexml/tests/bug37565.phpt:1.2
php-src/ext/simplexml/tests/bug37565.phpt:1.3
--- php-src/ext/simplexml/tests/bug37565.phpt:1.2 Tue Jun 20 13:07:44 2006
+++ php-src/ext/simplexml/tests/bug37565.phpt Tue Jun 27 00:09:23 2006
@@ -1,5 +1,7 @@
--TEST--
Bug #37565 Using reflection::export with simplexml causing a crash
+--SKIPIF--
+<?php if (!extension_loaded("simplexml")) print "skip"; ?>
--FILE--
<?php
function my_error_handler($errno, $errstr, $errfile, $errline) {
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/tests/profile12.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/simplexml/tests/profile12.phpt
diff -u php-src/ext/simplexml/tests/profile12.phpt:1.3
php-src/ext/simplexml/tests/profile12.phpt:1.4
--- php-src/ext/simplexml/tests/profile12.phpt:1.3 Fri Apr 14 15:15:21 2006
+++ php-src/ext/simplexml/tests/profile12.phpt Tue Jun 27 00:09:23 2006
@@ -1,5 +1,7 @@
--TEST--
SimpleXML [profile]: Accessing namespaced root and non namespaced children
+--SKIPIF--
+<?php if (!extension_loaded("simplexml")) print "skip"; ?>
--FILE--
<?php
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/tests/profile13.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/simplexml/tests/profile13.phpt
diff -u php-src/ext/simplexml/tests/profile13.phpt:1.1
php-src/ext/simplexml/tests/profile13.phpt:1.2
--- php-src/ext/simplexml/tests/profile13.phpt:1.1 Fri Apr 14 15:13:46 2006
+++ php-src/ext/simplexml/tests/profile13.phpt Tue Jun 27 00:09:23 2006
@@ -1,5 +1,7 @@
--TEST--
SimpleXML [profile]: Accessing by namespace prefix
+--SKIPIF--
+<?php if (!extension_loaded("simplexml")) print "skip"; ?>
--FILE--
<?php
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/array_021.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/spl/tests/array_021.phpt
diff -u php-src/ext/spl/tests/array_021.phpt:1.1
php-src/ext/spl/tests/array_021.phpt:1.2
--- php-src/ext/spl/tests/array_021.phpt:1.1 Thu Mar 23 11:57:15 2006
+++ php-src/ext/spl/tests/array_021.phpt Tue Jun 27 00:09:23 2006
@@ -1,5 +1,7 @@
--TEST--
SPL: ArrayObject::seek() and exceptions
+--SKIPIF--
+<?php if (!extension_loaded("spl")) print "skip"; ?>
--FILE--
<?php
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/array_022.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/spl/tests/array_022.phpt
diff -u php-src/ext/spl/tests/array_022.phpt:1.1
php-src/ext/spl/tests/array_022.phpt:1.2
--- php-src/ext/spl/tests/array_022.phpt:1.1 Mon Apr 3 19:52:02 2006
+++ php-src/ext/spl/tests/array_022.phpt Tue Jun 27 00:09:23 2006
@@ -1,5 +1,7 @@
--TEST--
SPL: ArrayObject/Iterator and reference to self
+--SKIPIF--
+<?php if (!extension_loaded("spl")) print "skip"; ?>
--FILE--
==ArrayObject===
<?php
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/bug36941.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/spl/tests/bug36941.phpt
diff -u php-src/ext/spl/tests/bug36941.phpt:1.2
php-src/ext/spl/tests/bug36941.phpt:1.3
--- php-src/ext/spl/tests/bug36941.phpt:1.2 Sun Apr 2 15:04:04 2006
+++ php-src/ext/spl/tests/bug36941.phpt Tue Jun 27 00:09:23 2006
@@ -1,5 +1,7 @@
--TEST--
Bug #36941 (ArrayIterator does not clone itself)
+--SKIPIF--
+<?php if (!extension_loaded("spl")) print "skip"; ?>
--FILE--
===ArrayObject===
<?php
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/bug37457.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/spl/tests/bug37457.phpt
diff -u php-src/ext/spl/tests/bug37457.phpt:1.2
php-src/ext/spl/tests/bug37457.phpt:1.3
--- php-src/ext/spl/tests/bug37457.phpt:1.2 Thu May 18 21:40:30 2006
+++ php-src/ext/spl/tests/bug37457.phpt Tue Jun 27 00:09:23 2006
@@ -1,5 +1,7 @@
--TEST--
Bug #37457 (Crash when an exception is thrown in accept() method of
FilterIterator)
+--SKIPIF--
+<?php if (!extension_loaded("spl")) print "skip"; ?>
--FILE--
<?php
http://cvs.php.net/viewvc.cgi/php-src/ext/wddx/tests/bug37569.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/wddx/tests/bug37569.phpt
diff -u php-src/ext/wddx/tests/bug37569.phpt:1.2
php-src/ext/wddx/tests/bug37569.phpt:1.3
--- php-src/ext/wddx/tests/bug37569.phpt:1.2 Thu May 25 23:23:15 2006
+++ php-src/ext/wddx/tests/bug37569.phpt Tue Jun 27 00:09:23 2006
@@ -1,5 +1,7 @@
--TEST--
Bug #37569 (WDDX incorrectly encodes high-ascii characters)
+--SKIPIF--
+<?php if (!extension_loaded("wddx")) print "skip"; ?>
--FILE--
<?php
echo wddx_serialize_value(chr(1))."\n";
http://cvs.php.net/viewvc.cgi/php-src/ext/wddx/tests/bug37587.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/wddx/tests/bug37587.phpt
diff -u php-src/ext/wddx/tests/bug37587.phpt:1.1
php-src/ext/wddx/tests/bug37587.phpt:1.2
--- php-src/ext/wddx/tests/bug37587.phpt:1.1 Thu May 25 09:51:58 2006
+++ php-src/ext/wddx/tests/bug37587.phpt Tue Jun 27 00:09:23 2006
@@ -1,5 +1,7 @@
--TEST--
Bug #37587 (var without attribute causes segfault)
+--SKIPIF--
+<?php if (!extension_loaded("wddx")) print "skip"; ?>
--FILE--
<?php
http://cvs.php.net/viewvc.cgi/php-src/ext/xmlreader/tests/bug36743.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/xmlreader/tests/bug36743.phpt
diff -u php-src/ext/xmlreader/tests/bug36743.phpt:1.2
php-src/ext/xmlreader/tests/bug36743.phpt:1.3
--- php-src/ext/xmlreader/tests/bug36743.phpt:1.2 Fri Mar 17 10:17:36 2006
+++ php-src/ext/xmlreader/tests/bug36743.phpt Tue Jun 27 00:09:23 2006
@@ -1,5 +1,7 @@
--TEST--
Bug #36743 (In a class extending XMLReader array properties are not writable)
+--SKIPIF--
+<?php if (!extension_loaded("xmlreader")) print "skip"; ?>
--FILE--
<?php
http://cvs.php.net/viewvc.cgi/php-src/ext/xmlrpc/tests/bug37057.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/xmlrpc/tests/bug37057.phpt
diff -u php-src/ext/xmlrpc/tests/bug37057.phpt:1.2
php-src/ext/xmlrpc/tests/bug37057.phpt:1.3
--- php-src/ext/xmlrpc/tests/bug37057.phpt:1.2 Wed Apr 12 15:19:39 2006
+++ php-src/ext/xmlrpc/tests/bug37057.phpt Tue Jun 27 00:09:23 2006
@@ -1,5 +1,7 @@
--TEST--
Bug #37057 (xmlrpc_decode() may produce arrays with numeric string keys which
are unaccessible)
+--SKIPIF--
+<?php if (!extension_loaded("xmlrpc")) print "skip"; ?>
--FILE--
<?php
$response='<?xml version="1.0"?>
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
