From 078bcec0997ad0e07b720c43cc9e6d0e046a75ab Mon Sep 17 00:00:00 2001
From: SVN Migration <svn@php.net>
Date: Thu, 27 Feb 2003 17:43:39 +0000
Subject: This commit was manufactured by cvs2svn to create branch 'PHP_5'.

---
 ext/mbstring/tests/bug20087.phpt                   |  20 ---
 ext/mbstring/tests/casefold.phpt                   |  24 ---
 ext/mbstring/tests/common.inc                      |  53 -------
 ext/mbstring/tests/htmlent.phpt                    |  35 -----
 ext/mbstring/tests/ini_language.phpt               |  15 --
 ext/mbstring/tests/mb_convert_encoding.phpt        | 137 ----------------
 ext/mbstring/tests/mb_convert_variables.phpt       | 163 -------------------
 ext/mbstring/tests/mb_detect_encoding.phpt         | 119 --------------
 ext/mbstring/tests/mb_detect_order.phpt            |  59 -------
 ext/mbstring/tests/mb_ereg-compat-01.phpt          |  21 ---
 ext/mbstring/tests/mb_ereg-compat-02.phpt          |  25 ---
 ext/mbstring/tests/mb_ereg.phpt                    |  47 ------
 ext/mbstring/tests/mb_ereg_replace-compat-01.phpt  |  15 --
 ext/mbstring/tests/mb_ereg_replace-compat-02.phpt  |  15 --
 ext/mbstring/tests/mb_ereg_replace-compat-03.phpt  |  15 --
 ext/mbstring/tests/mb_ereg_replace-compat-04.phpt  |  15 --
 ext/mbstring/tests/mb_ereg_replace-compat-05.phpt  |  16 --
 ext/mbstring/tests/mb_ereg_replace-compat-06.phpt  |  14 --
 ext/mbstring/tests/mb_ereg_replace-compat-07.phpt  |  15 --
 ext/mbstring/tests/mb_ereg_replace-compat-08.phpt  |  15 --
 ext/mbstring/tests/mb_ereg_replace-compat-09.phpt  |  15 --
 ext/mbstring/tests/mb_ereg_replace-compat-10.phpt  |  15 --
 ext/mbstring/tests/mb_ereg_replace-compat-11.phpt  |  15 --
 ext/mbstring/tests/mb_ereg_replace-compat-12.phpt  |  14 --
 ext/mbstring/tests/mb_ereg_replace-compat-13.phpt  |  14 --
 ext/mbstring/tests/mb_ereg_replace.phpt            |  18 ---
 ext/mbstring/tests/mb_ereg_search_xxx.phpt         |  82 ----------
 ext/mbstring/tests/mb_http_input.phpt              |  50 ------
 ext/mbstring/tests/mb_http_output.phpt             |  84 ----------
 ext/mbstring/tests/mb_internal_encoding.phpt       |  68 --------
 ext/mbstring/tests/mb_output_handler_euc_jp.phpt   |  21 ---
 .../tests/mb_output_handler_shift_jis.phpt         |  16 --
 ext/mbstring/tests/mb_parse_str.phpt               |  79 ----------
 ext/mbstring/tests/mb_parse_str02.phpt             | 104 ------------
 ext/mbstring/tests/mb_preferred_mime_name.phpt     |  61 -------
 ext/mbstring/tests/mb_regex_set_options.phpt       |  18 ---
 ext/mbstring/tests/mb_send_mail01.phpt             |  38 -----
 ext/mbstring/tests/mb_send_mail02.phpt             |  38 -----
 ext/mbstring/tests/mb_send_mail03.phpt             |  38 -----
 ext/mbstring/tests/mb_send_mail04.phpt             |  38 -----
 ext/mbstring/tests/mb_send_mail05.phpt             |  42 -----
 ext/mbstring/tests/mb_send_mail06.phpt             |  41 -----
 ext/mbstring/tests/mb_send_mail07.phpt             |  41 -----
 ext/mbstring/tests/mb_split-compat-01.phpt         |  23 ---
 ext/mbstring/tests/mb_split.phpt                   |  48 ------
 ext/mbstring/tests/mb_strcut.phpt                  |  34 ----
 ext/mbstring/tests/mb_strimwidth.phpt              |  43 -----
 ext/mbstring/tests/mb_strlen.phpt                  | 104 ------------
 ext/mbstring/tests/mb_strpos.phpt                  | 175 ---------------------
 ext/mbstring/tests/mb_strwidth.phpt                |  32 ----
 ext/mbstring/tests/mb_substitute_character.phpt    |  49 ------
 ext/mbstring/tests/mb_substr.phpt                  |  34 ----
 ext/mbstring/tests/mb_substr_count.phpt            |  44 ------
 ext/mbstring/tests/overload01.phpt                 |  25 ---
 ext/mbstring/tests/overload02.phpt                 |  36 -----
 ext/mbstring/tests/php_gr_jp_10830.phpt            |  18 ---
 ext/mbstring/tests/simpletest.phpt                 |  34 ----
 ext/mbstring/tests/skipif.inc                      |  14 --
 ext/mbstring/tests/zend-multibyte.phpt             |  23 ---
 59 files changed, 2524 deletions(-)
 delete mode 100644 ext/mbstring/tests/bug20087.phpt
 delete mode 100644 ext/mbstring/tests/casefold.phpt
 delete mode 100644 ext/mbstring/tests/common.inc
 delete mode 100644 ext/mbstring/tests/htmlent.phpt
 delete mode 100644 ext/mbstring/tests/ini_language.phpt
 delete mode 100644 ext/mbstring/tests/mb_convert_encoding.phpt
 delete mode 100644 ext/mbstring/tests/mb_convert_variables.phpt
 delete mode 100644 ext/mbstring/tests/mb_detect_encoding.phpt
 delete mode 100644 ext/mbstring/tests/mb_detect_order.phpt
 delete mode 100644 ext/mbstring/tests/mb_ereg-compat-01.phpt
 delete mode 100644 ext/mbstring/tests/mb_ereg-compat-02.phpt
 delete mode 100644 ext/mbstring/tests/mb_ereg.phpt
 delete mode 100644 ext/mbstring/tests/mb_ereg_replace-compat-01.phpt
 delete mode 100644 ext/mbstring/tests/mb_ereg_replace-compat-02.phpt
 delete mode 100644 ext/mbstring/tests/mb_ereg_replace-compat-03.phpt
 delete mode 100644 ext/mbstring/tests/mb_ereg_replace-compat-04.phpt
 delete mode 100644 ext/mbstring/tests/mb_ereg_replace-compat-05.phpt
 delete mode 100644 ext/mbstring/tests/mb_ereg_replace-compat-06.phpt
 delete mode 100644 ext/mbstring/tests/mb_ereg_replace-compat-07.phpt
 delete mode 100644 ext/mbstring/tests/mb_ereg_replace-compat-08.phpt
 delete mode 100644 ext/mbstring/tests/mb_ereg_replace-compat-09.phpt
 delete mode 100644 ext/mbstring/tests/mb_ereg_replace-compat-10.phpt
 delete mode 100644 ext/mbstring/tests/mb_ereg_replace-compat-11.phpt
 delete mode 100644 ext/mbstring/tests/mb_ereg_replace-compat-12.phpt
 delete mode 100644 ext/mbstring/tests/mb_ereg_replace-compat-13.phpt
 delete mode 100644 ext/mbstring/tests/mb_ereg_replace.phpt
 delete mode 100644 ext/mbstring/tests/mb_ereg_search_xxx.phpt
 delete mode 100644 ext/mbstring/tests/mb_http_input.phpt
 delete mode 100644 ext/mbstring/tests/mb_http_output.phpt
 delete mode 100644 ext/mbstring/tests/mb_internal_encoding.phpt
 delete mode 100644 ext/mbstring/tests/mb_output_handler_euc_jp.phpt
 delete mode 100644 ext/mbstring/tests/mb_output_handler_shift_jis.phpt
 delete mode 100644 ext/mbstring/tests/mb_parse_str.phpt
 delete mode 100644 ext/mbstring/tests/mb_parse_str02.phpt
 delete mode 100644 ext/mbstring/tests/mb_preferred_mime_name.phpt
 delete mode 100644 ext/mbstring/tests/mb_regex_set_options.phpt
 delete mode 100644 ext/mbstring/tests/mb_send_mail01.phpt
 delete mode 100644 ext/mbstring/tests/mb_send_mail02.phpt
 delete mode 100644 ext/mbstring/tests/mb_send_mail03.phpt
 delete mode 100644 ext/mbstring/tests/mb_send_mail04.phpt
 delete mode 100644 ext/mbstring/tests/mb_send_mail05.phpt
 delete mode 100644 ext/mbstring/tests/mb_send_mail06.phpt
 delete mode 100644 ext/mbstring/tests/mb_send_mail07.phpt
 delete mode 100644 ext/mbstring/tests/mb_split-compat-01.phpt
 delete mode 100644 ext/mbstring/tests/mb_split.phpt
 delete mode 100644 ext/mbstring/tests/mb_strcut.phpt
 delete mode 100644 ext/mbstring/tests/mb_strimwidth.phpt
 delete mode 100644 ext/mbstring/tests/mb_strlen.phpt
 delete mode 100644 ext/mbstring/tests/mb_strpos.phpt
 delete mode 100644 ext/mbstring/tests/mb_strwidth.phpt
 delete mode 100644 ext/mbstring/tests/mb_substitute_character.phpt
 delete mode 100644 ext/mbstring/tests/mb_substr.phpt
 delete mode 100644 ext/mbstring/tests/mb_substr_count.phpt
 delete mode 100644 ext/mbstring/tests/overload01.phpt
 delete mode 100644 ext/mbstring/tests/overload02.phpt
 delete mode 100644 ext/mbstring/tests/php_gr_jp_10830.phpt
 delete mode 100644 ext/mbstring/tests/simpletest.phpt
 delete mode 100644 ext/mbstring/tests/skipif.inc
 delete mode 100644 ext/mbstring/tests/zend-multibyte.phpt

(limited to 'ext/mbstring/tests')

