From: Antony Dovgal <tony2001@php.net>
Date: Wed, 21 Dec 2005 11:43:24 +0000 (+0000)
Subject: MFB: add missing skipif conditions, fix existing ones
X-Git-Tag: RELEASE_1_0_4~289
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=632e5716429b0cb7324fd13a0b2d933ebae76a3b;p=php

MFB: add missing skipif conditions, fix existing ones
add one missing test
---

diff --git a/ext/calendar/tests/jdtojewish.phpt b/ext/calendar/tests/jdtojewish.phpt
index c6dc1fd594..484b95749c 100644
--- a/ext/calendar/tests/jdtojewish.phpt
+++ b/ext/calendar/tests/jdtojewish.phpt
@@ -1,5 +1,7 @@
 --TEST--
 jdtojewish() function
+--SKIPIF--
+<?php include 'skipif.inc'; ?>
 --FILE--
 <?php
 
diff --git a/ext/ctype/tests/bug25745.phpt b/ext/ctype/tests/bug25745.phpt
index 1d0ae0da7e..74320a865c 100644
--- a/ext/ctype/tests/bug25745.phpt
+++ b/ext/ctype/tests/bug25745.phpt
@@ -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(
diff --git a/ext/ctype/tests/bug34645.phpt b/ext/ctype/tests/bug34645.phpt
new file mode 100644
index 0000000000..8c8e260c28
--- /dev/null
+++ b/ext/ctype/tests/bug34645.phpt
@@ -0,0 +1,13 @@
+--TEST--
+Bug #34645 (ctype corrupts memory when validating large numbers)
+--SKIPIF--
+<?php if (!extension_loaded("ctype")) print "skip"; ?>
+--FILE--
+<?php
+$id = 394829384;
+var_dump(ctype_digit($id));
+var_dump($id);
+?>
+--EXPECT--
+bool(true)
+int(394829384)
diff --git a/ext/iconv/tests/iconv003.phpt b/ext/iconv/tests/iconv003.phpt
index 9fcfe4b0cd..9642cf1e79 100644
--- a/ext/iconv/tests/iconv003.phpt
+++ b/ext/iconv/tests/iconv003.phpt
@@ -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) { 
diff --git a/ext/iconv/tests/iconv004.phpt b/ext/iconv/tests/iconv004.phpt
index 0e40ed4fcc..9254f5a129 100644
--- a/ext/iconv/tests/iconv004.phpt
+++ b/ext/iconv/tests/iconv004.phpt
@@ -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('', ''));
diff --git a/ext/iconv/tests/iconv_mime_decode_headers.phpt b/ext/iconv/tests/iconv_mime_decode_headers.phpt
index 3f5f48b564..6ad3d94d33 100644
--- a/ext/iconv/tests/iconv_mime_decode_headers.phpt
+++ b/ext/iconv/tests/iconv_mime_decode_headers.phpt
@@ -1,6 +1,6 @@
 --TEST--
 iconv_mime_decode_headers()
---SKIP--
+--SKIPIF--
 <?php extension_loaded('iconv') or die('skip iconv extension is not available'); ?>
 --INI--
 unicode.script_encoding=ISO-8859-1
diff --git a/ext/mbstring/tests/bug28220.phpt b/ext/mbstring/tests/bug28220.phpt
index 563e2da743..f195606a15 100644
--- a/ext/mbstring/tests/bug28220.phpt
+++ b/ext/mbstring/tests/bug28220.phpt
@@ -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(
diff --git a/ext/mbstring/tests/bug30549.phpt b/ext/mbstring/tests/bug30549.phpt
index dbd8e0bd19..a6007e0b38 100644
--- a/ext/mbstring/tests/bug30549.phpt
+++ b/ext/mbstring/tests/bug30549.phpt
@@ -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));
diff --git a/ext/mbstring/tests/bug31911.phpt b/ext/mbstring/tests/bug31911.phpt
index eb6438d4e7..48d4971759 100644
--- a/ext/mbstring/tests/bug31911.phpt
+++ b/ext/mbstring/tests/bug31911.phpt
@@ -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?=");
diff --git a/ext/oci8/tests/cursor_bind.phpt b/ext/oci8/tests/cursor_bind.phpt
index b89646b340..c2ce15cb38 100644
--- a/ext/oci8/tests/cursor_bind.phpt
+++ b/ext/oci8/tests/cursor_bind.phpt
@@ -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
 
