tony2001 Wed Dec 21 11:42:06 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/oci8/tests cursor_bind.phpt
/php-src/ext/calendar/tests jdtojewish.phpt
/php-src/ext/ctype/tests bug25745.phpt bug34645.phpt
/php-src/ext/iconv/tests iconv003.phpt iconv004.phpt
iconv_mime_decode_headers.phpt
/php-src/ext/mbstring/tests bug28220.phpt bug30549.phpt
bug31911.phpt
/php-src/ext/pdo_sqlite/tests bug35336.phpt
/php-src/ext/simplexml/tests bug27010.phpt
/php-src/ext/sqlite/tests bug28112.phpt
/php-src/ext/tokenizer/tests 001.phpt 002.phpt 003.phpt
bug26463.phpt
/php-src/ext/wddx/tests 001.phpt bug27287.phpt bug34306.phpt
bug35410.phpt
Log:
add missing skipif conditions
fix existing ones
http://cvs.php.net/viewcvs.cgi/php-src/ext/oci8/tests/cursor_bind.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u
Index: php-src/ext/oci8/tests/cursor_bind.phpt
diff -u php-src/ext/oci8/tests/cursor_bind.phpt:1.1.2.2
php-src/ext/oci8/tests/cursor_bind.phpt:1.1.2.3
--- php-src/ext/oci8/tests/cursor_bind.phpt:1.1.2.2 Tue Dec 13 21:43:36 2005
+++ php-src/ext/oci8/tests/cursor_bind.phpt Wed Dec 21 11:42:05 2005
@@ -1,5 +1,7 @@
--TEST--
bind and fetch cursor from a statement
+--SKIPIF--
+<?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); ?>
--FILE--
<?php
http://cvs.php.net/viewcvs.cgi/php-src/ext/calendar/tests/jdtojewish.phpt?r1=1.2&r2=1.2.4.1&diff_format=u
Index: php-src/ext/calendar/tests/jdtojewish.phpt
diff -u php-src/ext/calendar/tests/jdtojewish.phpt:1.2
php-src/ext/calendar/tests/jdtojewish.phpt:1.2.4.1
--- php-src/ext/calendar/tests/jdtojewish.phpt:1.2 Tue Aug 12 00:44:05 2003
+++ php-src/ext/calendar/tests/jdtojewish.phpt Wed Dec 21 11:42:05 2005
@@ -1,5 +1,7 @@
--TEST--
jdtojewish() function
+--SKIPIF--
+<?php include 'skipif.inc'; ?>
--FILE--
<?php
http://cvs.php.net/viewcvs.cgi/php-src/ext/ctype/tests/bug25745.phpt?r1=1.1&r2=1.1.6.1&diff_format=u
Index: php-src/ext/ctype/tests/bug25745.phpt
diff -u php-src/ext/ctype/tests/bug25745.phpt:1.1
php-src/ext/ctype/tests/bug25745.phpt:1.1.6.1
--- php-src/ext/ctype/tests/bug25745.phpt:1.1 Fri Oct 3 16:59:44 2003
+++ php-src/ext/ctype/tests/bug25745.phpt Wed Dec 21 11:42:05 2005
@@ -1,5 +1,7 @@
--TEST--
Bug #25745 (ctype functions fail with non-ascii characters)
+--SKIPIF--
+<?php if (!extension_loaded("ctype")) print "skip"; ?>
--FILE--
<?php
$funcs = array(
http://cvs.php.net/viewcvs.cgi/php-src/ext/ctype/tests/bug34645.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u
Index: php-src/ext/ctype/tests/bug34645.phpt
diff -u php-src/ext/ctype/tests/bug34645.phpt:1.1.2.1
php-src/ext/ctype/tests/bug34645.phpt:1.1.2.2
--- php-src/ext/ctype/tests/bug34645.phpt:1.1.2.1 Mon Sep 26 15:14:19 2005
+++ php-src/ext/ctype/tests/bug34645.phpt Wed Dec 21 11:42:06 2005
@@ -1,5 +1,7 @@
--TEST--
Bug #34645 (ctype corrupts memory when validating large numbers)
+--SKIPIF--
+<?php if (!extension_loaded("ctype")) print "skip"; ?>
--FILE--
<?php
$id = 394829384;
http://cvs.php.net/viewcvs.cgi/php-src/ext/iconv/tests/iconv003.phpt?r1=1.1&r2=1.1.18.1&diff_format=u
Index: php-src/ext/iconv/tests/iconv003.phpt
diff -u php-src/ext/iconv/tests/iconv003.phpt:1.1
php-src/ext/iconv/tests/iconv003.phpt:1.1.18.1
--- php-src/ext/iconv/tests/iconv003.phpt:1.1 Wed Nov 6 16:57:53 2002
+++ php-src/ext/iconv/tests/iconv003.phpt Wed Dec 21 11:42:06 2005
@@ -1,5 +1,7 @@
--TEST--
iconv() test 3
+--SKIPIF--
+<?php extension_loaded('iconv') or die('skip iconv extension is not
available'); ?>
--FILE--
<?php
for ($i = 0; $i < 3; ++$i) {
http://cvs.php.net/viewcvs.cgi/php-src/ext/iconv/tests/iconv004.phpt?r1=1.1&r2=1.1.4.1&diff_format=u
Index: php-src/ext/iconv/tests/iconv004.phpt
diff -u php-src/ext/iconv/tests/iconv004.phpt:1.1
php-src/ext/iconv/tests/iconv004.phpt:1.1.4.1
--- php-src/ext/iconv/tests/iconv004.phpt:1.1 Wed Mar 23 23:07:42 2005
+++ php-src/ext/iconv/tests/iconv004.phpt Wed Dec 21 11:42:06 2005
@@ -1,5 +1,7 @@
--TEST--
iconv_mime_encode() sanity cheeck.
+--SKIPIF--
+<?php extension_loaded('iconv') or die('skip iconv extension is not
available'); ?>
--FILE--
<?php
var_dump(iconv_mime_encode('', ''));
http://cvs.php.net/viewcvs.cgi/php-src/ext/iconv/tests/iconv_mime_decode_headers.phpt?r1=1.2&r2=1.2.4.1&diff_format=u
Index: php-src/ext/iconv/tests/iconv_mime_decode_headers.phpt
diff -u php-src/ext/iconv/tests/iconv_mime_decode_headers.phpt:1.2
php-src/ext/iconv/tests/iconv_mime_decode_headers.phpt:1.2.4.1
--- php-src/ext/iconv/tests/iconv_mime_decode_headers.phpt:1.2 Tue Dec 2
07:38:11 2003
+++ php-src/ext/iconv/tests/iconv_mime_decode_headers.phpt Wed Dec 21
11:42:06 2005
@@ -1,6 +1,6 @@
--TEST--
iconv_mime_decode_headers()
---SKIP--
+--SKIPIF--
<?php extension_loaded('iconv') or die('skip iconv extension is not
available'); ?>
--INI--
iconv.internal_charset=iso-8859-1
http://cvs.php.net/viewcvs.cgi/php-src/ext/mbstring/tests/bug28220.phpt?r1=1.1&r2=1.1.6.1&diff_format=u
Index: php-src/ext/mbstring/tests/bug28220.phpt
diff -u php-src/ext/mbstring/tests/bug28220.phpt:1.1
php-src/ext/mbstring/tests/bug28220.phpt:1.1.6.1
--- php-src/ext/mbstring/tests/bug28220.phpt:1.1 Mon Feb 21 07:45:37 2005
+++ php-src/ext/mbstring/tests/bug28220.phpt Wed Dec 21 11:42:06 2005
@@ -1,5 +1,7 @@
--TEST--
Bug #28220 (mb_strwidth() returns wrong width values for some Hangul
characters)
+--SKIPIF--
+<?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
--FILE--
<?php
$coderange = array(
http://cvs.php.net/viewcvs.cgi/php-src/ext/mbstring/tests/bug30549.phpt?r1=1.1&r2=1.1.6.1&diff_format=u
Index: php-src/ext/mbstring/tests/bug30549.phpt
diff -u php-src/ext/mbstring/tests/bug30549.phpt:1.1
php-src/ext/mbstring/tests/bug30549.phpt:1.1.6.1
--- php-src/ext/mbstring/tests/bug30549.phpt:1.1 Mon Feb 21 07:45:37 2005
+++ php-src/ext/mbstring/tests/bug30549.phpt Wed Dec 21 11:42:06 2005
@@ -1,5 +1,7 @@
--TEST--
Bug #30549 (incorrect character translations for some ISO8859 charsets)
+--SKIPIF--
+<?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
--FILE--
<?php
test('ISO-8859-7', array(0xa4 => 0x20ac, 0xa5 => 0x20af, 0xaa => 0x037a));
http://cvs.php.net/viewcvs.cgi/php-src/ext/mbstring/tests/bug31911.phpt?r1=1.1&r2=1.1.6.1&diff_format=u
Index: php-src/ext/mbstring/tests/bug31911.phpt
diff -u php-src/ext/mbstring/tests/bug31911.phpt:1.1
php-src/ext/mbstring/tests/bug31911.phpt:1.1.6.1
--- php-src/ext/mbstring/tests/bug31911.phpt:1.1 Sun Feb 20 22:18:09 2005
+++ php-src/ext/mbstring/tests/bug31911.phpt Wed Dec 21 11:42:06 2005
@@ -1,5 +1,7 @@
--TEST--
Bug #31911 (mb_decode_mimeheader() is case-sensitive to hex escapes)
+--SKIPIF--
+<?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
--FILE--
<?php
echo mb_decode_mimeheader("Works: =?iso-8859-1?q?=3F=3F=3F?=");
http://cvs.php.net/viewcvs.cgi/php-src/ext/pdo_sqlite/tests/bug35336.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u
Index: php-src/ext/pdo_sqlite/tests/bug35336.phpt
diff -u php-src/ext/pdo_sqlite/tests/bug35336.phpt:1.1.2.1
php-src/ext/pdo_sqlite/tests/bug35336.phpt:1.1.2.2
--- php-src/ext/pdo_sqlite/tests/bug35336.phpt:1.1.2.1 Wed Nov 23 11:15:11 2005
+++ php-src/ext/pdo_sqlite/tests/bug35336.phpt Wed Dec 21 11:42:06 2005
@@ -1,5 +1,9 @@
--TEST--
Bug #35336 (crash on PDO::FETCH_CLASS + __set())
+--SKIPIF--
+<?php # vim:ft=php
+if (!extension_loaded('pdo_sqlite')) print 'skip not loaded';
+?>
--FILE--
<?php
class EEE {
http://cvs.php.net/viewcvs.cgi/php-src/ext/simplexml/tests/bug27010.phpt?r1=1.2.4.1&r2=1.2.4.2&diff_format=u
Index: php-src/ext/simplexml/tests/bug27010.phpt
diff -u php-src/ext/simplexml/tests/bug27010.phpt:1.2.4.1
php-src/ext/simplexml/tests/bug27010.phpt:1.2.4.2
--- php-src/ext/simplexml/tests/bug27010.phpt:1.2.4.1 Tue Nov 29 02:51:07 2005
+++ php-src/ext/simplexml/tests/bug27010.phpt Wed Dec 21 11:42:06 2005
@@ -1,5 +1,7 @@
--TEST--
Bug #27010 (segfault and node text not displayed when returned from children())
+--SKIPIF--
+<?php if (!extension_loaded("simplexml")) print "skip"; ?>
--FILE--
<?php
http://cvs.php.net/viewcvs.cgi/php-src/ext/sqlite/tests/bug28112.phpt?r1=1.2&r2=1.2.4.1&diff_format=u
Index: php-src/ext/sqlite/tests/bug28112.phpt
diff -u php-src/ext/sqlite/tests/bug28112.phpt:1.2
php-src/ext/sqlite/tests/bug28112.phpt:1.2.4.1
--- php-src/ext/sqlite/tests/bug28112.phpt:1.2 Thu Apr 22 22:55:18 2004
+++ php-src/ext/sqlite/tests/bug28112.phpt Wed Dec 21 11:42:06 2005
@@ -1,5 +1,7 @@
--TEST--
Bug #28112 (sqlite_query() crashing apache on malformed query)
+--SKIPIF--
+<?php if (!extension_loaded("sqlite")) print "skip"; ?>
--FILE--
<?php
http://cvs.php.net/viewcvs.cgi/php-src/ext/tokenizer/tests/001.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u
Index: php-src/ext/tokenizer/tests/001.phpt
diff -u php-src/ext/tokenizer/tests/001.phpt:1.1.2.1
php-src/ext/tokenizer/tests/001.phpt:1.1.2.2
--- php-src/ext/tokenizer/tests/001.phpt:1.1.2.1 Wed Nov 30 23:34:08 2005
+++ php-src/ext/tokenizer/tests/001.phpt Wed Dec 21 11:42:06 2005
@@ -1,5 +1,7 @@
--TEST--
token_name()
+--SKIPIF--
+<?php if (!extension_loaded("tokenizer")) print "skip"; ?>
--FILE--
<?php
http://cvs.php.net/viewcvs.cgi/php-src/ext/tokenizer/tests/002.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u
Index: php-src/ext/tokenizer/tests/002.phpt
diff -u php-src/ext/tokenizer/tests/002.phpt:1.1.2.1
php-src/ext/tokenizer/tests/002.phpt:1.1.2.2
--- php-src/ext/tokenizer/tests/002.phpt:1.1.2.1 Thu Dec 1 18:22:11 2005
+++ php-src/ext/tokenizer/tests/002.phpt Wed Dec 21 11:42:06 2005
@@ -1,5 +1,7 @@
--TEST--
token_get_all()
+--SKIPIF--
+<?php if (!extension_loaded("tokenizer")) print "skip"; ?>
--FILE--
<?php
http://cvs.php.net/viewcvs.cgi/php-src/ext/tokenizer/tests/003.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u
Index: php-src/ext/tokenizer/tests/003.phpt
diff -u php-src/ext/tokenizer/tests/003.phpt:1.1.2.1
php-src/ext/tokenizer/tests/003.phpt:1.1.2.2
--- php-src/ext/tokenizer/tests/003.phpt:1.1.2.1 Thu Dec 1 18:22:11 2005
+++ php-src/ext/tokenizer/tests/003.phpt Wed Dec 21 11:42:06 2005
@@ -1,5 +1,7 @@
--TEST--
token_get_all() and wrong parameters
+--SKIPIF--
+<?php if (!extension_loaded("tokenizer")) print "skip"; ?>
--FILE--
<?php
http://cvs.php.net/viewcvs.cgi/php-src/ext/tokenizer/tests/bug26463.phpt?r1=1.2.4.1&r2=1.2.4.2&diff_format=u
Index: php-src/ext/tokenizer/tests/bug26463.phpt
diff -u php-src/ext/tokenizer/tests/bug26463.phpt:1.2.4.1
php-src/ext/tokenizer/tests/bug26463.phpt:1.2.4.2
--- php-src/ext/tokenizer/tests/bug26463.phpt:1.2.4.1 Tue Dec 13 20:55:42 2005
+++ php-src/ext/tokenizer/tests/bug26463.phpt Wed Dec 21 11:42:06 2005
@@ -1,5 +1,7 @@
--TEST--
Bug #26463 (token_get_all() does not correctly handle semicolons after
T_END_HEREDOC)
+--SKIPIF--
+<?php if (!extension_loaded("tokenizer")) print "skip"; ?>
--FILE--
<?php
$str = '<?php
http://cvs.php.net/viewcvs.cgi/php-src/ext/wddx/tests/001.phpt?r1=1.5&r2=1.5.4.1&diff_format=u
Index: php-src/ext/wddx/tests/001.phpt
diff -u php-src/ext/wddx/tests/001.phpt:1.5
php-src/ext/wddx/tests/001.phpt:1.5.4.1
--- php-src/ext/wddx/tests/001.phpt:1.5 Sun Apr 4 18:07:36 2004
+++ php-src/ext/wddx/tests/001.phpt Wed Dec 21 11:42:06 2005
@@ -1,5 +1,7 @@
--TEST--
wddx deserialization test
+--SKIPIF--
+<?php if (!extension_loaded("wddx")) print "skip"; ?>
--FILE--
<?php
$path = dirname(__FILE__);
http://cvs.php.net/viewcvs.cgi/php-src/ext/wddx/tests/bug27287.phpt?r1=1.1&r2=1.1.6.1&diff_format=u
Index: php-src/ext/wddx/tests/bug27287.phpt
diff -u php-src/ext/wddx/tests/bug27287.phpt:1.1
php-src/ext/wddx/tests/bug27287.phpt:1.1.6.1
--- php-src/ext/wddx/tests/bug27287.phpt:1.1 Wed Feb 18 00:00:36 2004
+++ php-src/ext/wddx/tests/bug27287.phpt Wed Dec 21 11:42:06 2005
@@ -1,5 +1,7 @@
--TEST--
Bug #27287 (segfault with deserializing object data)
+--SKIPIF--
+<?php if (!extension_loaded("wddx")) print "skip"; ?>
--FILE--
<?php
http://cvs.php.net/viewcvs.cgi/php-src/ext/wddx/tests/bug34306.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u
Index: php-src/ext/wddx/tests/bug34306.phpt
diff -u php-src/ext/wddx/tests/bug34306.phpt:1.1.2.2
php-src/ext/wddx/tests/bug34306.phpt:1.1.2.3
--- php-src/ext/wddx/tests/bug34306.phpt:1.1.2.2 Wed Aug 31 14:31:44 2005
+++ php-src/ext/wddx/tests/bug34306.phpt Wed Dec 21 11:42:06 2005
@@ -1,5 +1,7 @@
--TEST--
#34306 (wddx_serialize_value() crashes with long array keys)
+--SKIPIF--
+<?php if (!extension_loaded("wddx")) print "skip"; ?>
--FILE--
<?php
http://cvs.php.net/viewcvs.cgi/php-src/ext/wddx/tests/bug35410.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u
Index: php-src/ext/wddx/tests/bug35410.phpt
diff -u php-src/ext/wddx/tests/bug35410.phpt:1.1.2.1
php-src/ext/wddx/tests/bug35410.phpt:1.1.2.2
--- php-src/ext/wddx/tests/bug35410.phpt:1.1.2.1 Wed Nov 30 18:10:14 2005
+++ php-src/ext/wddx/tests/bug35410.phpt Wed Dec 21 11:42:06 2005
@@ -1,5 +1,7 @@
--TEST--
#35410 (wddx_deserialize() doesn't handle large ints as keys properly)
+--SKIPIF--
+<?php if (!extension_loaded("wddx")) print "skip"; ?>
--FILE--
<?php
$wddx = <<<WDX
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
