moriyoshi Wed Oct 30 03:06:53 2002 EDT
Modified files:
/php4/ext/mbstring/tests bug20087.phpt casefold.phpt htmlent.phpt
mb_convert_encoding.phpt
mb_convert_variables.phpt
mb_detect_encoding.phpt
mb_detect_order.phpt mb_ereg.phpt
mb_ereg_replace.phpt
mb_ereg_search_xxx.phpt mb_http_input.phpt
mb_http_output.phpt
mb_internal_encoding.phpt
mb_output_handler_euc_jp.phpt
mb_preferred_mime_name.phpt
mb_regex_set_options.phpt mb_split.phpt
mb_strcut.phpt mb_strimwidth.phpt
mb_strlen.phpt mb_strpos.phpt
mb_strwidth.phpt
mb_substitute_character.phpt
mb_substr.phpt php_gr_jp_10830.phpt
simpletest.phpt
Log:
Clean up.
Index: php4/ext/mbstring/tests/bug20087.phpt
diff -u php4/ext/mbstring/tests/bug20087.phpt:1.2
php4/ext/mbstring/tests/bug20087.phpt:1.3
--- php4/ext/mbstring/tests/bug20087.phpt:1.2 Sat Oct 26 23:07:05 2002
+++ php4/ext/mbstring/tests/bug20087.phpt Wed Oct 30 03:06:52 2002
@@ -1,9 +1,7 @@
--TEST--
Bug #20087 (Assertion failure)
--SKIPIF--
-<?php include('skipif.inc'); ?>
---POST--
---GET--
+<?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
--FILE--
<?php
ini_set('include_path','.');
Index: php4/ext/mbstring/tests/casefold.phpt
diff -u php4/ext/mbstring/tests/casefold.phpt:1.3
php4/ext/mbstring/tests/casefold.phpt:1.4
--- php4/ext/mbstring/tests/casefold.phpt:1.3 Wed Oct 23 16:38:18 2002
+++ php4/ext/mbstring/tests/casefold.phpt Wed Oct 30 03:06:52 2002
@@ -1,11 +1,11 @@
--TEST--
mb_strtoupper() / mb_strtolower()
--SKIPIF--
-<?php include('skipif.inc'); ?>
+<?php
+extension_loaded('mbstring') or die('skip mbstring not available');
function_exists('mb_strtolower') and
function_exists('mb_convert_case' ) or die("SKIP");
---POST--
---GET--
+?>
--FILE--
<?php
mb_internal_encoding( 'ISO-8859-1' );
Index: php4/ext/mbstring/tests/htmlent.phpt
diff -u php4/ext/mbstring/tests/htmlent.phpt:1.2
php4/ext/mbstring/tests/htmlent.phpt:1.3
--- php4/ext/mbstring/tests/htmlent.phpt:1.2 Sun Oct 27 19:02:25 2002
+++ php4/ext/mbstring/tests/htmlent.phpt Wed Oct 30 03:06:52 2002
@@ -3,7 +3,7 @@
--SKIPIF--
<?php
ini_set('include_path','.');
- include('skipif.inc');
+ extension_loaded('mbstring') or die('skip mbstring not available');
?>
--INI--
output_handler=mb_output_handler
Index: php4/ext/mbstring/tests/mb_convert_encoding.phpt
diff -u php4/ext/mbstring/tests/mb_convert_encoding.phpt:1.1
php4/ext/mbstring/tests/mb_convert_encoding.phpt:1.2
--- php4/ext/mbstring/tests/mb_convert_encoding.phpt:1.1 Mon Oct 21 15:19:04
2002
+++ php4/ext/mbstring/tests/mb_convert_encoding.phpt Wed Oct 30 03:06:52 2002
@@ -1,9 +1,7 @@
--TEST--
mb_convert_encoding()
--SKIPIF--
-<?php include('skipif.inc'); ?>
---POST--
---GET--
+<?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
--FILE--
<?php
// TODO: Add more tests
Index: php4/ext/mbstring/tests/mb_convert_variables.phpt
diff -u php4/ext/mbstring/tests/mb_convert_variables.phpt:1.1
php4/ext/mbstring/tests/mb_convert_variables.phpt:1.2
--- php4/ext/mbstring/tests/mb_convert_variables.phpt:1.1 Mon Oct 21 15:19:04
2002
+++ php4/ext/mbstring/tests/mb_convert_variables.phpt Wed Oct 30 03:06:52 2002
@@ -1,9 +1,7 @@
--TEST--
mb_convert_variables()
--SKIPIF--
-<?php include('skipif.inc'); ?>
---POST--
---GET--
+<?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
--FILE--
<?php
// TODO: Add more tests
Index: php4/ext/mbstring/tests/mb_detect_encoding.phpt
diff -u php4/ext/mbstring/tests/mb_detect_encoding.phpt:1.1
php4/ext/mbstring/tests/mb_detect_encoding.phpt:1.2
--- php4/ext/mbstring/tests/mb_detect_encoding.phpt:1.1 Mon Oct 21 15:19:05 2002
+++ php4/ext/mbstring/tests/mb_detect_encoding.phpt Wed Oct 30 03:06:52 2002
@@ -1,9 +1,7 @@
--TEST--
mb_detect_encoding()
--SKIPIF--
-<?php include('skipif.inc'); ?>
---POST--
---GET--
+<?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
--FILE--
<?php
// TODO: Add more tests
Index: php4/ext/mbstring/tests/mb_detect_order.phpt
diff -u php4/ext/mbstring/tests/mb_detect_order.phpt:1.1
php4/ext/mbstring/tests/mb_detect_order.phpt:1.2
--- php4/ext/mbstring/tests/mb_detect_order.phpt:1.1 Mon Oct 21 15:19:05 2002
+++ php4/ext/mbstring/tests/mb_detect_order.phpt Wed Oct 30 03:06:52 2002
@@ -1,9 +1,7 @@
--TEST--
mb_detect_order()
--SKIPIF--
-<?php include('skipif.inc'); ?>
---POST--
---GET--
+<?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
--FILE--
<?php
//$debug = true;
Index: php4/ext/mbstring/tests/mb_ereg.phpt
diff -u php4/ext/mbstring/tests/mb_ereg.phpt:1.1
php4/ext/mbstring/tests/mb_ereg.phpt:1.2
--- php4/ext/mbstring/tests/mb_ereg.phpt:1.1 Mon Oct 21 15:19:05 2002
+++ php4/ext/mbstring/tests/mb_ereg.phpt Wed Oct 30 03:06:52 2002
@@ -1,10 +1,10 @@
--TEST--
mb_ereg()
--SKIPIF--
-<?php include('skipif.inc'); ?>
+<?php
+extension_loaded('mbstring') or die('skip mbstring not available');
function_exists('mb_ereg') or die("SKIP");
---POST--
---GET--
+?>
--FILE--
<?php
mb_regex_set_options( '' );
Index: php4/ext/mbstring/tests/mb_ereg_replace.phpt
diff -u php4/ext/mbstring/tests/mb_ereg_replace.phpt:1.1
php4/ext/mbstring/tests/mb_ereg_replace.phpt:1.2
--- php4/ext/mbstring/tests/mb_ereg_replace.phpt:1.1 Mon Oct 21 15:19:05 2002
+++ php4/ext/mbstring/tests/mb_ereg_replace.phpt Wed Oct 30 03:06:52 2002
@@ -1,10 +1,8 @@
--TEST--
mb_ereg_replace()
--SKIPIF--
-<?php include('skipif.inc'); ?>
+<?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
function_exists('mb_ereg_replace') or die("SKIP");
---POST--
---GET--
--FILE--
<?php
mb_regex_set_options( '' );
Index: php4/ext/mbstring/tests/mb_ereg_search_xxx.phpt
diff -u php4/ext/mbstring/tests/mb_ereg_search_xxx.phpt:1.1
php4/ext/mbstring/tests/mb_ereg_search_xxx.phpt:1.2
--- php4/ext/mbstring/tests/mb_ereg_search_xxx.phpt:1.1 Mon Oct 21 15:19:05 2002
+++ php4/ext/mbstring/tests/mb_ereg_search_xxx.phpt Wed Oct 30 03:06:52 2002
@@ -1,10 +1,10 @@
--TEST--
mb_ereg_search() stuff
--SKIPIF--
-<?php include('skipif.inc'); ?>
+<?php
+extension_loaded('mbstring') or die('skip mbstring not available');
function_exists('mb_ereg_search') or die("SKIP");
---POST--
---GET--
+?>
--FILE--
<?php
mb_regex_set_options( '' );
Index: php4/ext/mbstring/tests/mb_http_input.phpt
diff -u php4/ext/mbstring/tests/mb_http_input.phpt:1.1
php4/ext/mbstring/tests/mb_http_input.phpt:1.2
--- php4/ext/mbstring/tests/mb_http_input.phpt:1.1 Mon Oct 21 15:19:05 2002
+++ php4/ext/mbstring/tests/mb_http_input.phpt Wed Oct 30 03:06:52 2002
@@ -2,7 +2,7 @@
mb_http_input()
--SKIPIF--
<?php
-include('skipif.inc');
+extension_loaded('mbstring') or die('skip mbstring not available');
(php_sapi_name()=='cgi') or die("skip sapi is not a cgi version");
?>
--POST--
Index: php4/ext/mbstring/tests/mb_http_output.phpt
diff -u php4/ext/mbstring/tests/mb_http_output.phpt:1.1
php4/ext/mbstring/tests/mb_http_output.phpt:1.2
--- php4/ext/mbstring/tests/mb_http_output.phpt:1.1 Mon Oct 21 15:19:05 2002
+++ php4/ext/mbstring/tests/mb_http_output.phpt Wed Oct 30 03:06:52 2002
@@ -1,9 +1,7 @@
--TEST--
mb_http_output()
--SKIPIF--
-<?php include('skipif.inc'); ?>
---POST--
---GET--
+<?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
--FILE--
<?php
//TODO: Add more encoding. Wrong paramter type test.
Index: php4/ext/mbstring/tests/mb_internal_encoding.phpt
diff -u php4/ext/mbstring/tests/mb_internal_encoding.phpt:1.1
php4/ext/mbstring/tests/mb_internal_encoding.phpt:1.2
--- php4/ext/mbstring/tests/mb_internal_encoding.phpt:1.1 Mon Oct 21 15:19:05
2002
+++ php4/ext/mbstring/tests/mb_internal_encoding.phpt Wed Oct 30 03:06:52 2002
@@ -1,9 +1,7 @@
--TEST--
mb_internal_encoding()
--SKIPIF--
-<?php include('skipif.inc'); ?>
---POST--
---GET--
+<?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
--FILE--
<?php
// TODO:
Index: php4/ext/mbstring/tests/mb_output_handler_euc_jp.phpt
diff -u php4/ext/mbstring/tests/mb_output_handler_euc_jp.phpt:1.1
php4/ext/mbstring/tests/mb_output_handler_euc_jp.phpt:1.2
--- php4/ext/mbstring/tests/mb_output_handler_euc_jp.phpt:1.1 Mon Oct 21 15:19:05
2002
+++ php4/ext/mbstring/tests/mb_output_handler_euc_jp.phpt Wed Oct 30 03:06:52
+2002
@@ -1,9 +1,7 @@
--TEST--
mb_output_handler() (EUC-JP)
--SKIPIF--
-<?php include('skipif.inc'); ?>
---POST--
---GET--
+<?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
--FILE--
<?php
// TODO: Do real test
Index: php4/ext/mbstring/tests/mb_preferred_mime_name.phpt
diff -u php4/ext/mbstring/tests/mb_preferred_mime_name.phpt:1.1
php4/ext/mbstring/tests/mb_preferred_mime_name.phpt:1.2
--- php4/ext/mbstring/tests/mb_preferred_mime_name.phpt:1.1 Mon Oct 21 15:19:05
2002
+++ php4/ext/mbstring/tests/mb_preferred_mime_name.phpt Wed Oct 30 03:06:52 2002
@@ -1,9 +1,7 @@
--TEST--
mb_preferred_mime_name()
--SKIPIF--
-<?php include('skipif.inc'); ?>
---POST--
---GET--
+<?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
--FILE--
<?php
// TODO: Add more encoding names
Index: php4/ext/mbstring/tests/mb_regex_set_options.phpt
diff -u php4/ext/mbstring/tests/mb_regex_set_options.phpt:1.1
php4/ext/mbstring/tests/mb_regex_set_options.phpt:1.2
--- php4/ext/mbstring/tests/mb_regex_set_options.phpt:1.1 Mon Oct 21 15:19:05
2002
+++ php4/ext/mbstring/tests/mb_regex_set_options.phpt Wed Oct 30 03:06:52 2002
@@ -1,10 +1,10 @@
--TEST--
mb_regex_set_options()
--SKIPIF--
-<?php include('skipif.inc'); ?>
+<?php
+extension_loaded('mbstring') or die('skip mbstring not available');
function_exists('mb_regex_set_options') or die("SKIP");
---POST--
---GET--
+?>
--FILE--
<?php
mb_regex_set_options( 'x' );
Index: php4/ext/mbstring/tests/mb_split.phpt
diff -u php4/ext/mbstring/tests/mb_split.phpt:1.1
php4/ext/mbstring/tests/mb_split.phpt:1.2
--- php4/ext/mbstring/tests/mb_split.phpt:1.1 Mon Oct 21 15:19:05 2002
+++ php4/ext/mbstring/tests/mb_split.phpt Wed Oct 30 03:06:52 2002
@@ -1,10 +1,10 @@
--TEST--
mb_split()
--SKIPIF--
-<?php include('skipif.inc'); ?>
+<?php
+extension_loaded('mbstring') or die('skip mbstring not available');
function_exists('mb_split') or die("SKIP");
---POST--
---GET--
+?>
--FILE--
<?php
mb_regex_set_options( '' );
Index: php4/ext/mbstring/tests/mb_strcut.phpt
diff -u php4/ext/mbstring/tests/mb_strcut.phpt:1.1
php4/ext/mbstring/tests/mb_strcut.phpt:1.2
--- php4/ext/mbstring/tests/mb_strcut.phpt:1.1 Mon Oct 21 15:19:05 2002
+++ php4/ext/mbstring/tests/mb_strcut.phpt Wed Oct 30 03:06:52 2002
@@ -1,9 +1,7 @@
--TEST--
mb_strcut()
--SKIPIF--
-<?php include('skipif.inc'); ?>
---POST--
---GET--
+<?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
--FILE--
<?php
// TODO: Add more encodings
Index: php4/ext/mbstring/tests/mb_strimwidth.phpt
diff -u php4/ext/mbstring/tests/mb_strimwidth.phpt:1.1
php4/ext/mbstring/tests/mb_strimwidth.phpt:1.2
--- php4/ext/mbstring/tests/mb_strimwidth.phpt:1.1 Mon Oct 21 15:19:05 2002
+++ php4/ext/mbstring/tests/mb_strimwidth.phpt Wed Oct 30 03:06:52 2002
@@ -1,9 +1,7 @@
--TEST--
mb_strimwidth()
--SKIPIF--
-<?php include('skipif.inc'); ?>
---POST--
---GET--
+<?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
--FILE--
<?php
// TODO: Add more encoding
Index: php4/ext/mbstring/tests/mb_strlen.phpt
diff -u php4/ext/mbstring/tests/mb_strlen.phpt:1.1
php4/ext/mbstring/tests/mb_strlen.phpt:1.2
--- php4/ext/mbstring/tests/mb_strlen.phpt:1.1 Mon Oct 21 15:19:05 2002
+++ php4/ext/mbstring/tests/mb_strlen.phpt Wed Oct 30 03:06:52 2002
@@ -1,9 +1,7 @@
--TEST--
mb_strlen()
--SKIPIF--
-<?php include('skipif.inc'); ?>
---POST--
---GET--
+<?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
--FILE--
<?php
// TODO: Add more encodings
Index: php4/ext/mbstring/tests/mb_strpos.phpt
diff -u php4/ext/mbstring/tests/mb_strpos.phpt:1.1
php4/ext/mbstring/tests/mb_strpos.phpt:1.2
--- php4/ext/mbstring/tests/mb_strpos.phpt:1.1 Mon Oct 21 15:19:05 2002
+++ php4/ext/mbstring/tests/mb_strpos.phpt Wed Oct 30 03:06:52 2002
@@ -1,9 +1,7 @@
--TEST--
mb_strpos()
--SKIPIF--
-<?php include('skipif.inc'); ?>
---POST--
---GET--
+<?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
--FILE--
<?php
// TODO: Add more encodings
Index: php4/ext/mbstring/tests/mb_strwidth.phpt
diff -u php4/ext/mbstring/tests/mb_strwidth.phpt:1.1
php4/ext/mbstring/tests/mb_strwidth.phpt:1.2
--- php4/ext/mbstring/tests/mb_strwidth.phpt:1.1 Mon Oct 21 15:19:05 2002
+++ php4/ext/mbstring/tests/mb_strwidth.phpt Wed Oct 30 03:06:52 2002
@@ -1,9 +1,7 @@
--TEST--
mb_strwidth()
--SKIPIF--
-<?php include('skipif.inc'); ?>
---POST--
---GET--
+<?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
--FILE--
<?php
// TODO: Add more encoding, strings.....
Index: php4/ext/mbstring/tests/mb_substitute_character.phpt
diff -u php4/ext/mbstring/tests/mb_substitute_character.phpt:1.1
php4/ext/mbstring/tests/mb_substitute_character.phpt:1.2
--- php4/ext/mbstring/tests/mb_substitute_character.phpt:1.1 Mon Oct 21 15:19:05
2002
+++ php4/ext/mbstring/tests/mb_substitute_character.phpt Wed Oct 30 03:06:52
+2002
@@ -1,9 +1,7 @@
--TEST--
mb_substitute_character()
--SKIPIF--
-<?php include('skipif.inc'); ?>
---POST--
---GET--
+<?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
--FILE--
<?php
//$debug = true;
Index: php4/ext/mbstring/tests/mb_substr.phpt
diff -u php4/ext/mbstring/tests/mb_substr.phpt:1.1
php4/ext/mbstring/tests/mb_substr.phpt:1.2
--- php4/ext/mbstring/tests/mb_substr.phpt:1.1 Mon Oct 21 15:19:05 2002
+++ php4/ext/mbstring/tests/mb_substr.phpt Wed Oct 30 03:06:52 2002
@@ -1,9 +1,7 @@
--TEST--
mb_substr()
--SKIPIF--
-<?php include('skipif.inc'); ?>
---POST--
---GET--
+<?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
--FILE--
<?php
// TODO: Add more encodings
Index: php4/ext/mbstring/tests/php_gr_jp_10830.phpt
diff -u php4/ext/mbstring/tests/php_gr_jp_10830.phpt:1.1
php4/ext/mbstring/tests/php_gr_jp_10830.phpt:1.2
--- php4/ext/mbstring/tests/php_gr_jp_10830.phpt:1.1 Mon Oct 21 15:19:05 2002
+++ php4/ext/mbstring/tests/php_gr_jp_10830.phpt Wed Oct 30 03:06:52 2002
@@ -1,10 +1,10 @@
--TEST--
[EMAIL PROTECTED] #10830
--SKIPIF--
-<?php include('skipif.inc'); ?>
+<?php
+extension_loaded('mbstring') or die('skip mbstring not available');
function_exists('mb_ereg') or die("SKIP");
---POST--
---GET--
+?>
--FILE--
<?php
$a="aaa\n<>";
Index: php4/ext/mbstring/tests/simpletest.phpt
diff -u php4/ext/mbstring/tests/simpletest.phpt:1.1
php4/ext/mbstring/tests/simpletest.phpt:1.2
--- php4/ext/mbstring/tests/simpletest.phpt:1.1 Mon Oct 21 15:19:05 2002
+++ php4/ext/mbstring/tests/simpletest.phpt Wed Oct 30 03:06:52 2002
@@ -1,9 +1,7 @@
--TEST--
Simple multi-byte print test (EUC-JP)
--SKIPIF--
-<?php include('skipif.inc'); ?>
---POST--
---GET--
+<?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
--FILE--
<?php
/*
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