diff --git a/ext/pdo_sqlite/tests/bug35336.phpt b/ext/pdo_sqlite/tests/bug35336.phpt
index 9fe77e19b7..59dbda38ba 100644
--- a/ext/pdo_sqlite/tests/bug35336.phpt
+++ b/ext/pdo_sqlite/tests/bug35336.phpt
@@ -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 {
diff --git a/ext/simplexml/tests/bug27010.phpt b/ext/simplexml/tests/bug27010.phpt
index 9b08932cd9..364ca4675f 100755
--- a/ext/simplexml/tests/bug27010.phpt
+++ b/ext/simplexml/tests/bug27010.phpt
@@ -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
 
diff --git a/ext/sqlite/tests/bug28112.phpt b/ext/sqlite/tests/bug28112.phpt
index 05c8ff81f3..f3e9b8b9ec 100755
--- a/ext/sqlite/tests/bug28112.phpt
+++ b/ext/sqlite/tests/bug28112.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #28112 (sqlite_query() crashing apache on malformed query)
+--SKIPIF--
+<?php if (!extension_loaded("sqlite")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/tokenizer/tests/001.phpt b/ext/tokenizer/tests/001.phpt
index 8e1df283aa..36ed2696fa 100644
--- a/ext/tokenizer/tests/001.phpt
+++ b/ext/tokenizer/tests/001.phpt
@@ -1,5 +1,7 @@
 --TEST--
 token_name()
+--SKIPIF--
+<?php if (!extension_loaded("tokenizer")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/tokenizer/tests/002.phpt b/ext/tokenizer/tests/002.phpt
index 3191b5694f..ce100cc30a 100644
--- a/ext/tokenizer/tests/002.phpt
+++ b/ext/tokenizer/tests/002.phpt
@@ -1,5 +1,7 @@
 --TEST--
 token_get_all()
+--SKIPIF--
+<?php if (!extension_loaded("tokenizer")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/tokenizer/tests/003.phpt b/ext/tokenizer/tests/003.phpt
index 90a58f0d30..802728b976 100644
--- a/ext/tokenizer/tests/003.phpt
+++ b/ext/tokenizer/tests/003.phpt
@@ -1,5 +1,7 @@
 --TEST--
 token_get_all() and wrong parameters
+--SKIPIF--
+<?php if (!extension_loaded("tokenizer")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/tokenizer/tests/bug26463.phpt b/ext/tokenizer/tests/bug26463.phpt
index 679ffe3c37..8739c2a2b2 100644
--- a/ext/tokenizer/tests/bug26463.phpt
+++ b/ext/tokenizer/tests/bug26463.phpt
@@ -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
diff --git a/ext/wddx/tests/001.phpt b/ext/wddx/tests/001.phpt
index 825d685733..3c77603b5a 100644
--- a/ext/wddx/tests/001.phpt
+++ b/ext/wddx/tests/001.phpt
@@ -1,5 +1,7 @@
 --TEST--
 wddx unserialization test
+--SKIPIF--
+<?php if (!extension_loaded("wddx")) print "skip"; ?>
 --FILE--
 <?php
 	$path = dirname(__FILE__);
diff --git a/ext/wddx/tests/bug27287.phpt b/ext/wddx/tests/bug27287.phpt
index 9029e1c88c..1bb7be71df 100755
--- a/ext/wddx/tests/bug27287.phpt
+++ b/ext/wddx/tests/bug27287.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Bug #27287 (segfault with unserializing object data)
+--SKIPIF--
+<?php if (!extension_loaded("wddx")) print "skip"; ?>
 --FILE--
 <?php
 	
diff --git a/ext/wddx/tests/bug34306.phpt b/ext/wddx/tests/bug34306.phpt
index 2212dad918..5f1a0df72f 100755
--- a/ext/wddx/tests/bug34306.phpt
+++ b/ext/wddx/tests/bug34306.phpt
@@ -1,5 +1,7 @@
 --TEST--
 #34306 (wddx_serialize_value() crashes with long array keys)
+--SKIPIF--
+<?php if (!extension_loaded("wddx")) print "skip"; ?>
 --FILE--
 <?php
 
diff --git a/ext/wddx/tests/bug35410.phpt b/ext/wddx/tests/bug35410.phpt
index a14544d03c..8ea44a78e7 100755
--- a/ext/wddx/tests/bug35410.phpt
+++ b/ext/wddx/tests/bug35410.phpt
@@ -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