diff --git a/ext/mbstring/tests/bug20087.phpt b/ext/mbstring/tests/bug20087.phpt
deleted file mode 100644
index efae733ca2..0000000000
--- a/ext/mbstring/tests/bug20087.phpt
+++ /dev/null
@@ -1,20 +0,0 @@
---TEST--
-Bug #20087 (Assertion failure)
---SKIPIF--
-<?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
---FILE--
-<?php
-ini_set('include_path','.');
-include_once('common.inc');
-$testmoo = "blah blah";
-var_dump(mb_parse_str("testmoo"));
-var_dump($testmoo);
-var_dump(mb_parse_str("test=moo"));
-var_dump($test);
-?>
---EXPECT--
-bool(true)
-string(0) ""
-bool(true)
-string(3) "moo"
-
diff --git a/ext/mbstring/tests/casefold.phpt b/ext/mbstring/tests/casefold.phpt
deleted file mode 100644
index 977b0bb658..0000000000
--- a/ext/mbstring/tests/casefold.phpt
+++ /dev/null
@@ -1,24 +0,0 @@
---TEST--
-mb_strtoupper() / mb_strtolower() 
---SKIPIF--
-<?php
-extension_loaded('mbstring') or die('skip mbstring not available');
-function_exists('mb_strtolower') and
-function_exists('mb_convert_case' ) or die("skip mb_convert_case() is not available");
-?>
---INI--
-output_handler=
---FILE--
-<?php
-	mb_internal_encoding( 'ISO-8859-1' );
-	print mb_strtolower( "ABCDEFGHIJKLMNOPQRSTUVWXYZ\n" );
-	print mb_strtoupper( mb_strtolower( "ABCDEFGHIJKLMNOPQRSTUVWXYZ\n" ) );
-	print mb_strtoupper( "äëï\n" );
-	print mb_convert_case( "äëï\n", MB_CASE_TITLE );
-?>
-
---EXPECT--
-abcdefghijklmnopqrstuvwxyz
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
-ÄËÏ
-Äëï
diff --git a/ext/mbstring/tests/common.inc b/ext/mbstring/tests/common.inc
deleted file mode 100644
index d4d1d9a495..0000000000
--- a/ext/mbstring/tests/common.inc
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-/*
- * Common definition and Settings
- */
-
-// Custom Error Hanlder for testing
-function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) {
-	global $debug;
-	
-	$err_type = array (
-				1	=> "Error",			// E_ERROR
-				2	=> "Warning",			// E_WARINING
-				4	=> "Parsing Error",	// E_PARSE
-				8	=> "Notice",			// E_NOTICE
-				16	=> "Core Error",		// E_CORE_ERROR
-				32	=> "Core Warning",		// E_CORE_WARNING
-				64	=> "Compile Error",	// E_COMPILE_ERROR
-				128 => "Compile Warning",	// E_COMPILE_WARNING
-				256 => "User Error",		// E_USER_ERROR
-				512 => "User Warning",		// E_USER_WARMING
-				1024=> "User Notice"		// E_USER_NOTICE
-				);
-	
-	if (!empty($debug)) {
-		printf("%s: %s (%d)\n", $err_type[$err_no], $err_msg, $linenum);
-	}
-	else {
-		printf("ERR: %s\n",$err_type[$err_no]);
-	}
-}
-
-set_error_handler('test_error_handler');
-
-
-// Var def for testing
-$t_ary = array(
-		's1' => 'ÆüËܸìEUC-JP¤Îʸ»úÎó',
-		's2' => 'English Text'
-		);
-
-class tc
-{
-	var $s1 = 'ÆüËܸìEUC-JP¤Îʸ»úÎó';
-	var $s2 = 'English Text';
-
-	function tc() 
-	{
-	}
-}
-
-$t_obj = new tc;
-
-?>
\ No newline at end of file
diff --git a/ext/mbstring/tests/htmlent.phpt b/ext/mbstring/tests/htmlent.phpt
deleted file mode 100644
index ca7d64ba41..0000000000
--- a/ext/mbstring/tests/htmlent.phpt
+++ /dev/null
@@ -1,35 +0,0 @@
---TEST--
-HTML input/output
---SKIPIF--
-<?php 
-	ini_set('include_path','.'); 
-	extension_loaded('mbstring') or die('skip mbstring not available'); 
-?>
---INI--
-output_handler=mb_output_handler
-zlib.output_compression=
-arg_separator.input="x"
-error_reporting=0
-mbstring.http_input=HTML-ENTITIES
-mbstring.internal_encoding=UTF8
-mbstring.http_output=HTML-ENTITIES
-mbstring.encoding_translation=1
---FILE--
-<?php
-// enable output encoding through output handler
-ob_start("mb_output_handler");
-// &#64... are must be decoded on input these are not reencoded on output. 
-// If you see &#64;&#65;&#66; on output this means input encoding fails.
-// If you do not see &auml;... on output this means output encoding fails.
-// Using UTF-8 internally allows to encode/decode ALL characters.
-// &128... will stay as they are since their character codes are above 127
-// and they do not have a named entity representaion.
-?>
-<?php echo mb_http_input('l').'>'.mb_internal_encoding().'>'.mb_http_output();?>
-
-<?php mb_parse_str("test=&&;&&#64;&#65;&#66;&#128;&#129;&#130;&auml;&ouml;&uuml;&euro;&lang;&rang;");
-echo "test='$test'";
-?>
---EXPECT--
-HTML-ENTITIES>UTF-8>HTML-ENTITIES
-test='&&;&@AB&#128;&#129;&#130;&auml;&ouml;&uuml;&euro;&lang;&rang;'
\ No newline at end of file
diff --git a/ext/mbstring/tests/ini_language.phpt b/ext/mbstring/tests/ini_language.phpt
deleted file mode 100644
index a8b42c78e7..0000000000
--- a/ext/mbstring/tests/ini_language.phpt
+++ /dev/null
@@ -1,15 +0,0 @@
---TEST--
-mbstring.language bug
---SKIPIF--
-<?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
---INI--
-mbstring.internal_encoding=Shift_JIS
-mbstring.language=Japanese
---FILE--
-<?php
-var_dump(ini_get('mbstring.internal_encoding'));
-var_dump(mb_internal_encoding());
-?>
---EXPECT--
-string(6) "EUC-JP"
-string(6) "EUC-JP"
diff --git a/ext/mbstring/tests/mb_convert_encoding.phpt b/ext/mbstring/tests/mb_convert_encoding.phpt
deleted file mode 100644
index 774563683e..0000000000
--- a/ext/mbstring/tests/mb_convert_encoding.phpt
+++ /dev/null
@@ -1,137 +0,0 @@
---TEST--
-mb_convert_encoding()
---SKIPIF--
-<?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
---INI--
-output_handler=
---FILE--
-<?php
-// TODO: Add more tests
-//$debug = true; // Uncomment this line to view error/warning/notice message in *.out file
-ini_set('include_path','.');
-include_once('common.inc');
-
-// SJIS string (BASE64 encoded)
-$sjis = base64_decode('k/qWe4zqg2WDTINYg2eCxYK3gUIwMTIzNIJUglWCVoJXgliBQg==');
-// JIS string (BASE64 encoded)
-$jis = base64_decode('GyRCRnxLXDhsJUYlLSU5JUgkRyQ5ISMbKEIwMTIzNBskQiM1IzYjNyM4IzkhIxsoQg==');
-// EUC-JP string
-$euc_jp = 'ÆüËܸì¥Æ¥­¥¹¥È¤Ç¤¹¡£01234£µ£¶£·£¸£¹¡£';
-
-// Test with sigle "form encoding"
-// Note: For some reason it complains, results are differ. Not reserched.
-echo "== BASIC TEST ==\n";
-$s = $sjis;
-$s = mb_convert_encoding($s, 'EUC-JP', 'SJIS');
-print("EUC-JP: $s\n"); // EUC-JP
-
-$s = $jis;
-$s = mb_convert_encoding($s, 'EUC-JP', 'JIS');
-print("EUC-JP: $s\n"); // EUC-JP
-
-$s = $euc_jp;
-$s = mb_convert_encoding($s, 'SJIS', 'EUC-JP');
-print("SJIS: ".base64_encode($s)."\n"); // SJIS
-
-$s = $euc_jp;
-$s = mb_convert_encoding($s, 'JIS', 'EUC-JP');
-print("JIS: ".base64_encode($s)."\n"); // JIS
-
-
-// Using Encoding List Array 
-echo "== STRING ENCODING LIST ==\n";
-
-$a = 'JIS,UTF-8,EUC-JP,SJIS';
-$s = $jis;
-$s = mb_convert_encoding($s, 'EUC-JP', $a);
-print("EUC-JP: $s\n"); // EUC-JP
-
-$s = $euc_jp;
-$s = mb_convert_encoding($s, 'SJIS', $a);
-print("SJIS: ".base64_encode($s)."\n");  // SJIS
-
-$s = $euc_jp;
-$s = mb_convert_encoding($s, 'JIS', $a);
-print("JIS: ".base64_encode($s)."\n"); // JIS
-
-
-// Using Encoding List Array 
-echo "== ARRAY ENCODING LIST ==\n";
-
-$a = array(0=>'JIS', 1=>'UTF-8', 2=>'EUC-JP', 3=>'SJIS');
-$s = $jis;
-$s = mb_convert_encoding($s, 'EUC-JP', $a);
-print("EUC-JP: $s\n"); // EUC-JP
-
-$s = $euc_jp;
-$s = mb_convert_encoding($s, 'SJIS', $a);
-print("SJIS: ".base64_encode($s)."\n");  // SJIS
-
-$s = $euc_jp;
-$s = mb_convert_encoding($s, 'JIS', $a);
-print("JIS: ".base64_encode($s)."\n"); // JIS
-
-
-// Using Detect Order 
-echo "== DETECT ORDER ==\n";
-
-$s = $jis;
-$s = mb_convert_encoding($s, 'EUC-JP', 'auto');
-print("EUC-JP: $s\n"); // EUC-JP
-
-$s = $euc_jp;
-$s = mb_convert_encoding($s, 'SJIS', 'auto');
-print("SJIS: ".base64_encode($s)."\n");  // SJIS
-
-$s = $euc_jp;
-$s = mb_convert_encoding($s, 'JIS', 'auto');
-print("JIS: ".base64_encode($s)."\n"); // JIS
-
-
-// Invalid(?) Parameters
-echo "== INVALID PARAMETER ==\n";
-
-$s = mb_convert_encoding(1234, 'EUC-JP');
-print("INT: $s\n"); // EUC-JP
-
-$s = mb_convert_encoding('', 'EUC-JP');
-print("EUC-JP: $s\n");  // SJIS
-
-$s = $euc_jp;
-$s = mb_convert_encoding($s, 'BAD');
-print("BAD: $s\n"); // BAD
-
-$s = $euc_jp;
-$s = mb_convert_encoding($s);
-print("MP: $s\n"); // Missing parameter
-
-
-?>
-
---EXPECT--
-== BASIC TEST ==
-EUC-JP: ÆüËܸì¥Æ¥­¥¹¥È¤Ç¤¹¡£01234£µ£¶£·£¸£¹¡£
-EUC-JP: ÆüËܸì¥Æ¥­¥¹¥È¤Ç¤¹¡£01234£µ£¶£·£¸£¹¡£
-SJIS: k/qWe4zqg2WDTINYg2eCxYK3gUIwMTIzNIJUglWCVoJXgliBQg==
-JIS: GyRCRnxLXDhsJUYlLSU5JUgkRyQ5ISMbKEIwMTIzNBskQiM1IzYjNyM4IzkhIxsoQg==
-== STRING ENCODING LIST ==
-EUC-JP: ÆüËܸì¥Æ¥­¥¹¥È¤Ç¤¹¡£01234£µ£¶£·£¸£¹¡£
-SJIS: k/qWe4zqg2WDTINYg2eCxYK3gUIwMTIzNIJUglWCVoJXgliBQg==
-JIS: GyRCRnxLXDhsJUYlLSU5JUgkRyQ5ISMbKEIwMTIzNBskQiM1IzYjNyM4IzkhIxsoQg==
-== ARRAY ENCODING LIST ==
-EUC-JP: ÆüËܸì¥Æ¥­¥¹¥È¤Ç¤¹¡£01234£µ£¶£·£¸£¹¡£
-SJIS: k/qWe4zqg2WDTINYg2eCxYK3gUIwMTIzNIJUglWCVoJXgliBQg==
-JIS: GyRCRnxLXDhsJUYlLSU5JUgkRyQ5ISMbKEIwMTIzNBskQiM1IzYjNyM4IzkhIxsoQg==
-== DETECT ORDER ==
-EUC-JP: ÆüËܸì¥Æ¥­¥¹¥È¤Ç¤¹¡£01234£µ£¶£·£¸£¹¡£
-SJIS: k/qWe4zqg2WDTINYg2eCxYK3gUIwMTIzNIJUglWCVoJXgliBQg==
-JIS: GyRCRnxLXDhsJUYlLSU5JUgkRyQ5ISMbKEIwMTIzNBskQiM1IzYjNyM4IzkhIxsoQg==
-== INVALID PARAMETER ==
-INT: 1234
-EUC-JP: 
-ERR: Warning
-BAD: 
-ERR: Warning
-MP: 
-
-
diff --git a/ext/mbstring/tests/mb_convert_variables.phpt b/ext/mbstring/tests/mb_convert_variables.phpt
deleted file mode 100644
index 86ffc8a994..0000000000
--- a/ext/mbstring/tests/mb_convert_variables.phpt
+++ /dev/null
@@ -1,163 +0,0 @@
---TEST--
-mb_convert_variables()
---SKIPIF--
-<?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
---INI--
-output_handler=
---FILE--
-<?php
-// TODO: Add more tests
-//$debug = true; // Uncomment this line to view error/warning/notice message in *.out file
-ini_set('include_path','.');
-include_once('common.inc');
-
-// SJIS string (BASE64 encoded)
-$sjis = base64_decode('k/qWe4zqg2WDTINYg2eCxYK3gUIwMTIzNIJUglWCVoJXgliBQg==');
-// JIS string (BASE64 encoded)
-$jis = base64_decode('GyRCRnxLXDhsJUYlLSU5JUgkRyQ5ISMbKEIwMTIzNBskQiM1IzYjNyM4IzkhIxsoQg==');
-// EUC-JP string
-$euc_jp = 'ÆüËܸì¥Æ¥­¥¹¥È¤Ç¤¹¡£01234£µ£¶£·£¸£¹¡£';
-
-// Test for single scaler
-echo "== SCALER TEST ==\n";
-$s = $sjis;
-$encoding = mb_convert_variables('EUC-JP', 'SJIS', $s);
-print("$encoding\n"); // SJIS
-print("$s\n"); // Converted to EUC-JP
-
-$s = $jis;
-$encoding = mb_convert_variables('EUC-JP', 'JIS', $s);
-print("$encoding\n"); // JIS
-print("$s\n"); // Converted to EUC-JP
-
-$s = $euc_jp;
-$encoding = mb_convert_variables('SJIS', 'EUC-JP', $s);
-print("$encoding\n"); // EUC-JP
-print(base64_encode($s)."\n"); // Converted to SJIS (base64 encoded)
-
-$s = $euc_jp;
-$encoding = mb_convert_variables('JIS', 'EUC-JP', $s);
-print("$encoding\n"); // EUC-JP
-print(base64_encode($s)."\n"); // Converted to JIS (base64 encoded)
-
-// Test for multiple slcaler
-$s1 = $euc_jp;
-$s2 = $euc_jp;
-$s3 = $euc_jp;
-$encoding = mb_convert_variables('EUC-JP', 'auto', $s1, $s2, $s3);
-print("$encoding\n"); // EUC-JP
-print("$s1$s2$s3\n"); // Converted to EUC-JP
-
-
-
-// Note: Mixing encoding in array/object is not supported?
-// Test for array
-echo "== ARRAY TEST ==\n";
-$a = array($s3, $s2, $s1);
-$aa = $a;
-$encoding = mb_convert_variables('EUC-JP', 'auto', $aa);
-print("$encoding\n"); // EUC-JP
-print("{$aa[0]}{$aa[1]}{$aa[2]}\n"); // Converted to EUC-JP
-
-$a = array($s1, $s2, $s3);
-$aa = $a;
-$encoding = mb_convert_variables('EUC-JP', 'auto', $aa);
-print("$encoding\n"); // EUC-JP
-print("{$aa[0]}{$aa[1]}{$aa[2]}\n"); // Converted to EUC-JP
-
-
-
-// Test for object
-echo "== OBJECT TEST ==\n";
-class foo 
-{
-	var $s1;
-	var $s2;
-	var $s3;
-
-	function foo() 
-	{
-		global $sjis, $jis, $euc_jp;
-		
-		$this->s1 = $euc_jp;
-		$this->s2 = $euc_jp;
-		$this->s3 = $euc_jp;
-	}
-}
-
-class bar 
-{
-	var $s1;
-	var $s2;
-	var $s3;
-
-	function bar() 
-	{
-		global $sjis, $jis, $euc_jp;
-		
-		$this->s1 = $euc_jp;
-		$this->s2 = $euc_jp;
-		$this->s3 = $euc_jp;
-	}
-}
-
-
-$o = new foo;
-$oo = $o;
-$encoding = mb_convert_variables('EUC-JP', 'auto', $oo);
-print("$encoding\n");   // EUC-JP
-print("{$oo->s1}{$oo->s2}{$oo->s3}\n"); // Converted to EUC-JP
-
-$o = new bar;
-$oo = $o;
-$encoding = mb_convert_variables('EUC-JP', 'auto', $oo);
-print("$encoding\n"); // EUC-JP
-print("{$oo->s1}{$oo->s2}{$oo->s3}\n"); // Converted to EUC-JP
-
-
-// Test for scaler, array and object
-echo "== SCALER, ARRAY AND OBJECT TEST ==\n";
-
-$s1 = $euc_jp;
-$s2 = $euc_jp;
-$s3 = $euc_jp;
-$aa = $a;
-$oo = $o;
-
-$encoding = mb_convert_variables('EUC-JP', 'auto', $s1, $s2, $s3, $aa, $oo);
-print("$encoding\n"); // EUC-JP
-print("$s1$s2$s3\n"); // Converted to EUC-JP
-print("{$aa[0]}{$aa[1]}{$aa[2]}\n"); // Converted to EUC-JP
-print("{$oo->s1}{$oo->s2}{$oo->s3}\n"); // Converted to EUC-JP
-
-
-?>
-
---EXPECT--
-== SCALER TEST ==
-SJIS
-ÆüËܸì¥Æ¥­¥¹¥È¤Ç¤¹¡£01234£µ£¶£·£¸£¹¡£
-JIS
-ÆüËܸì¥Æ¥­¥¹¥È¤Ç¤¹¡£01234£µ£¶£·£¸£¹¡£
-EUC-JP
-k/qWe4zqg2WDTINYg2eCxYK3gUIwMTIzNIJUglWCVoJXgliBQg==
-EUC-JP
-GyRCRnxLXDhsJUYlLSU5JUgkRyQ5ISMbKEIwMTIzNBskQiM1IzYjNyM4IzkhIxsoQg==
-EUC-JP
-ÆüËܸì¥Æ¥­¥¹¥È¤Ç¤¹¡£01234£µ£¶£·£¸£¹¡£ÆüËܸì¥Æ¥­¥¹¥È¤Ç¤¹¡£01234£µ£¶£·£¸£¹¡£ÆüËܸì¥Æ¥­¥¹¥È¤Ç¤¹¡£01234£µ£¶£·£¸£¹¡£
-== ARRAY TEST ==
-EUC-JP
-ÆüËܸì¥Æ¥­¥¹¥È¤Ç¤¹¡£01234£µ£¶£·£¸£¹¡£ÆüËܸì¥Æ¥­¥¹¥È¤Ç¤¹¡£01234£µ£¶£·£¸£¹¡£ÆüËܸì¥Æ¥­¥¹¥È¤Ç¤¹¡£01234£µ£¶£·£¸£¹¡£
-EUC-JP
-ÆüËܸì¥Æ¥­¥¹¥È¤Ç¤¹¡£01234£µ£¶£·£¸£¹¡£ÆüËܸì¥Æ¥­¥¹¥È¤Ç¤¹¡£01234£µ£¶£·£¸£¹¡£ÆüËܸì¥Æ¥­¥¹¥È¤Ç¤¹¡£01234£µ£¶£·£¸£¹¡£
-== OBJECT TEST ==
-EUC-JP
-ÆüËܸì¥Æ¥­¥¹¥È¤Ç¤¹¡£01234£µ£¶£·£¸£¹¡£ÆüËܸì¥Æ¥­¥¹¥È¤Ç¤¹¡£01234£µ£¶£·£¸£¹¡£ÆüËܸì¥Æ¥­¥¹¥È¤Ç¤¹¡£01234£µ£¶£·£¸£¹¡£
-EUC-JP
-ÆüËܸì¥Æ¥­¥¹¥È¤Ç¤¹¡£01234£µ£¶£·£¸£¹¡£ÆüËܸì¥Æ¥­¥¹¥È¤Ç¤¹¡£01234£µ£¶£·£¸£¹¡£ÆüËܸì¥Æ¥­¥¹¥È¤Ç¤¹¡£01234£µ£¶£·£¸£¹¡£
-== SCALER, ARRAY AND OBJECT TEST ==
-EUC-JP
-ÆüËܸì¥Æ¥­¥¹¥È¤Ç¤¹¡£01234£µ£¶£·£¸£¹¡£ÆüËܸì¥Æ¥­¥¹¥È¤Ç¤¹¡£01234£µ£¶£·£¸£¹¡£ÆüËܸì¥Æ¥­¥¹¥È¤Ç¤¹¡£01234£µ£¶£·£¸£¹¡£
-ÆüËܸì¥Æ¥­¥¹¥È¤Ç¤¹¡£01234£µ£¶£·£¸£¹¡£ÆüËܸì¥Æ¥­¥¹¥È¤Ç¤¹¡£01234£µ£¶£·£¸£¹¡£ÆüËܸì¥Æ¥­¥¹¥È¤Ç¤¹¡£01234£µ£¶£·£¸£¹¡£
-ÆüËܸì¥Æ¥­¥¹¥È¤Ç¤¹¡£01234£µ£¶£·£¸£¹¡£ÆüËܸì¥Æ¥­¥¹¥È¤Ç¤¹¡£01234£µ£¶£·£¸£¹¡£ÆüËܸì¥Æ¥­¥¹¥È¤Ç¤¹¡£01234£µ£¶£·£¸£¹¡£
-
diff --git a/ext/mbstring/tests/mb_detect_encoding.phpt b/ext/mbstring/tests/mb_detect_encoding.phpt
deleted file mode 100644
index 5031f6fb8f..0000000000
--- a/ext/mbstring/tests/mb_detect_encoding.phpt
+++ /dev/null
@@ -1,119 +0,0 @@
---TEST--
-mb_detect_encoding()
---SKIPIF--
-<?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
---FILE--
-<?php
-// TODO: Add more tests
-//$debug = true; // Uncomment this line to view error/warning/notice message in *.out file
-ini_set('include_path','.');
-include_once('common.inc');
-
-// SJIS string (BASE64 encoded)
-$sjis = base64_decode('k/qWe4zqg2WDTINYg2eCxYK3gUIwMTIzNIJUglWCVoJXgliBQg==');
-// JIS string (BASE64 encoded)
-$jis = base64_decode('GyRCRnxLXDhsJUYlLSU5JUgkRyQ5ISMbKEIwMTIzNBskQiM1IzYjNyM4IzkhIxsoQg==');
-// EUC-JP string
-$euc_jp = 'ÆüËܸì¥Æ¥­¥¹¥È¤Ç¤¹¡£01234£µ£¶£·£¸£¹¡£';
-
-// Test with sigle "form encoding"
-// Note: For some reason it complains, results are differ. Not reserched.
-echo "== BASIC TEST ==\n";
-$s = $sjis;
-$s = mb_detect_encoding($s, 'SJIS');
-print("SJIS: $s\n"); 
-
-$s = $jis;
-$s = mb_detect_encoding($s, 'JIS');
-print("JIS: $s\n");
-
-$s = $euc_jp;
-$s = mb_detect_encoding($s, 'UTF-8,EUC-JP,JIS');
-print("EUC-JP: $s\n");
-
-$s = $euc_jp;
-$s = mb_detect_encoding($s, 'JIS,EUC-JP');
-print("EUC-JP: $s\n");
-
-
-
-// Using Encoding List Array 
-echo "== ARRAY ENCODING LIST ==\n";
-
-$a = array(0=>'UTF-8',1=>'EUC-JP', 2=>'SJIS', 3=>'JIS');
-
-// Note: Due to detect order, detected as UTF-8
-$s = $jis;
-$s = mb_detect_encoding($s, $a);
-print("JIS: $s\n");
-
-$s = $euc_jp;
-$s = mb_detect_encoding($s, $a);
-print("EUC-JP: $s\n");
-
-$s = $sjis;
-$s = mb_detect_encoding($s, $a);
-print("SJIS: $s\n"); 
-
-
-// Using Detect Order 
-echo "== DETECT ORDER ==\n";
-
-mb_detect_order('auto');
-
-
-$s = $jis;
-$s = mb_detect_encoding($s);
-print("JIS: $s\n"); 
-
-$s = $euc_jp;
-$s = mb_detect_encoding($s);
-print("EUC-JP: $s\n"); 
-
-$s = $sjis;
-$s = mb_detect_encoding($s);
-print("SJIS: $s\n"); 
-
-
-// Invalid(?) Parameters
-echo "== INVALID PARAMETER ==\n";
-
-$s = mb_detect_encoding(1234, 'EUC-JP');
-print("INT: $s\n"); // EUC-JP
-
-$s = mb_detect_encoding('', 'EUC-JP');
-print("EUC-JP: $s\n");  // SJIS
-
-$s = $euc_jp;
-$s = mb_detect_encoding($s, 'BAD');
-print("BAD: $s\n"); // BAD
-
-$s = $euc_jp;
-$s = mb_detect_encoding();
-print("MP: $s\n"); // Missing parameter
-
-
-?>
-
---EXPECT--
-== BASIC TEST ==
-SJIS: SJIS
-JIS: JIS
-EUC-JP: EUC-JP
-EUC-JP: EUC-JP
-== ARRAY ENCODING LIST ==
-JIS: UTF-8
-EUC-JP: EUC-JP
-SJIS: SJIS
-== DETECT ORDER ==
-JIS: JIS
-EUC-JP: EUC-JP
-SJIS: SJIS
-== INVALID PARAMETER ==
-INT: EUC-JP
-EUC-JP: EUC-JP
-ERR: Warning
-BAD: EUC-JP
-ERR: Warning
-MP: 
-
diff --git a/ext/mbstring/tests/mb_detect_order.phpt b/ext/mbstring/tests/mb_detect_order.phpt
deleted file mode 100644
index 3a76b4d0ed..0000000000
--- a/ext/mbstring/tests/mb_detect_order.phpt
+++ /dev/null
@@ -1,59 +0,0 @@
---TEST--
-mb_detect_order()  
---SKIPIF--
-<?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
---FILE--
-<?php
-//$debug = true;
-ini_set('include_path','.');
-include_once('common.inc');
-
-
-// Set order to "auto"
-$r = mb_detect_order('auto');
-($r === TRUE) ? print "OK_AUTO\n" : print "NG_AUTO\n";
-print implode(', ', mb_detect_order()) . "\n";
-
-
-// Set order by string
-$r = mb_detect_order('SJIS,EUC-JP,JIS,UTF-8');
-($r === TRUE) ? print "OK_STR\n" : print "NG_STR\n";
-print implode(', ', mb_detect_order()) . "\n";
-
-
-// Set order by array
-$a[] = 'ASCII';
-$a[] = 'JIS';
-$a[] = 'EUC-JP';
-$a[] = 'UTF-8';
-$r = mb_detect_order($a);
-($r === TRUE) ? print "OK_ARRAY\n" : print "NG_ARRAY\n";
-print implode(', ', mb_detect_order()) . "\n";
-
-// Set invalid encoding. Should fail.
-print "== INVALID PARAMETER ==\n";
-
-$r = mb_detect_order('BAD_NAME');
-($r === FALSE) ? print "OK_BAD_STR\n" : print "NG_BAD_STR\n";
-print implode(', ', mb_detect_order()) . "\n";
-
-$a[] = 'BAD_NAME';
-$r = mb_detect_order($a);
-($r ===	FALSE) ? print "OK_BAD_ARRAY\n" : print "NG_BAD_ARRAY\n";
-print implode(', ', mb_detect_order()) . "\n";
-
-?>
-
---EXPECT--
-OK_AUTO
-ASCII, JIS, UTF-8, EUC-JP, SJIS
-OK_STR
-SJIS, EUC-JP, JIS, UTF-8
-OK_ARRAY
-ASCII, JIS, EUC-JP, UTF-8
-== INVALID PARAMETER ==
-OK_BAD_STR
-ASCII, JIS, EUC-JP, UTF-8
-OK_BAD_ARRAY
-ASCII, JIS, EUC-JP, UTF-8
-
diff --git a/ext/mbstring/tests/mb_ereg-compat-01.phpt b/ext/mbstring/tests/mb_ereg-compat-01.phpt
deleted file mode 100644
index 09376780ed..0000000000
--- a/ext/mbstring/tests/mb_ereg-compat-01.phpt
+++ /dev/null
@@ -1,21 +0,0 @@
---TEST--
-mb_ereg() compat test 1
---SKIPIF--
-<?php
-extension_loaded('mbstring') or die('skip');
-function_exists('mb_ereg') or die("skip mb_ereg() is not available in this build");
-?>
---FILE--
-<?php
-/* (counterpart: ext/standard/tests/reg/004.phpt) */
-  $a="This is a nice and simple string";
-  if (mb_ereg(".*nice and simple.*",$a)) {
-    echo "ok\n";
-  }
-  if (!mb_ereg(".*doesn't exist.*",$a)) {
-    echo "ok\n";
-  }
-?>
---EXPECT--
-ok
-ok
diff --git a/ext/mbstring/tests/mb_ereg-compat-02.phpt b/ext/mbstring/tests/mb_ereg-compat-02.phpt
deleted file mode 100644
index 2f40422543..0000000000
--- a/ext/mbstring/tests/mb_ereg-compat-02.phpt
+++ /dev/null
@@ -1,25 +0,0 @@
---TEST--
-mb_ereg() compat test 2
---SKIPIF--
-<?php
-extension_loaded('mbstring') or die('skip');
-function_exists('mb_ereg') or die("skip mb_ereg() is not available in this build");
-?>
---FILE--
-<?php
-/* (counterpart: ext/standard/tests/reg/005.phpt) */
-  $a="This is a nice and simple string";
-  echo mb_ereg(".*(is).*(is).*",$a,$registers);
-  echo "\n";
-  echo $registers[0];
-  echo "\n";
-  echo $registers[1];
-  echo "\n";
-  echo $registers[2];
-  echo "\n";
-?>
---EXPECT--
-32
-This is a nice and simple string
-is
-is
diff --git a/ext/mbstring/tests/mb_ereg.phpt b/ext/mbstring/tests/mb_ereg.phpt
deleted file mode 100644
index d069b2593d..0000000000
--- a/ext/mbstring/tests/mb_ereg.phpt
+++ /dev/null
@@ -1,47 +0,0 @@
---TEST--
-mb_ereg()
---SKIPIF--
-<?php
-extension_loaded('mbstring') or die('skip mbstring not available');
-function_exists('mb_ereg') or die("skip mb_ereg() is not available in this build");
-?>
---INI--
-output_handler=
---FILE--
-<?php
-	mb_regex_set_options( '' );
-
-	$encs = array( 'EUC-JP', 'Shift_JIS', 'SJIS', 'UTF-8' );
-
-	function test_ereg( $test_enc, $pat, $str, $in_enc = 'EUC-JP' ) {
-		mb_regex_encoding( $test_enc );
-		$pat = mb_convert_encoding( $pat, $test_enc, $in_enc );
-		$str = mb_convert_encoding( $str, $test_enc, $in_enc );
-
-		printf( "(%d)%s\n", mb_ereg( $pat, $str, $reg ), ( is_array( $reg )? mb_convert_encoding( implode( ' ', $reg ), $in_enc, $test_enc ) : '' ) );
-	} 
-	function do_tests( $enc ) {
-		test_ereg( $enc, 'abc ([a-z]+) ([a-z]+) ([a-z]+)$', "abc def ghi jkl" );
-		$pat = '([£á-£ú]+) ([ ¤¢-¤«]+)([¤«-¤Ê]+) ([¤ï-¤ó]+)$'; 
-		test_ereg( $enc, $pat, '£á£â£ã ¤¢¤ª¤¤ ¤«¤³¤Ê ¤ï¤ñ¤ó' );
-		test_ereg( $enc, $pat, '£í£ú£ø£æ£ð ¤¦¤ª¤« ¤­¤« ¤ò¤ð' );
-	}
-
-	foreach( $encs as $enc ) {
-		do_tests( $enc );
-	}
-?>
-
---EXPECT--
-(15)abc def ghi jkl def ghi jkl
-(27)£á£â£ã ¤¢¤ª¤¤ ¤«¤³¤Ê ¤ï¤ñ¤ó £á£â£ã ¤¢¤ª¤¤ ¤« ¤³¤Ê ¤ï¤ñ¤ó
-(27)£í£ú£ø£æ£ð ¤¦¤ª¤« ¤­¤« ¤ò¤ð £í£ú£ø£æ£ð ¤¦¤ª¤«  ¤­¤« ¤ò¤ð
-(15)abc def ghi jkl def ghi jkl
-(27)£á£â£ã ¤¢¤ª¤¤ ¤«¤³¤Ê ¤ï¤ñ¤ó £á£â£ã ¤¢¤ª¤¤ ¤« ¤³¤Ê ¤ï¤ñ¤ó
-(27)£í£ú£ø£æ£ð ¤¦¤ª¤« ¤­¤« ¤ò¤ð £í£ú£ø£æ£ð ¤¦¤ª¤«  ¤­¤« ¤ò¤ð
-(15)abc def ghi jkl def ghi jkl
-(27)£á£â£ã ¤¢¤ª¤¤ ¤«¤³¤Ê ¤ï¤ñ¤ó £á£â£ã ¤¢¤ª¤¤ ¤« ¤³¤Ê ¤ï¤ñ¤ó
-(27)£í£ú£ø£æ£ð ¤¦¤ª¤« ¤­¤« ¤ò¤ð £í£ú£ø£æ£ð ¤¦¤ª¤«  ¤­¤« ¤ò¤ð
-(15)abc def ghi jkl def ghi jkl
-(39)£á£â£ã ¤¢¤ª¤¤ ¤«¤³¤Ê ¤ï¤ñ¤ó £á£â£ã ¤¢¤ª¤¤ ¤« ¤³¤Ê ¤ï¤ñ¤ó
-(39)£í£ú£ø£æ£ð ¤¦¤ª¤« ¤­¤« ¤ò¤ð £í£ú£ø£æ£ð ¤¦¤ª¤«  ¤­¤« ¤ò¤ð
diff --git a/ext/mbstring/tests/mb_ereg_replace-compat-01.phpt b/ext/mbstring/tests/mb_ereg_replace-compat-01.phpt
deleted file mode 100644
index ad2c6c1c56..0000000000
--- a/ext/mbstring/tests/mb_ereg_replace-compat-01.phpt
+++ /dev/null
@@ -1,15 +0,0 @@
---TEST--
-mb_ereg_replace() compat test 1
---SKIPIF--
-<?php
-extension_loaded('mbstring') or die('skip'); 
-function_exists('mb_ereg_replace') or die("skip mb_ereg_replace() is not available in this build");
-?>
---FILE--
-<?php
-/* (counterpart: ext/standard/tests/reg/001.phpt) */
-  $a="abc123";
-  echo mb_ereg_replace("123","def",$a);
-?>
---EXPECT--
-abcdef
diff --git a/ext/mbstring/tests/mb_ereg_replace-compat-02.phpt b/ext/mbstring/tests/mb_ereg_replace-compat-02.phpt
deleted file mode 100644
index b5ea12196d..0000000000
--- a/ext/mbstring/tests/mb_ereg_replace-compat-02.phpt
+++ /dev/null
@@ -1,15 +0,0 @@
---TEST--
-mb_ereg_replace() compat test 2
---SKIPIF--
-<?php
-extension_loaded('mbstring') or die('skip');
-function_exists('mb_ereg_replace') or die("skip mb_ereg_replace() is not available in this build");
-?>
---FILE--
-<?php
-/* (counterpart: ext/standard/tests/reg/002.phpt) */
-  $a="abc123";
-  echo mb_ereg_replace("123","",$a);
-?>
---EXPECT--
-abc
diff --git a/ext/mbstring/tests/mb_ereg_replace-compat-03.phpt b/ext/mbstring/tests/mb_ereg_replace-compat-03.phpt
deleted file mode 100644
index c02a346c5e..0000000000
--- a/ext/mbstring/tests/mb_ereg_replace-compat-03.phpt
+++ /dev/null
@@ -1,15 +0,0 @@
---TEST--
-mb_ereg_replace() compat test 3
---SKIPIF--
-<?php
-extension_loaded('mbstring') or die('skip');
-function_exists('mb_ereg_replace') or die("skip mb_ereg_replace() is not available in this build");
-?>
---FILE--
-<?php
-/* (counterpart: ext/standard/tests/reg/003.phpt) */
-  $a="\\'test";
-  echo mb_ereg_replace("\\\\'","'",$a);
-?>
---EXPECT--
-'test
diff --git a/ext/mbstring/tests/mb_ereg_replace-compat-04.phpt b/ext/mbstring/tests/mb_ereg_replace-compat-04.phpt
deleted file mode 100644
index 94ff320707..0000000000
--- a/ext/mbstring/tests/mb_ereg_replace-compat-04.phpt
+++ /dev/null
@@ -1,15 +0,0 @@
---TEST--
-mb_ereg_replace() compat test 4
---SKIPIF--
-<?php
-extension_loaded('mbstring') or die('skip');
-function_exists('mb_ereg_replace') or die("skip mb_ereg_replace() is not available in this build");
-?>
---FILE--
-<?php
-/* (counterpart: ext/standard/tests/reg/006.phpt) */
-  $a="This is a nice and simple string";
-  echo mb_ereg_replace("^This","That",$a);
-?>
---EXPECT--
-That is a nice and simple string
diff --git a/ext/mbstring/tests/mb_ereg_replace-compat-05.phpt b/ext/mbstring/tests/mb_ereg_replace-compat-05.phpt
deleted file mode 100644
index f5dae3da14..0000000000
--- a/ext/mbstring/tests/mb_ereg_replace-compat-05.phpt
+++ /dev/null
@@ -1,16 +0,0 @@
---TEST--
-mb_ereg_replace() compat test 5
---SKIPIF--
-<?php
-extension_loaded('mbstring') or die('skip');
-function_exists('mb_ereg_replace') or die("skip mb_ereg_replace() is not available in this build");
-?>
---FILE--
-<?php
-/* (counterpart: ext/standard/tests/reg/007.phpt) */
-  $a="abcd";
-  $b=mb_ereg_replace("abcd","",$a);
-  echo "strlen(\$b)=".strlen($b);
-?>
---EXPECT--
-strlen($b)=0
diff --git a/ext/mbstring/tests/mb_ereg_replace-compat-06.phpt b/ext/mbstring/tests/mb_ereg_replace-compat-06.phpt
deleted file mode 100644
index 8c84dc1e3c..0000000000
--- a/ext/mbstring/tests/mb_ereg_replace-compat-06.phpt
+++ /dev/null
@@ -1,14 +0,0 @@
---TEST--
-mb_ereg_replace() compat test 6
---SKIPIF--
-<?php
-extension_loaded('mbstring') or die('skip');
-function_exists('mb_ereg_replace') or die("skip mb_ereg_replace() is not available in this build");
-?>
---FILE--
-<?php
-/* (counterpart: ext/standard/tests/reg/008.phpt) */
-  echo mb_ereg_replace("([a-z]*)([-=+|]*)([0-9]+)","\\3 \\1 \\2\n","abc+-|=123");
-?>
---EXPECT--
-123 abc +-|=
diff --git a/ext/mbstring/tests/mb_ereg_replace-compat-07.phpt b/ext/mbstring/tests/mb_ereg_replace-compat-07.phpt
deleted file mode 100644
index e390655ef4..0000000000
--- a/ext/mbstring/tests/mb_ereg_replace-compat-07.phpt
+++ /dev/null
@@ -1,15 +0,0 @@
---TEST--
-mb_ereg_replace() compat test 7
---SKIPIF--
-<?php
-extension_loaded('mbstring') or die('skip');
-function_exists('mb_ereg_replace') or die("skip mb_ereg_replace() is not available in this build");
-?>
---FILE--
-<?php
-/* (counterpart: ext/standard/tests/reg/010.phpt) */
-  $a="abc122222222223";
-  echo mb_ereg_replace("1(2*)3","\\1def\\1",$a);
-?>
---EXPECT--
-abc2222222222def2222222222
diff --git a/ext/mbstring/tests/mb_ereg_replace-compat-08.phpt b/ext/mbstring/tests/mb_ereg_replace-compat-08.phpt
deleted file mode 100644
index 5ccc9fd1c0..0000000000
--- a/ext/mbstring/tests/mb_ereg_replace-compat-08.phpt
+++ /dev/null
@@ -1,15 +0,0 @@
---TEST--
-mb_ereg_replace() compat test 8
---SKIPIF--
-<?php
-extension_loaded('mbstring') or die('skip');
-function_exists('mb_ereg_replace') or die("skip mb_ereg_replace() is not available in this build");
-?>
---FILE--
-<?php
-/* (counterpart: ext/standard/tests/reg/011.phpt) */
-  $a="abc123";
-  echo mb_ereg_replace("123","def\\0ghi",$a);
-?>
---EXPECT--
-abcdef123ghi
diff --git a/ext/mbstring/tests/mb_ereg_replace-compat-09.phpt b/ext/mbstring/tests/mb_ereg_replace-compat-09.phpt
deleted file mode 100644
index bef8be1f4d..0000000000
--- a/ext/mbstring/tests/mb_ereg_replace-compat-09.phpt
+++ /dev/null
@@ -1,15 +0,0 @@
---TEST--
-mb_ereg_replace() compat test 9
---SKIPIF--
-<?php
-extension_loaded('mbstring') or die('skip');
-function_exists('mb_ereg_replace') or die("skip mb_ereg_replace() is not available in this build");
-?>
---FILE--
-<?php
-/* (counterpart: ext/standard/tests/reg/012.phpt) */
-  $a="abc123";
-  echo mb_ereg_replace("123",'def\1ghi',$a);
-?>
---EXPECT--
-abcdef\1ghi
diff --git a/ext/mbstring/tests/mb_ereg_replace-compat-10.phpt b/ext/mbstring/tests/mb_ereg_replace-compat-10.phpt
deleted file mode 100644
index ac80a4e052..0000000000
--- a/ext/mbstring/tests/mb_ereg_replace-compat-10.phpt
+++ /dev/null
@@ -1,15 +0,0 @@
---TEST--
-mb_ereg_replace() compat test 10
---SKIPIF--
-<?php
-extension_loaded('mbstring') or die('skip');
-function_exists('mb_ereg_replace') or die("skip mb_ereg_replace() is not available in this build");
-?>
---FILE--
-<?php
-/* (counterpart: ext/standard/tests/reg/013.phpt) */
-  $a="abc123";
-  echo mb_ereg_replace("123","def\\g\\\\hi\\",$a);
-?>
---EXPECT--
-abcdef\g\\hi\
diff --git a/ext/mbstring/tests/mb_ereg_replace-compat-11.phpt b/ext/mbstring/tests/mb_ereg_replace-compat-11.phpt
deleted file mode 100644
index 7ae3edf62f..0000000000
--- a/ext/mbstring/tests/mb_ereg_replace-compat-11.phpt
+++ /dev/null
@@ -1,15 +0,0 @@
---TEST--
-mb_ereg_replace() compat test 11
---SKIPIF--
-<?php
-extension_loaded('mbstring') or die('skip');
-function_exists('mb_ereg_replace') or die("skip mb_ereg_replace() is not available in this build");
-?>
---FILE--
-<?php
-/* (counterpart: ext/standard/tests/reg/014.phpt) */
-  $a="a\\2bxc";
-  echo mb_ereg_replace("a(.*)b(.*)c","\\1",$a);
-?>
---EXPECT--
-\2
diff --git a/ext/mbstring/tests/mb_ereg_replace-compat-12.phpt b/ext/mbstring/tests/mb_ereg_replace-compat-12.phpt
deleted file mode 100644
index 53bc51e676..0000000000
--- a/ext/mbstring/tests/mb_ereg_replace-compat-12.phpt
+++ /dev/null
@@ -1,14 +0,0 @@
---TEST--
-mb_ereg_replace() compat test 12
---SKIPIF--
-<?php
-extension_loaded('mbstring') or die('skip');
-function_exists('mb_ereg_replace') or die("skip mb_ereg_replace() is not available in this build");
-?>
---FILE--
-<?php
-/* (counterpart: ext/standard/tests/reg/015.phpt) */
-  echo mb_ereg_replace("^","z","abc123");
-?>
---EXPECT--
-zabc123
diff --git a/ext/mbstring/tests/mb_ereg_replace-compat-13.phpt b/ext/mbstring/tests/mb_ereg_replace-compat-13.phpt
deleted file mode 100644
index 2975ab75ba..0000000000
--- a/ext/mbstring/tests/mb_ereg_replace-compat-13.phpt
+++ /dev/null
@@ -1,14 +0,0 @@
---TEST--
-mb_ereg_replace() compat test 13
---SKIPIF--
-<?php
-extension_loaded('mbstring') or die('skip');
-function_exists('mb_ereg_replace') or die("skip mb_ereg_replace() is not available in this build");
-?>
---FILE--
-<?php
-/* (counterpart: ext/standard/tests/reg/016.phpt) */
-  echo mb_ereg_replace('\?',"abc","?123?");
-?>
---EXPECT--
-abc123abc
diff --git a/ext/mbstring/tests/mb_ereg_replace.phpt b/ext/mbstring/tests/mb_ereg_replace.phpt
deleted file mode 100644
index 9413da82b9..0000000000
--- a/ext/mbstring/tests/mb_ereg_replace.phpt
+++ /dev/null
@@ -1,18 +0,0 @@
---TEST--
-mb_ereg_replace()
---SKIPIF--
-<?php
-extension_loaded('mbstring') or die('skip mbstring not available');
-function_exists('mb_ereg_replace') or die("skip mb_ereg_replace() is not available in this build");
-?>
---FILE--
-<?php
-	mb_regex_set_options( '' );
-	print mb_ereg_replace( ' ', '-', 'a b c d e' )."\n";
-	print mb_ereg_replace( '([a-z]+)','[\\1]', 'abc def ghi' );
-?>
-
---EXPECT--
-a-b-c-d-e
-[abc] [def] [ghi]
-
diff --git a/ext/mbstring/tests/mb_ereg_search_xxx.phpt b/ext/mbstring/tests/mb_ereg_search_xxx.phpt
deleted file mode 100644
index c2c0b84a85..0000000000
--- a/ext/mbstring/tests/mb_ereg_search_xxx.phpt
+++ /dev/null
@@ -1,82 +0,0 @@
---TEST--
-mb_ereg_search() stuff
---SKIPIF--
-<?php
-extension_loaded('mbstring') or die('skip mbstring not available');
-function_exists('mb_ereg_search') or die("skip\n");
-?>
---INI--
-output_handler=
---FILE--
-<?php
-	mb_regex_set_options( '' );
-
-	$encs = array( 'EUC-JP', 'Shift_JIS', 'SJIS', 'UTF-8' );
-
-	function test_search( $test_enc, $str, $look_for, $opt, $in_enc = 'EUC-JP' ) {
-		mb_regex_encoding( $test_enc );
-		$str = mb_convert_encoding( $str, $test_enc, $in_enc );
-		$look_for = mb_convert_encoding( $look_for, $test_enc, $in_enc );
-		mb_ereg_search_init( $str, $look_for, $opt );
-		while ( mb_ereg_search_pos() ) {
-			$regs = mb_ereg_search_getregs();
-			array_shift( $regs );
-			printf( "(%s) (%d) %s\n", $test_enc, mb_ereg_search_getpos(), mb_convert_encoding( ( is_array( $regs ) ? implode( '-', $regs ): '' ), $in_enc, $test_enc ) );
-		}
-	}	
-	function do_tests( $enc, $opt ) {
-		test_search( $enc, "¢Ï¡¦ ¡¦¢Ï\n", ' (¡¦?¢Ï¡¦?)[[:space:]]', $opt );
-		test_search( $enc, 'abcde abdeabcf anvfabc odu abcd ', '(ab[a-z]+)', $opt );
-	}
-
-	foreach( $encs as $enc ) {
-		do_tests( $enc, '' );
-		do_tests( $enc, 'x' );
-	}
-?>
-
---EXPECT--
-(EUC-JP) (10) ¡¦¢Ï
-(EUC-JP) (5) abcde
-(EUC-JP) (14) abdeabcf
-(EUC-JP) (22) abc
-(EUC-JP) (31) abcd
-(EUC-JP) (5) ¢Ï¡¦
-(EUC-JP) (10) ¡¦¢Ï
-(EUC-JP) (5) abcde
-(EUC-JP) (14) abdeabcf
-(EUC-JP) (22) abc
-(EUC-JP) (31) abcd
-(Shift_JIS) (10) ¡¦¢Ï
-(Shift_JIS) (5) abcde
-(Shift_JIS) (14) abdeabcf
-(Shift_JIS) (22) abc
-(Shift_JIS) (31) abcd
-(Shift_JIS) (5) ¢Ï¡¦
-(Shift_JIS) (10) ¡¦¢Ï
-(Shift_JIS) (5) abcde
-(Shift_JIS) (14) abdeabcf
-(Shift_JIS) (22) abc
-(Shift_JIS) (31) abcd
-(SJIS) (10) ¡¦¢Ï
-(SJIS) (5) abcde
-(SJIS) (14) abdeabcf
-(SJIS) (22) abc
-(SJIS) (31) abcd
-(SJIS) (5) ¢Ï¡¦
-(SJIS) (10) ¡¦¢Ï
-(SJIS) (5) abcde
-(SJIS) (14) abdeabcf
-(SJIS) (22) abc
-(SJIS) (31) abcd
-(UTF-8) (14) ¡¦¢Ï
-(UTF-8) (5) abcde
-(UTF-8) (14) abdeabcf
-(UTF-8) (22) abc
-(UTF-8) (31) abcd
-(UTF-8) (7) ¢Ï¡¦
-(UTF-8) (14) ¡¦¢Ï
-(UTF-8) (5) abcde
-(UTF-8) (14) abdeabcf
-(UTF-8) (22) abc
-(UTF-8) (31) abcd
diff --git a/ext/mbstring/tests/mb_http_input.phpt b/ext/mbstring/tests/mb_http_input.phpt
deleted file mode 100644
index a27de9f873..0000000000
--- a/ext/mbstring/tests/mb_http_input.phpt
+++ /dev/null
@@ -1,50 +0,0 @@
---TEST--
-mb_http_input() 
---SKIPIF--
-<?php
-extension_loaded('mbstring') or die('skip mbstring not available');
-(php_sapi_name()=='cgi') or die("skip sapi is not a cgi version");
-?>
---POST--
-a=ÆüËܸì0123456789ÆüËܸ쥫¥¿¥«¥Ê¤Ò¤é¤¬¤Ê
---GET--
-b=ÆüËܸì0123456789ÆüËܸ쥫¥¿¥«¥Ê¤Ò¤é¤¬¤Ê
---FILE--
-<?php
-// TODO: This is not a real test.... Need to change so that it does real testing
-//$debug = true;
-ini_set('include_path','.');
-include_once('common.inc');
-
-$ini = ini_get('mbstring.http_input');
-
-// It must be url encoded....
-// echo vars
-echo $_POST['a']."\n";
-echo $_GET['b']."\n";
-
-// Get encoding
-$enc = mb_http_input('P');
-
-// check
-if (empty($ini)) {
-	// Must be pass
-	if ($enc === 'pass') {
-		echo "OK\n";
-	}
-	else {
-		echo "NG\n";
-	}
-}
-else {
-	// Some encoding
-	echo "This heppens when php.ini-dist is not used\n";
-}
-
-?>
-
---EXPECT--
-ÆüËܸì0123456789ÆüËܸ쥫¥¿¥«¥Ê¤Ò¤é¤¬¤Ê
-ÆüËܸì0123456789ÆüËܸ쥫¥¿¥«¥Ê¤Ò¤é¤¬¤Ê
-OK
-
diff --git a/ext/mbstring/tests/mb_http_output.phpt b/ext/mbstring/tests/mb_http_output.phpt
deleted file mode 100644
index 0a6839f7f1..0000000000
--- a/ext/mbstring/tests/mb_http_output.phpt
+++ /dev/null
@@ -1,84 +0,0 @@
---TEST--
-mb_http_output()  
---SKIPIF--
-<?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
---FILE--
-<?php
-//TODO: Add more encoding. Wrong paramter type test.
-//$debug = true;
-ini_set('include_path','.');
-include_once('common.inc');
-
-// Set HTTP output encoding to ASCII
-$r = mb_http_output('ASCII');
-($r === TRUE) ? print "OK_ASCII_SET\n" : print "NG_ASCII_SET\n";
-$enc = mb_http_output();
-print "$enc\n";
-
-// Set HTTP output encoding to SJIS
-$r = mb_http_output('SJIS');
-($r === TRUE) ? print "OK_SJIS_SET\n" : print "NG_SJIS_SET\n";
-$enc = mb_http_output();
-print "$enc\n";
-
-// Set HTTP output encoding to JIS
-$r = mb_http_output('JIS');
-($r === TRUE) ? print "OK_JIS_SET\n" : print "NG_JIS_SET\n";
-$enc = mb_http_output();
-print "$enc\n";
-
-// Set HTTP output encoding to UTF8
-$r = mb_http_output('UTF-8');
-($r === TRUE) ? print "OK_UTF-8_SET\n" : print "NG_UTF-8_SET\n";
-$enc = mb_http_output();
-print "$enc\n";
-
-// Set HTTP output encoding to EUC-JP
-$r = mb_http_output('EUC-JP');
-($r === TRUE) ? print "OK_EUC-JP_SET\n" : print "NG_EUC-JP_SET\n";
-$enc = mb_http_output();
-print "$enc\n";
-
-// Invalid parameters
-print "== INVALID PARAMETER ==\n";
-
-// Note: Bad string raise Warning. Bad Type raise Notice (Type Conversion) and Warning....
-$r = mb_http_output('BAD_NAME');
-($r === FALSE) ? print "OK_BAD_SET\n" : print "NG_BAD_SET\n";
-$enc = mb_http_output();
-print "$enc\n";
-
-$r = mb_http_output($t_ary);
-($r === FALSE) ? print "OK_BAD_ARY_SET\n" : print "NG_BAD_ARY_SET\n";
-$enc = mb_http_output();
-print "$enc\n";
-
-$r = mb_http_output($t_obj);
-($r === FALSE) ? print "OK_BAD_OBJ_SET\n" : print "NG_BAD_OBJ_SET\n";
-$enc = mb_http_output();
-print "$enc\n";
-
-?>
-
---EXPECT--
-OK_ASCII_SET
-ASCII
-OK_SJIS_SET
-SJIS
-OK_JIS_SET
-JIS
-OK_UTF-8_SET
-UTF-8
-OK_EUC-JP_SET
-EUC-JP
-== INVALID PARAMETER ==
-ERR: Warning
-OK_BAD_SET
-EUC-JP
-ERR: Warning
-OK_BAD_ARY_SET
-EUC-JP
-ERR: Warning
-OK_BAD_OBJ_SET
-EUC-JP
-
diff --git a/ext/mbstring/tests/mb_internal_encoding.phpt b/ext/mbstring/tests/mb_internal_encoding.phpt
deleted file mode 100644
index 1d62962529..0000000000
--- a/ext/mbstring/tests/mb_internal_encoding.phpt
+++ /dev/null
@@ -1,68 +0,0 @@
---TEST--
-mb_internal_encoding()
---SKIPIF--
-<?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
---FILE--
-<?php
-// TODO: 
-//$debug = true;
-ini_set('include_path','.');
-include_once('common.inc');
-
-// EUC-JP
-$r = mb_internal_encoding('EUC-JP');
-($r === TRUE) ? print "OK_EUC-JP_SET\n" : print "NG_EUC-JP_SET\n";
-$enc = mb_internal_encoding();
-print "$enc\n";
-
-// UTF-8
-$r = mb_internal_encoding('UTF-8');
-($r === TRUE) ? print "OK_UTF-8_SET\n" : print "NG_UTF-8_SET\n";
-$enc = mb_internal_encoding();
-print "$enc\n";
-
-// ASCII
-$r = mb_internal_encoding('ASCII');
-($r === TRUE) ? print "OK_ASCII_SET\n" : print "NG_ASCII_SET\n";
-$enc = mb_internal_encoding();
-print "$enc\n";
-
-// Invalid Parameter
-print "== INVALID PARAMETER ==\n";
-
-// Note: Other than string type, PHP raises Warning
-$r = mb_internal_encoding('BAD');
-($r === FALSE) ? print "OK_BAD_SET\n" : print "NG_BAD_SET\n";
-$enc = mb_internal_encoding();
-print "$enc\n";
-
-$r = mb_internal_encoding($t_ary);
-($r === FALSE) ? print "OK_BAD_ARY_SET\n" : print "NG_BAD_ARY_SET\n";
-$enc = mb_internal_encoding();
-print "$enc\n";
-
-$r = mb_internal_encoding($t_obj);
-($r === FALSE) ? print "OK_BAD_OBJ_SET\n" : print "NG_BAD_OBJ_SET\n";
-$enc = mb_internal_encoding();
-print "$enc\n";
-
-?>
-
---EXPECT--
-OK_EUC-JP_SET
-EUC-JP
-OK_UTF-8_SET
-UTF-8
-OK_ASCII_SET
-ASCII
-== INVALID PARAMETER ==
-ERR: Warning
-OK_BAD_SET
-ASCII
-ERR: Warning
-OK_BAD_ARY_SET
-ASCII
-ERR: Warning
-OK_BAD_OBJ_SET
-ASCII
-
diff --git a/ext/mbstring/tests/mb_output_handler_euc_jp.phpt b/ext/mbstring/tests/mb_output_handler_euc_jp.phpt
deleted file mode 100644
index dff5c97743..0000000000
--- a/ext/mbstring/tests/mb_output_handler_euc_jp.phpt
+++ /dev/null
@@ -1,21 +0,0 @@
---TEST--
-mb_output_handler() (EUC-JP)
---SKIPIF--
-<?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
---FILE--
-<?php
-// TODO: Do real test
-
-// EUC-JP
-$euc_jp = "¥Æ¥¹¥ÈÍÑÆüËܸìʸ»úÎ󡣤³¤Î¥â¥¸¥å¡¼¥ë¤ÏPHP¤Ë¥Þ¥ë¥Á¥Ð¥¤¥È´Ø¿ô¤òÄ󶡤·¤Þ¤¹¡£";
-mb_http_output('EUC-JP') or print("mb_http_output() failed\n");
-ob_start('mb_output_handler');
-echo $euc_jp;
-$output = ob_get_clean();
-
-var_dump( $output );
-
-?>
-
---EXPECT--
-string(73) "¥Æ¥¹¥ÈÍÑÆüËܸìʸ»úÎ󡣤³¤Î¥â¥¸¥å¡¼¥ë¤ÏPHP¤Ë¥Þ¥ë¥Á¥Ð¥¤¥È´Ø¿ô¤òÄ󶡤·¤Þ¤¹¡£"
diff --git a/ext/mbstring/tests/mb_output_handler_shift_jis.phpt b/ext/mbstring/tests/mb_output_handler_shift_jis.phpt
deleted file mode 100644
index d4612d9775..0000000000
--- a/ext/mbstring/tests/mb_output_handler_shift_jis.phpt
+++ /dev/null
@@ -1,16 +0,0 @@
---TEST--
-mb_output_handler() (Shift_JIS)
---SKIPIF--
-<?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
---INI--
-output_handler=mb_output_handler
-mbstring.internal_encoding=Shift_JIS
-mbstring.http_output=EUC-JP
---FILE--
-<?php
-// Shift_JIS
-var_dump("ƒeƒXƒg—p“ú–{Œê•¶Žš—ñ�B‚±‚̃‚ƒWƒ…�[ƒ‹‚ÍPHP‚Ƀ}ƒ‹ƒ`ƒoƒCƒgŠÖ�”‚ð’ñ‹Ÿ‚µ‚Ü‚·�B");
-?>
-
---EXPECT--
-string(73) "¥Æ¥¹¥ÈÍÑÆüËܸìʸ»úÎ󡣤³¤Î¥â¥¸¥å¡¼¥ë¤ÏPHP¤Ë¥Þ¥ë¥Á¥Ð¥¤¥È´Ø¿ô¤òÄ󶡤·¤Þ¤¹¡£"
diff --git a/ext/mbstring/tests/mb_parse_str.phpt b/ext/mbstring/tests/mb_parse_str.phpt
deleted file mode 100644
index fcfbbd9fe4..0000000000
--- a/ext/mbstring/tests/mb_parse_str.phpt
+++ /dev/null
@@ -1,79 +0,0 @@
---TEST--
-mb_parse_str()
---SKIPIF--
-<?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
---INI--
-arg_separator.input=&
---FILE--
-<?php
-$queries = array(
-	"foo=abc&bar=def",
-	"%2bfoo=def&-bar=jkl",
-	"foo[]=abc&foo[]=def&foo[]=ghi&bar[]=jkl"
-);
-function test($query) {
-	$foo = '';
-	$bar = '';
-	mb_parse_str($query, $array);
-	var_dump($array);
-	var_dump($foo);
-	var_dump($bar);
-	mb_parse_str($query);
-	var_dump($foo);
-	var_dump($bar);
-}
-foreach ($queries as $query) {
-	test($query);
-}
-?>
---EXPECT--
-array(2) {
-  ["foo"]=>
-  string(3) "abc"
-  ["bar"]=>
-  string(3) "def"
-}
-string(0) ""
-string(0) ""
-string(3) "abc"
-string(3) "def"
-array(2) {
-  ["+foo"]=>
-  string(3) "def"
-  ["-bar"]=>
-  string(3) "jkl"
-}
-string(0) ""
-string(0) ""
-string(0) ""
-string(0) ""
-array(2) {
-  ["foo"]=>
-  array(3) {
-    [0]=>
-    string(3) "abc"
-    [1]=>
-    string(3) "def"
-    [2]=>
-    string(3) "ghi"
-  }
-  ["bar"]=>
-  array(1) {
-    [0]=>
-    string(3) "jkl"
-  }
-}
-string(0) ""
-string(0) ""
-array(3) {
-  [0]=>
-  string(3) "abc"
-  [1]=>
-  string(3) "def"
-  [2]=>
-  string(3) "ghi"
-}
-array(1) {
-  [0]=>
-  string(3) "jkl"
-}
diff --git a/ext/mbstring/tests/mb_parse_str02.phpt b/ext/mbstring/tests/mb_parse_str02.phpt
deleted file mode 100644
index 44ed44865c..0000000000
--- a/ext/mbstring/tests/mb_parse_str02.phpt
+++ /dev/null
@@ -1,104 +0,0 @@
---TEST--
-mb_parse_str() test 2
---SKIPIF--
-<?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
---INI--
-arg_separator.input=&#
---FILE--
-<?php
-$queries = array(
-	"foo=abc#bar=def&fubar=ghi",
-	"%2bfoo=def&-bar=jkl#+fubar",
-	"  foo[]=abc&foo[]=def#foo[]=ghi#bar[]=#foo[]&fubar[]=="
-);
-function test($query) {
-	$foo = '';
-	$bar = '';
-	$fubar = '';
-	mb_parse_str($query, $array);
-	var_dump($array);
-	var_dump($foo);
-	var_dump($bar);
-	var_dump($fubar);
-	mb_parse_str($query);
-	var_dump($foo);
-	var_dump($bar);
-	var_dump($fubar);
-}
-foreach ($queries as $query) {
-	test($query);
-}
-?>
---EXPECT--
-array(3) {
-  ["foo"]=>
-  string(3) "abc"
-  ["bar"]=>
-  string(3) "def"
-  ["fubar"]=>
-  string(3) "ghi"
-}
-string(0) ""
-string(0) ""
-string(0) ""
-string(3) "abc"
-string(3) "def"
-string(3) "ghi"
-array(3) {
-  ["+foo"]=>
-  string(3) "def"
-  ["-bar"]=>
-  string(3) "jkl"
-  ["fubar"]=>
-  string(0) ""
-}
-string(0) ""
-string(0) ""
-string(0) ""
-string(0) ""
-string(0) ""
-string(0) ""
-array(3) {
-  ["foo"]=>
-  array(4) {
-    [0]=>
-    string(3) "abc"
-    [1]=>
-    string(3) "def"
-    [2]=>
-    string(3) "ghi"
-    [3]=>
-    string(0) ""
-  }
-  ["bar"]=>
-  array(1) {
-    [0]=>
-    string(0) ""
-  }
-  ["fubar"]=>
-  array(1) {
-    [0]=>
-    string(1) "="
-  }
-}
-string(0) ""
-string(0) ""
-string(0) ""
-array(4) {
-  [0]=>
-  string(3) "abc"
-  [1]=>
-  string(3) "def"
-  [2]=>
-  string(3) "ghi"
-  [3]=>
-  string(0) ""
-}
-array(1) {
-  [0]=>
-  string(0) ""
-}
-array(1) {
-  [0]=>
-  string(1) "="
-}
diff --git a/ext/mbstring/tests/mb_preferred_mime_name.phpt b/ext/mbstring/tests/mb_preferred_mime_name.phpt
deleted file mode 100644
index 82f88b15c3..0000000000
--- a/ext/mbstring/tests/mb_preferred_mime_name.phpt
+++ /dev/null
@@ -1,61 +0,0 @@
---TEST--
-mb_preferred_mime_name()
---SKIPIF--
-<?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
---FILE--
-<?php
-// TODO: Add more encoding names
-
-//$debug=true;
-ini_set('include_path','.');
-include_once('common.inc');
-
-
-$str = mb_preferred_mime_name('sjis-win');
-echo "$str\n";
-
-$str = mb_preferred_mime_name('SJIS');
-echo "$str\n";
-
-$str = mb_preferred_mime_name('EUC-JP');
-echo "$str\n";
-
-$str = mb_preferred_mime_name('UTF-8');
-echo "$str\n";
-
-$str = mb_preferred_mime_name('ISO-2022-JP');
-echo "$str\n";
-
-$str = mb_preferred_mime_name('JIS');
-echo "$str\n";
-
-$str = mb_preferred_mime_name('ISO-8859-1');
-echo "$str\n";
-
-$str = mb_preferred_mime_name('UCS2');
-echo "$str\n";
-
-$str = mb_preferred_mime_name('UCS4');
-echo "$str\n";
-
-echo "== INVALID PARAMETER ==\n";
-// Invalid name
-$r = mb_preferred_mime_name('BAD_NAME');
-($r === FALSE) ? print("OK_BAD_NAME\n") : print("NG_BAD_NAME\n");
-
-?>
-
---EXPECT--
-Shift_JIS
-Shift_JIS
-EUC-JP
-UTF-8
-ISO-2022-JP
-ISO-2022-JP
-ISO-8859-1
-UCS-2
-UCS-4
-== INVALID PARAMETER ==
-ERR: Warning
-OK_BAD_NAME
-
diff --git a/ext/mbstring/tests/mb_regex_set_options.phpt b/ext/mbstring/tests/mb_regex_set_options.phpt
deleted file mode 100644
index 88ee9c9250..0000000000
--- a/ext/mbstring/tests/mb_regex_set_options.phpt
+++ /dev/null
@@ -1,18 +0,0 @@
---TEST--
-mb_regex_set_options() 
---SKIPIF--
-<?php
-extension_loaded('mbstring') or die("skip mbstring not available\n");
-function_exists('mb_regex_set_options') or die("skip\n");
-?>
---FILE--
-<?php
-	mb_regex_set_options( 'x' );
-	print mb_ereg_replace(' -', '+', '- - - - -' );
-
-	mb_regex_set_options( '' );
-	print mb_ereg_replace(' -', '+', '- - - - -' );
-?>
-
---EXPECT--
-+ + + + +-++++
diff --git a/ext/mbstring/tests/mb_send_mail01.phpt b/ext/mbstring/tests/mb_send_mail01.phpt
deleted file mode 100644
index 965c857f04..0000000000
--- a/ext/mbstring/tests/mb_send_mail01.phpt
+++ /dev/null
@@ -1,38 +0,0 @@
---TEST--
-mb_send_mail() test 1 (lang=neutral)
---SKIPIF--
-<?php
-if (@mb_send_mail() === false || !mb_language("neutral")) {
-	die("skip mb_send_mail() not available");
-}
-?>
---INI--
-sendmail_path=cat
---FILE--
-<?php
-$to = 'example@example.com';
-
-/* default setting */
-mb_send_mail($to, mb_language(), "test");
-
-/* neutral (UTF-8) */
-if (mb_language("neutral")) {
-	mb_internal_encoding("none");
-	mb_send_mail($to, "test ".mb_language(), "test");
-}
-?>
---EXPECTF--
-To: example@example.com
-Subject: %s
-Mime-Version: 1.0
-Content-Type: text/plain; charset=%s
-Content-Transfer-Encoding: %s
-
-dGVzdA==
-To: example@example.com
-Subject: test neutral
-Mime-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: BASE64
-
-dGVzdA==
diff --git a/ext/mbstring/tests/mb_send_mail02.phpt b/ext/mbstring/tests/mb_send_mail02.phpt
deleted file mode 100644
index 17a6cef899..0000000000
--- a/ext/mbstring/tests/mb_send_mail02.phpt
+++ /dev/null
@@ -1,38 +0,0 @@
---TEST--
-mb_send_mail() test 2 (lang=Japanese)
---SKIPIF--
-<?php
-if (@mb_send_mail() === false || !mb_language("japanese")) {
-	die("skip mb_send_mail() not available");
-}
-?>
---INI--
-sendmail_path=cat
---FILE--
-<?php
-$to = 'example@example.com';
-
-/* default setting */
-mb_send_mail($to, mb_language(), "test");
-
-/* Japanese (EUC-JP) */
-if (mb_language("japanese")) {
-	mb_internal_encoding('EUC-JP');
-	mb_send_mail($to, "¥Æ¥¹¥È ".mb_language(), "¥Æ¥¹¥È");
-}
-?>
---EXPECTF--
-To: example@example.com
-Subject: %s
-Mime-Version: 1.0
-Content-Type: text/plain; charset=%s
-Content-Transfer-Encoding: %s
-
-dGVzdA==
-To: example@example.com
-Subject: =?ISO-2022-JP?B?GyRCJUYlOSVIGyhCIEphcGFuZXNl?=
-Mime-Version: 1.0
-Content-Type: text/plain; charset=ISO-2022-JP
-Content-Transfer-Encoding: 7bit
-
-$B%F%9%H(B
diff --git a/ext/mbstring/tests/mb_send_mail03.phpt b/ext/mbstring/tests/mb_send_mail03.phpt
deleted file mode 100644
index 43ca36a8ac..0000000000
--- a/ext/mbstring/tests/mb_send_mail03.phpt
+++ /dev/null
@@ -1,38 +0,0 @@
---TEST--
-mb_send_mail() test 3 (lang=English)
---SKIPIF--
-<?php
-if (@mb_send_mail() === false || !mb_language("english")) {
-	die("skip mb_send_mail() not available");
-}
-?>
---INI--
-sendmail_path=cat
---FILE--
-<?php
-$to = 'example@example.com';
-
-/* default setting */
-mb_send_mail($to, mb_language(), "test");
-
-/* English (iso-8859-1) */
-if (mb_language("english")) {
-	mb_internal_encoding("ISO-8859-1");
-	mb_send_mail($to, "test ".mb_language(), "test");
-}
-?>
---EXPECTF--
-To: example@example.com
-Subject: %s
-Mime-Version: 1.0
-Content-Type: text/plain; charset=%s
-Content-Transfer-Encoding: %s
-
-dGVzdA==
-To: example@example.com
-Subject: test English
-Mime-Version: 1.0
-Content-Type: text/plain; charset=%s-8859-1
-Content-Transfer-Encoding: 8bit
-
-test
diff --git a/ext/mbstring/tests/mb_send_mail04.phpt b/ext/mbstring/tests/mb_send_mail04.phpt
deleted file mode 100644
index 2523351e12..0000000000
--- a/ext/mbstring/tests/mb_send_mail04.phpt
+++ /dev/null
@@ -1,38 +0,0 @@
---TEST--
-mb_send_mail() test 4 (lang=German)
---SKIPIF--
-<?php
-if (@mb_send_mail() === false || !mb_language("german")) {
-	die("skip mb_send_mail() not available");
-}
-?>
---INI--
-sendmail_path=cat
---FILE--
-<?php
-$to = 'example@example.com';
-
-/* default setting */
-mb_send_mail($to, mb_language(), "test");
-
-/* German (iso-8859-15) */
-if (mb_language("german")) {
-	mb_internal_encoding("ISO-8859-15");
-	mb_send_mail($to, "Pr"."\xfc"."fung ".mb_language(), "Pr"."\xfc"."fung");
-}
-?>
---EXPECTF--
-To: example@example.com
-Subject: %s
-Mime-Version: 1.0
-Content-Type: text/plain; charset=%s
-Content-Transfer-Encoding: %s
-
-dGVzdA==
-To: example@example.com
-Subject: =?ISO-8859-15?Q?Pr=FCfung=20German?=
-Mime-Version: 1.0
-Content-Type: text/plain; charset=%s-8859-15
-Content-Transfer-Encoding: 8bit
-
-Prüfung
diff --git a/ext/mbstring/tests/mb_send_mail05.phpt b/ext/mbstring/tests/mb_send_mail05.phpt
deleted file mode 100644
index 7eb232f68f..0000000000
--- a/ext/mbstring/tests/mb_send_mail05.phpt
+++ /dev/null
@@ -1,42 +0,0 @@
---TEST--
-mb_send_mail() test 5 (lang=Simplified Chinese)
---SKIPIF--
-<?php
-if (@mb_send_mail() === false || !mb_language("Simplified Chinese")) {
-	die("skip mb_send_mail() not available");
-}
-if (!@mb_internal_encoding('GB2312')) {
-	die("skip GB2312 encoding is not avaliable on this platform");
-}
-?>
---INI--
-sendmail_path=cat
---FILE--
-<?php
-$to = 'example@example.com';
-
-/* default setting */
-mb_send_mail($to, mb_language(), "test");
-
-/* Simplified Chinese (HK-GB-2312) */
-if (mb_language("simplified chinese")) {
-	mb_internal_encoding('GB2312');
-	mb_send_mail($to, "²âÑé ".mb_language(), "²âÑé");
-}
-?>
---EXPECTF--
-To: example@example.com
-Subject: %s
-Mime-Version: 1.0
-Content-Type: text/plain; charset=%s
-Content-Transfer-Encoding: %s
-
-dGVzdA==
-To: example@example.com
-Subject: =?HZ-GB-2312?B?fnsyYlFpfn0gU2ltcGxpZmllZCBD?=
- =?HZ-GB-2312?B?aGluZXNl?=
-Mime-Version: 1.0
-Content-Type: text/plain; charset=HZ-GB-2312
-Content-Transfer-Encoding: 7bit
-
-~{2bQi~}
diff --git a/ext/mbstring/tests/mb_send_mail06.phpt b/ext/mbstring/tests/mb_send_mail06.phpt
deleted file mode 100644
index e92bfd1c9e..0000000000
--- a/ext/mbstring/tests/mb_send_mail06.phpt
+++ /dev/null
@@ -1,41 +0,0 @@
---TEST--
-mb_send_mail() test 6 (lang=Traditional Chinese)
---SKIPIF--
-<?php
-if (@mb_send_mail() === false || !mb_language("Traditional Chinese")) {
-	die("skip mb_send_mail() not available");
-}
-if (!@mb_internal_encoding('BIG5')) {
-	die("skip BIG5 encoding is not avaliable on this platform");
-}
-?>
---INI--
-sendmail_path=cat
---FILE--
-<?php
-$to = 'example@example.com';
-
-/* default setting */
-mb_send_mail($to, mb_language(), "test");
-
-/* Traditional Chinese () */
-if (mb_language("traditional chinese")) {
-	mb_internal_encoding('BIG5');
-	mb_send_mail($to, "´úÅç ".mb_language(), "´úÅç");
-}
-?>
---EXPECTF--
-To: example@example.com
-Subject: %s
-Mime-Version: 1.0
-Content-Type: text/plain; charset=%s
-Content-Transfer-Encoding: %s
-
-dGVzdA==
-To: example@example.com
-Subject: =?BIG5?B?tPrF5yBUcmFkaXRpb25hbCBDaGluZXNl?=
-Mime-Version: 1.0
-Content-Type: text/plain; charset=BIG5
-Content-Transfer-Encoding: 8bit
-
-´úÅç
diff --git a/ext/mbstring/tests/mb_send_mail07.phpt b/ext/mbstring/tests/mb_send_mail07.phpt
deleted file mode 100644
index e7ad08254a..0000000000
--- a/ext/mbstring/tests/mb_send_mail07.phpt
+++ /dev/null
@@ -1,41 +0,0 @@
---TEST--
-mb_send_mail() test 7 (lang=Korean)
---SKIPIF--
-<?php
-if (@mb_send_mail() === false || !mb_language("Korean")) {
-	die("skip mb_send_mail() not available");
-}
-if (!@mb_internal_encoding('ISO-2022-KR')) {
-	die("skip ISO-2022-KR encoding is not avaliable on this platform");
-}
-?>
---INI--
-sendmail_path=cat
---FILE--
-<?php
-$to = 'example@example.com';
-
-/* default setting */
-mb_send_mail($to, mb_language(), "test");
-
-/* Korean */
-if (mb_language("korean")) {
-	mb_internal_encoding('EUC-KR');
-	mb_send_mail($to, "Å×½ºÆ® ".mb_language(), "Å×½ºÆ®");
-}
-?>
---EXPECTF--
-To: example@example.com
-Subject: %s
-Mime-Version: 1.0
-Content-Type: text/plain; charset=%s
-Content-Transfer-Encoding: %s
-
-dGVzdA==
-To: example@example.com
-Subject: =?ISO-2022-KR?B?GyQpQw5FVz06Ri4PIEtvcmVhbg8=?=
-Mime-Version: 1.0
-Content-Type: text/plain; charset=ISO-2022-KR
-Content-Transfer-Encoding: 7bit
-
-$)CEW=:F.
diff --git a/ext/mbstring/tests/mb_split-compat-01.phpt b/ext/mbstring/tests/mb_split-compat-01.phpt
deleted file mode 100644
index 8dbc82c130..0000000000
--- a/ext/mbstring/tests/mb_split-compat-01.phpt
+++ /dev/null
@@ -1,23 +0,0 @@
---TEST--
-mb_split() compat test 1
---SKIPIF--
-<?php
-extension_loaded('mbstring') or die('skip');
-function_exists('mb_split') or die("skip mb_split() is not available in this build");
-?>
---FILE--
-<?php
-/* (counterpart: ext/standard/tests/reg/009.phpt) */
-	$a=mb_split("[[:space:]]","this is	a
-test");
-	echo count($a) . "\n";
-	for ($i = 0; $i < count($a); $i++) {
-          echo $a[$i] . "\n";
-        }
-?>
---EXPECT--
-4
-this
-is
-a
-test
diff --git a/ext/mbstring/tests/mb_split.phpt b/ext/mbstring/tests/mb_split.phpt
deleted file mode 100644
index abe12763eb..0000000000
--- a/ext/mbstring/tests/mb_split.phpt
+++ /dev/null
@@ -1,48 +0,0 @@
---TEST--
-mb_split()
---SKIPIF--
-<?php
-extension_loaded('mbstring') or die('skip mbstring not available');
-function_exists('mb_split') or die("skip mb_split() is not available in this build");
-?>
---INI--
-mbstring.func_overload=0
---FILE--
-<?php
-	mb_regex_set_options( '' );
-	mb_regex_encoding( 'EUC-JP' );
-
-	function verify_split( $spliton, $str, $count = 0 )
-	{
-		$result1 = mb_split( $spliton, $str, $count );
-		$result2 = split( $spliton, $str, $count );
-		if ( $result1 == $result2 ) {
-			print "ok\n";
-		} else {
-			print count($result1).'-'.count($result2)."\n";
-		}	
-	}
-
-	var_dump( mb_split( " ", "a b c d e f g" )
-	          == mb_split( "[[:space:]]", "a\nb\tc\nd e f g" ) );
-
-	for ( $i = 0; $i < 5; ++$i ) {
-		verify_split( " ", "a\tb\tc\td   e\tf g", $i );
-	}
-
-	for ( $i = 1; $i < 5; ++$i ) {
-		verify_split( "\xa1\xa1+", "\xa1\xa1\xa1\xa2\xa2\xa1\xa1\xa1\xa1\xa1\xa1\xa2\xa2\xa1\xa1\xa1", $i );
-	}
-?>
-
---EXPECT--
-bool(true)
-ok
-ok
-ok
-ok
-ok
-ok
-2-2
-3-3
-4-4
diff --git a/ext/mbstring/tests/mb_strcut.phpt b/ext/mbstring/tests/mb_strcut.phpt
deleted file mode 100644
index 8ea074a3cd..0000000000
--- a/ext/mbstring/tests/mb_strcut.phpt
+++ /dev/null
@@ -1,34 +0,0 @@
---TEST--
-mb_strcut()
---SKIPIF--
-<?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
---INI--
-output_handler=
---FILE--
-<?php
-// TODO: Add more encodings
-ini_set('include_path','.');
-include_once('common.inc');
-
-// EUC-JP
-$euc_jp = '0123¤³¤Îʸ»úÎó¤ÏÆüËܸì¤Ç¤¹¡£EUC-JP¤ò»È¤Ã¤Æ¤¤¤Þ¤¹¡£ÆüËܸì¤ÏÌÌÅݽ­¤¤¡£';
-
-print  mb_strcut($euc_jp,  6,   5,'EUC-JP') . "\n";
-print  mb_strcut($euc_jp,  0, 100,'EUC-JP') . "\n";
-
-$str = mb_strcut($euc_jp, 100, 10,'EUC-JP');
-($str === "") ? print "OK\n" : print "NG: $str\n";
-
-$str = mb_strcut($euc_jp, -100, 10,'EUC-JP');
-($str !== "") ?	print "OK: $str\n" : print "NG:\n";
-
-
-?>
-
---EXPECT--
-¤Îʸ
-0123¤³¤Îʸ»úÎó¤ÏÆüËܸì¤Ç¤¹¡£EUC-JP¤ò»È¤Ã¤Æ¤¤¤Þ¤¹¡£ÆüËܸì¤ÏÌÌÅݽ­¤¤¡£
-OK
-OK: 0123¤³¤Îʸ
-
-
diff --git a/ext/mbstring/tests/mb_strimwidth.phpt b/ext/mbstring/tests/mb_strimwidth.phpt
deleted file mode 100644
index efa98856f1..0000000000
--- a/ext/mbstring/tests/mb_strimwidth.phpt
+++ /dev/null
@@ -1,43 +0,0 @@
---TEST--
-mb_strimwidth()
---SKIPIF--
-<?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
---INI--
-output_handler=
---FILE--
-<?php
-// TODO: Add more encoding
-//$debug = true;
-ini_set('include_path','.');
-include_once('common.inc');
-
-// EUC-JP
-$euc_jp = '0123¤³¤Îʸ»úÎó¤ÏÆüËܸì¤Ç¤¹¡£EUC-JP¤ò»È¤Ã¤Æ¤¤¤Þ¤¹¡£ÆüËܸì¤ÏÌÌÅݽ­¤¤¡£';
-
-print  "1: ". mb_strimwidth($euc_jp,  0, 15,'...','EUC-JP') . "\n";
-print  "2: ". mb_strimwidth($euc_jp,  0, 100,'...','EUC-JP') . "\n";
-print  "3: ". mb_strimwidth($euc_jp, 15, 100,'...','EUC-JP') . "\n";
-// Note: Did not start form -22 offset. Staring from 0.
-$str = mb_strimwidth($euc_jp,-22, 100,'...','EUC-JP');
-($str === FALSE) ? print "4 OK\n" : print "NG: $str\n";
-
-$str = mb_strimwidth($euc_jp, 100, -10,'...','EUC-JP');
-($str === FALSE) ? print "5 OK\n" : print "NG: $str\n";
-
-$str = mb_strimwidth($euc_jp, -100, 10,'...','EUC-JP');
-($str === FALSE) ? print "6 OK\n" : print "NG: $str\n";
-
-?>
-
---EXPECT--
-1: 0123¤³¤Îʸ»ú...
-2: 0123¤³¤Îʸ»úÎó¤ÏÆüËܸì¤Ç¤¹¡£EUC-JP¤ò»È¤Ã¤Æ¤¤¤Þ¤¹¡£ÆüËܸì¤ÏÌÌÅݽ­¤¤¡£
-3: ¡£EUC-JP¤ò»È¤Ã¤Æ¤¤¤Þ¤¹¡£ÆüËܸì¤ÏÌÌÅݽ­¤¤¡£
-ERR: Warning
-4 OK
-ERR: Warning
-5 OK
-ERR: Warning
-6 OK
-
-
diff --git a/ext/mbstring/tests/mb_strlen.phpt b/ext/mbstring/tests/mb_strlen.phpt
deleted file mode 100644
index 500237e2cc..0000000000
--- a/ext/mbstring/tests/mb_strlen.phpt
+++ /dev/null
@@ -1,104 +0,0 @@
---TEST--
-mb_strlen()
---SKIPIF--
-<?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
---FILE--
-<?php
-// TODO: Add more encodings
-
-//$debug=true;
-ini_set('include_path','.');
-include_once('common.inc');
-
-// restore detect_order to 'auto'
-mb_detect_order('auto');
-
-// Test string
-$euc_jp = '0123¤³¤Îʸ»úÎó¤ÏÆüËܸì¤Ç¤¹¡£EUC-JP¤ò»È¤Ã¤Æ¤¤¤Þ¤¹¡£0123ÆüËܸì¤ÏÌÌÅݽ­¤¤¡£';
-$ascii  = 'abcdefghijklmnopqrstuvwxyz;]=#0123456789';
-
-// ASCII
-echo "== ASCII ==\n";
-print  strlen($ascii,'ASCII') . "\n";
-print  strlen($ascii) . "\n";
-
-// EUC-JP
-echo "== EUC-JP ==\n";
-print  strlen($euc_jp,'EUC-JP') . "\n";
-mb_internal_encoding('EUC-JP') or print("mb_internal_encoding() failed\n");
-print  strlen($euc_jp) . "\n";
-
-// SJIS
-echo "== SJIS ==\n";
-$sjis = mb_convert_encoding($euc_jp, 'SJIS');
-print  strlen($sjis,'SJIS') . "\n";
-mb_internal_encoding('SJIS') or print("mb_internal_encoding() failed\n");
-print  strlen($sjis) . "\n";
-
-// JIS
-// Note: either convert_encoding or strlen has problem
-echo "== JIS ==\n";
-$jis = mb_convert_encoding($euc_jp, 'JIS');
-print  strlen($jis,'JIS') . "\n";
-mb_internal_encoding('JIS')  or print("mb_internal_encoding() failed\n");
-print  strlen($jis) . "\n"; 
-
-// UTF-8
-// Note: either convert_encoding or strlen has problem
-echo "== UTF-8 ==\n";
-$utf8 = mb_convert_encoding($euc_jp, 'UTF-8');
-print  strlen($utf8,'UTF-8') . "\n";
-mb_internal_encoding('UTF-8')  or print("mb_internal_encoding() failed\n");
-print  strlen($utf8) . "\n";  
-
-
-// Wrong Parameters
-echo "== WRONG PARAMETERS ==\n";
-// Array
-// Note: PHP Notice, but returns some value
-$r = strlen($t_ary);
-echo $r."\n";
-// Object
-// Note: PHP Notice, but returns some value
-$r = strlen($t_obj);
-echo $r."\n";
-// Wrong encoding
-mb_internal_encoding('EUC-JP');
-$r = strlen($euc_jp, 'BAD_NAME');
-echo $r."\n";
-
-
-
-
-?>
-
---EXPECT--
-== ASCII ==
-ERR: Warning
-
-40
-== EUC-JP ==
-ERR: Warning
-
-72
-== SJIS ==
-ERR: Warning
-
-72
-== JIS ==
-ERR: Warning
-
-121
-== UTF-8 ==
-ERR: Warning
-
-174
-== WRONG PARAMETERS ==
-ERR: Notice
-5
-ERR: Notice
-6
-ERR: Warning
-
-
-
diff --git a/ext/mbstring/tests/mb_strpos.phpt b/ext/mbstring/tests/mb_strpos.phpt
deleted file mode 100644
index ca49599fa7..0000000000
--- a/ext/mbstring/tests/mb_strpos.phpt
+++ /dev/null
@@ -1,175 +0,0 @@
---TEST--
-mb_strpos() 
---SKIPIF--
-<?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
---FILE--
-<?php
-// TODO: Add more encodings
-
-//$debug=true;
-ini_set('include_path','.');
-include_once('common.inc');
-
-
-// Test string
-$euc_jp = '0123¤³¤Îʸ»úÎó¤ÏÆüËܸì¤Ç¤¹¡£EUC-JP¤ò»È¤Ã¤Æ¤¤¤Þ¤¹¡£0123ÆüËܸì¤ÏÌÌÅݽ­¤¤¡£';
-
-// EUC-JP - With encoding parameter
-mb_internal_encoding('UTF-8') or print("mb_internal_encoding() failed\n");
-
-echo  "== POSITIVE OFFSET ==\n";
-print  mb_strpos($euc_jp,'ÆüËܸì', 0, 'EUC-JP') . "\n";
-print  mb_strpos($euc_jp, '0', 0,     'EUC-JP') . "\n";
-print  mb_strpos($euc_jp, 3, 0,       'EUC-JP') . "\n";
-print  mb_strpos($euc_jp, 0, 0,       'EUC-JP') . "\n";
-print  mb_strpos($euc_jp,'ÆüËܸì', 15, 'EUC-JP') . "\n";
-print  mb_strpos($euc_jp, '0', 15,     'EUC-JP') . "\n";
-print  mb_strpos($euc_jp, 3, 15,       'EUC-JP') . "\n";
-print  mb_strpos($euc_jp, 0, 15,       'EUC-JP') . "\n";
-
-// Negative offset
-// Note: PHP Warning - offset is negative.
-// Note: For offset(-15). It does not return position of latter string. (ie the same result as -50)
-echo "== NEGATIVE OFFSET ==\n";
-$r = mb_strpos($euc_jp,'ÆüËܸì', -15, 'EUC-JP');
-($r === FALSE) ? print "OK_NEGATIVE_OFFSET\n" : print "NG_NEGATIVE_OFFSET\n";
-$r = mb_strpos($euc_jp, '0', -15,     'EUC-JP');
-($r === FALSE) ? print "OK_NEGATIVE_OFFSET\n" : print "NG_NEGATIVE_OFFSET\n";
-$r = mb_strpos($euc_jp, 3, -15,       'EUC-JP');
-($r === FALSE) ? print "OK_NEGATIVE_OFFSET\n" : print "NG_NEGATIVE_OFFSET\n";
-$r = mb_strpos($euc_jp, 0, -15,       'EUC-JP');
-($r === FALSE) ? print "OK_NEGATIVE_OFFSET\n" : print "NG_NEGATIVE_OFFSET\n";
-$r = mb_strpos($euc_jp,'ÆüËܸì', -50, 'EUC-JP');
-($r === FALSE) ? print "OK_NEGATIVE_OFFSET\n" : print "NG_NEGATIVE_OFFSET\n";
-$r = mb_strpos($euc_jp, '0', -50,     'EUC-JP');
-($r === FALSE) ? print "OK_NEGATIVE_OFFSET\n" : print "NG_NEGATIVE_OFFSET\n";
-$r = mb_strpos($euc_jp, 3, -50,       'EUC-JP');
-($r === FALSE) ? print "OK_NEGATIVE_OFFSET\n" : print "NG_NEGATIVE_OFFSET\n";
-$r = mb_strpos($euc_jp, 0, -50,       'EUC-JP');
-($r === FALSE) ? print "OK_NEGATIVE_OFFSET\n" : print "NG_NEGATIVE_OFFSET\n";
-
-// Out of range - should return false
-print ("== OUT OF RANGE ==\n");
-$r =  mb_strpos($euc_jp,'ÆüËܸì', 40, 'EUC-JP');
-($r === FALSE) ? print "OK_OUT_RANGE\n"     : print "NG_OUT_RANGE\n";
-$r =  mb_strpos($euc_jp, '0', 40,     'EUC-JP');
-($r === FALSE) ? print "OK_OUT_RANGE\n"     : print "NG_OUT_RANGE\n";
-$r =  mb_strpos($euc_jp, 3, 40,       'EUC-JP');
-($r === FALSE) ? print "OK_OUT_RANGE\n"     : print "NG_OUT_RANGE\n";
-$r =   mb_strpos($euc_jp, 0, 40,       'EUC-JP');
-($r === FALSE) ? print "OK_OUT_RANGE\n"     : print "NG_OUT_RANGE\n";
-// Note: Returned NULL string
-// echo gettype($r). ' val '. $r ."\n"; 
-
-
-// Non-existent
-echo "== NON-EXISTENT ==\n";
-$r = mb_strpos($euc_jp, '´Ú¹ñ¸ì', 0, 'EUC-JP');
-($r === FALSE) ? print "OK_STR\n"     : print "NG_STR\n";
-$r = mb_strpos($euc_jp, "\n",     0, 'EUC-JP');
-($r === FALSE) ? print "OK_NEWLINE\n" : print "NG_NEWLINE\n";
-
-
-// EUC-JP - No encoding parameter
-echo "== NO ENCODING PARAMETER ==\n";
-mb_internal_encoding('EUC-JP')  or print("mb_internal_encoding() failed\n");
-
-print  mb_strpos($euc_jp,'ÆüËܸì', 0) . "\n";
-print  mb_strpos($euc_jp, '0', 0) . "\n";
-print  mb_strpos($euc_jp, 3, 0) . "\n";
-print  mb_strpos($euc_jp, 0, 0) . "\n";
-
-$r = mb_strpos($euc_jp,'´Ú¹ñ¸ì', 0);
-($r === FALSE) ? print "OK_STR\n"     : print "NG_STR\n";
-$r = mb_strpos($euc_jp,"\n", 0);
-($r === FALSE) ? print "OK_NEWLINE\n" : print "NG_NEWLINE\n";
-
-// EUC-JP - No offset and encoding parameter
-echo "== NO OFFSET AND ENCODING PARAMETER ==\n";
-mb_internal_encoding('EUC-JP')  or print("mb_internal_encoding() failed\n");
-
-print  mb_strpos($euc_jp,'ÆüËܸì') . "\n";
-print  mb_strpos($euc_jp, '0') . "\n";
-print  mb_strpos($euc_jp, 3) . "\n";
-print  mb_strpos($euc_jp, 0) . "\n";
-
-$r = mb_strpos($euc_jp,'´Ú¹ñ¸ì');
-($r === FALSE) ? print "OK_STR\n"     : print "NG_STR\n";
-$r = mb_strpos($euc_jp,"\n");
-($r === FALSE) ? print "OK_NEWLINE\n" : print "NG_NEWLINE\n";
-
-
-// Invalid Parameters
-echo "== INVALID PARAMETER TEST ==\n";
-
-$r = mb_strpos($euc_jp,'','EUC-JP');
-($r === FALSE) ? print("OK_NULL\n") : print("NG_NULL\n");
-$r = mb_strpos($euc_jp, $t_ary, 'EUC-JP');
-($r === FALSE) ? print("OK_ARRAY\n") : print("NG_ARRAY\n");
-$r = mb_strpos($euc_jp, $t_obj, 'EUC-JP');
-($r === FALSE) ? print("OK_OBJECT\n") : print("NG_OBJECT\n");
-$r = mb_strpos($euc_jp, $t_obj, 'BAD_ENCODING');
-($r === FALSE) ? print("OK_BAD_ENCODING\n") : print("NG_BAD_ENCODING\n");
-
-
-?>
-
---EXPECT--
-== POSITIVE OFFSET ==
-10
-0
-3
-0
-34
-30
-33
-30
-== NEGATIVE OFFSET ==
-ERR: Warning
-OK_NEGATIVE_OFFSET
-ERR: Warning
-OK_NEGATIVE_OFFSET
-ERR: Warning
-OK_NEGATIVE_OFFSET
-ERR: Warning
-OK_NEGATIVE_OFFSET
-ERR: Warning
-OK_NEGATIVE_OFFSET
-ERR: Warning
-OK_NEGATIVE_OFFSET
-ERR: Warning
-OK_NEGATIVE_OFFSET
-ERR: Warning
-OK_NEGATIVE_OFFSET
-== OUT OF RANGE ==
-OK_OUT_RANGE
-OK_OUT_RANGE
-OK_OUT_RANGE
-OK_OUT_RANGE
-== NON-EXISTENT ==
-OK_STR
-OK_NEWLINE
-== NO ENCODING PARAMETER ==
-10
-0
-3
-0
-OK_STR
-OK_NEWLINE
-== NO OFFSET AND ENCODING PARAMETER ==
-10
-0
-3
-0
-OK_STR
-OK_NEWLINE
-== INVALID PARAMETER TEST ==
-ERR: Warning
-OK_NULL
-ERR: Warning
-OK_ARRAY
-ERR: Warning
-OK_OBJECT
-ERR: Warning
-OK_BAD_ENCODING
-
diff --git a/ext/mbstring/tests/mb_strwidth.phpt b/ext/mbstring/tests/mb_strwidth.phpt
deleted file mode 100644
index 33ec851c3d..0000000000
--- a/ext/mbstring/tests/mb_strwidth.phpt
+++ /dev/null
@@ -1,32 +0,0 @@
---TEST--
-mb_strwidth()
---SKIPIF--
-<?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
---FILE--
-<?php
-// TODO: Add more encoding, strings.....
-//$debug = true;
-ini_set('include_path','.');
-include_once('common.inc');
-
-// EUC-JP
-$euc_jp = '0123¤³¤Îʸ»úÎó¤ÏÆüËܸì¤Ç¤¹¡£EUC-JP¤ò»È¤Ã¤Æ¤¤¤Þ¤¹¡£ÆüËܸì¤ÏÌÌÅݽ­¤¤¡£';
-
-print  "1: ". mb_strwidth($euc_jp, 'EUC-JP') . "\n";
-/*
-
-print  "2: ". mb_strwidth($euc_jp, 'EUC-JP') . "\n";
-print  "3: ". mb_strwidth($euc_jp, 'EUC-JP') . "\n";
-// Note: Did not start form -22 offset. Staring from 0.
-print  "4: ". mb_strwidth($euc_jp, 'EUC-JP') . "\n";
-
-$str = mb_strwidth($euc_jp, 100, -10,'...','EUC-JP');
-($str === "") ? print "5 OK\n" : print "NG: $str\n";
-
-$str = mb_strwidth($euc_jp, -100, 10,'...','EUC-JP');
-($str !== "") ?	print "6 OK: $str\n" : print "NG: $str\n";
-*/
-?>
-
---EXPECT--
-1: 68
diff --git a/ext/mbstring/tests/mb_substitute_character.phpt b/ext/mbstring/tests/mb_substitute_character.phpt
deleted file mode 100644
index 9f2131080e..0000000000
--- a/ext/mbstring/tests/mb_substitute_character.phpt
+++ /dev/null
@@ -1,49 +0,0 @@
---TEST--
-mb_substitute_character()  
---SKIPIF--
-<?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
---FILE--
-<?php
-//$debug = true;
-ini_set('include_path','.');
-include_once('common.inc');
-
-// Note: It does not return TRUE/FALSE for setting char
-
-// Use Unicode val
-$r = mb_substitute_character(0x3013);
-//$r = mb_substitute_character('U+3013');
-($r === TRUE) ?    print "OK_UTF\n" :  print("NG_UTF: ".gettype($r)." $r\n");
-print mb_substitute_character() . "\n";
-
-
-// Use "long"
-$r = mb_substitute_character('long');
-($r === TRUE) ? print "OK_LONG\n" : print("NG_LONG: ".gettype($r)." $r\n");
-print mb_substitute_character() . "\n";
-
-
-// Use "none"
-$r = mb_substitute_character('none');
-($r === TRUE) ? print "OK_NONE\n" : print("NG_NONE: ".gettype($r)." $r\n");
-print mb_substitute_character() . "\n";
-
-
-// Set invalid string. Should fail.
-print "== INVALID PARAMETER ==\n";
-$r = mb_substitute_character('BAD_NAME');
-($r === FALSE) ? print "OK_BAD_NAME\n" : print("NG_BAD_NAME: ".gettype($r)." $r\n");
-
-?>
-
---EXPECT--
-OK_UTF
-12307
-OK_LONG
-long
-OK_NONE
-none
-== INVALID PARAMETER ==
-ERR: Warning
-OK_BAD_NAME
-
diff --git a/ext/mbstring/tests/mb_substr.phpt b/ext/mbstring/tests/mb_substr.phpt
deleted file mode 100644
index 893cb64819..0000000000
--- a/ext/mbstring/tests/mb_substr.phpt
+++ /dev/null
@@ -1,34 +0,0 @@
---TEST--
-mb_substr()
---SKIPIF--
-<?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
---INI--
-output_handler=
---FILE--
-<?php
-// TODO: Add more encodings
-ini_set('include_path','.');
-include_once('common.inc');
-
-// EUC-JP
-$euc_jp = '0123¤³¤Îʸ»úÎó¤ÏÆüËܸì¤Ç¤¹¡£EUC-JP¤ò»È¤Ã¤Æ¤¤¤Þ¤¹¡£ÆüËܸì¤ÏÌÌÅݽ­¤¤¡£';
-
-print  "1: ". mb_substr($euc_jp,  10,  10,'EUC-JP') . "\n";
-print  "2: ". mb_substr($euc_jp,   0, 100,'EUC-JP') . "\n";
-
-$str = mb_substr($euc_jp, 100, 10,'EUC-JP');
-// Note: returns last character
-($str === "") ? print "3 OK\n" : print "NG: $str\n";
-
-$str = mb_substr($euc_jp, -100, 10,'EUC-JP');
-($str !== "") ? print "4 OK: $str\n" : print "NG: $str\n";
-
-?>
-
---EXPECT--
-1: ÆüËܸì¤Ç¤¹¡£EUC-
-2: 0123¤³¤Îʸ»úÎó¤ÏÆüËܸì¤Ç¤¹¡£EUC-JP¤ò»È¤Ã¤Æ¤¤¤Þ¤¹¡£ÆüËܸì¤ÏÌÌÅݽ­¤¤¡£
-3 OK
-4 OK: 0123¤³¤Îʸ»úÎó¤Ï
-
-
diff --git a/ext/mbstring/tests/mb_substr_count.phpt b/ext/mbstring/tests/mb_substr_count.phpt
deleted file mode 100644
index 5be5109375..0000000000
--- a/ext/mbstring/tests/mb_substr_count.phpt
+++ /dev/null
@@ -1,44 +0,0 @@
---TEST--
-mb_substr_count()
---SKIPIF--
-<?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
---INI--
-output_handler=
---FILE--
-<?php
-	mb_internal_encoding("EUC-JP");
-	var_dump(@mb_substr_count("", ""));
-	var_dump(@mb_substr_count("¤¢", ""));
-	var_dump(@mb_substr_count("", "¤¢"));
-	var_dump(@mb_substr_count("", "¤¢"));
-	var_dump(@mb_substr_count("", chr(0)));
-
-	$a = str_repeat("abcacba", 100);
-	var_dump(@mb_substr_count($a, "bca"));
-
-	$a = str_repeat("¤¢¤¤¤¦¤¢¤¦¤¤¤¢", 100);
-	$b = "¤¤¤¦¤¢";
-	var_dump(@mb_substr_count($a, $b));
-
-	$to_enc = "UTF-8";
-	var_dump(@mb_substr_count(mb_convert_encoding($a, $to_enc),
-	                          mb_convert_encoding($b, $to_enc), $to_enc));
-
-	$to_enc = "Shift_JIS";
-	var_dump(@mb_substr_count(mb_convert_encoding($a, $to_enc),
-	                          mb_convert_encoding($b, $to_enc), $to_enc));
-
-	$a = str_repeat("abcacbabca", 100);
-	var_dump(@mb_substr_count($a, "bca"));
-?>
---EXPECT--
-bool(false)
-bool(false)
-int(0)
-int(0)
-int(0)
-int(100)
-int(100)
-int(100)
-int(100)
-int(200)
diff --git a/ext/mbstring/tests/overload01.phpt b/ext/mbstring/tests/overload01.phpt
deleted file mode 100644
index b0990e8161..0000000000
--- a/ext/mbstring/tests/overload01.phpt
+++ /dev/null
@@ -1,25 +0,0 @@
---TEST--
-Function overloading test 1
---SKIPIF--
-<?php 
-	extension_loaded('mbstring') or die('skip mbstring not available'); 
-	if (!function_exists("mail")) {
-		die('skip mail() function is not available.');
-	}
-?>
---INI--
-output_handler=
-mbstring.func_overload=7
-mbstring.internal_encoding=EUC-JP
---FILE--
-<?php
-echo mb_internal_encoding()."\n";
-
-$ngchars = array('ǽ','ɽ','»½','¥½');
-$str = '¸µÏ½ÍÜ»½Ðò¼Òº¾µ½É½¸½Ç½ÎÏɽ¼¨±½ÌÈÄä˽ÎÏŽÉÕ¹½Ê¸·½»ÒͽÃÎñ½Æ¬¥½¥Õ¥¡¡¼';
-var_dump(strlen($str));
-var_dump(mb_strlen($str));
---EXPECT--
-EUC-JP
-int(33)
-int(33)
diff --git a/ext/mbstring/tests/overload02.phpt b/ext/mbstring/tests/overload02.phpt
deleted file mode 100644
index 9b5cecdc40..0000000000
--- a/ext/mbstring/tests/overload02.phpt
+++ /dev/null
@@ -1,36 +0,0 @@
---TEST--
-Function overloading test 2 
---SKIPIF--
-<?php 
-	extension_loaded('mbstring') or die('skip mbstring not available'); 
-	if (!function_exists("mail")) {
-		die('skip mail() function is not available.');
-	}
-	if (!function_exists("mb_ereg_replace")) {
-		die('skip mb_ereg_replace() function is not available.');
-	}
-?>
---INI--
-output_handler=
-mbstring.func_overload=7
-mbstring.internal_encoding=EUC-JP
---FILE--
-<?php
-echo mb_internal_encoding()."\n";
-
-$ngchars = array('ǽ','ɽ','»½','¥½');
-$str = '¸µÏ½ÍÜ»½Ðò¼Òº¾µ½É½¸½Ç½ÎÏɽ¼¨±½ÌÈÄä˽ÎÏŽÉÕ¹½Ê¸·½»ÒͽÃÎñ½Æ¬¥½¥Õ¥¡¡¼';
-$converted_str = mb_convert_encoding($str, 'Shift_JIS');
-mb_regex_encoding('Shift_JIS');
-foreach($ngchars as $c) {
-	$c = mb_convert_encoding($c, 'Shift_JIS');
-	$replaced = mb_convert_encoding(ereg_replace($c, '!!', $converted_str), mb_internal_encoding(), 'Shift_JIS');
-	var_dump(strpos($replaced, '!!'));
-}
-?>
---EXPECT--
-EUC-JP
-int(10)
-int(8)
-int(3)
-int(29)
diff --git a/ext/mbstring/tests/php_gr_jp_10830.phpt b/ext/mbstring/tests/php_gr_jp_10830.phpt
deleted file mode 100644
index 85eefd756c..0000000000
--- a/ext/mbstring/tests/php_gr_jp_10830.phpt
+++ /dev/null
@@ -1,18 +0,0 @@
---TEST--
-php-users@php.gr.jp #10830 
---SKIPIF--
-<?php
-extension_loaded('mbstring') or die('skip mbstring not available');
-function_exists('mb_ereg') or die("skip mb_ereg() is not available in this build");
-?>
---FILE--
-<?php
-$a="aaa\n<>";
-
-var_dump( mb_ereg("^[^><]+$",$a) );
-var_dump( ereg("^[^><]+$",$a) );
-?>
-
---EXPECT--
-bool(false)
-bool(false)
diff --git a/ext/mbstring/tests/simpletest.phpt b/ext/mbstring/tests/simpletest.phpt
deleted file mode 100644
index 80b2f72596..0000000000
--- a/ext/mbstring/tests/simpletest.phpt
+++ /dev/null
@@ -1,34 +0,0 @@
---TEST--
-Simple multi-byte print test (EUC-JP)
---SKIPIF--
-<?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
---INI--
-output_handler=
---FILE--
-<?php
-/*
- * Test basic PHP functions to check if it works with multi-byte chars
- */
-
-// EUC-JP strings
-$s1 = "¥Þ¥ë¥Á¥Ð¥¤¥È´Ø¿ô¤¬»È¤¨¤Þ¤¹¡£";
-$s2 = "¤³¤Îʸ»ú¤¬Ï¢·ë¤µ¤ì¤Æ¤¤¤ë¤Ï¤º¡£";
-
-// print directly
-echo "echo: ".$s1.$s2."\n";
-print("print: ".$s1.$s2."\n");
-printf("printf: %s%s\n",$s1, $s2);
-echo sprintf("sprintf: %s%s\n",$s1, $s2); 
-
-// Assign to var
-$s3 = $s1.$s2."\n";
-echo "echo: ".$s3;
-
-?>
---EXPECT--
-echo: ¥Þ¥ë¥Á¥Ð¥¤¥È´Ø¿ô¤¬»È¤¨¤Þ¤¹¡£¤³¤Îʸ»ú¤¬Ï¢·ë¤µ¤ì¤Æ¤¤¤ë¤Ï¤º¡£
-print: ¥Þ¥ë¥Á¥Ð¥¤¥È´Ø¿ô¤¬»È¤¨¤Þ¤¹¡£¤³¤Îʸ»ú¤¬Ï¢·ë¤µ¤ì¤Æ¤¤¤ë¤Ï¤º¡£
-printf: ¥Þ¥ë¥Á¥Ð¥¤¥È´Ø¿ô¤¬»È¤¨¤Þ¤¹¡£¤³¤Îʸ»ú¤¬Ï¢·ë¤µ¤ì¤Æ¤¤¤ë¤Ï¤º¡£
-sprintf: ¥Þ¥ë¥Á¥Ð¥¤¥È´Ø¿ô¤¬»È¤¨¤Þ¤¹¡£¤³¤Îʸ»ú¤¬Ï¢·ë¤µ¤ì¤Æ¤¤¤ë¤Ï¤º¡£
-echo: ¥Þ¥ë¥Á¥Ð¥¤¥È´Ø¿ô¤¬»È¤¨¤Þ¤¹¡£¤³¤Îʸ»ú¤¬Ï¢·ë¤µ¤ì¤Æ¤¤¤ë¤Ï¤º¡£
-
diff --git a/ext/mbstring/tests/skipif.inc b/ext/mbstring/tests/skipif.inc
deleted file mode 100644
index 7eec8aab5a..0000000000
--- a/ext/mbstring/tests/skipif.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-// This script prints "skip" if condition does not meet.
-
-/*
-if (!extension_loaded("mbstring") && ini_get("enable_dl")) {
-  $dlext = (substr(PHP_OS, 0, 3) == "WIN") ? ".dll" : ".so";
-  @dl("mbstring$dlext");
-}
-*/
-
-if (!extension_loaded("mbstring")) {
-    die("skip\n");
-}
-?>
diff --git a/ext/mbstring/tests/zend-multibyte.phpt b/ext/mbstring/tests/zend-multibyte.phpt
deleted file mode 100644
index 9268fdd2f6..0000000000
--- a/ext/mbstring/tests/zend-multibyte.phpt
+++ /dev/null
@@ -1,23 +0,0 @@
---TEST--
-zend multibyte
---SKIPIF--
-<?php
-ini_set("mbstring.script_encoding","SJIS");
-if (ini_set("mbstring.script_encoding","SJIS") != "SJIS") {
-	die("skip zend-multibyte is not available");
-}
-?>
---INI--
-mbstring.script_encoding=Shift_JIS
-mbstring.internal_encoding=Shift_JIS
---FILE--
-<?php
-	function —\Ž\”\($ˆø�”)
-	{
-		echo $ˆø�”;
-	}
-
-	—\Ž\”\("ƒhƒŒƒ~ƒtƒ@ƒ\");
-?>
---EXPECT--
-ƒhƒŒƒ~ƒtƒ@ƒ\
-- 
cgit v1.2.1