fix this tests

-they did not dl load module in test....
-disable E_NOTICE

17 files changed, 205 insertions, 186 deletions

diff --git a/ext/iconv/tests/bug16069.inc b/ext/iconv/tests/bug16069.inc
deleted file mode 100644
index 3888d10545..0000000000
--- a/ext/iconv/tests/bug16069.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-/* charset=CP932, KOI8-R */
-$str = "\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d";
-print iconv( "CP932", "EUC-JP//TRANSLIT", $str );
-$str = "(\x9c\xe4\x9c)";
-print iconv( "KOI8-R", "EUC-JP//TRANSLIT", $str );
-?>
diff --git a/ext/iconv/tests/bug16069.phpt b/ext/iconv/tests/bug16069.phpt
index 7623ba0f5f..af27e1ed40 100644
--- a/ext/iconv/tests/bug16069.phpt
+++ b/ext/iconv/tests/bug16069.phpt
@@ -7,9 +7,16 @@ if (@iconv('CP932', 'EUC-JP//TRANSLIT', "\x87\x6d")=='') {
 	die("skip  CP932 translit not available\n");
 }
 ?>
---POST--
---GET--
+--INI--
+error_reporting=2039
 --FILE--
-<?php include('bug16069.inc'); ?>
+<?php
+include('test.inc');
+/* charset=CP932, KOI8-R */
+$str = "\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d\x87\x6d";
+print iconv( "CP932", "EUC-JP//TRANSLIT", $str );
+$str = "(\x9c\xe4\x9c)";
+print iconv( "KOI8-R", "EUC-JP//TRANSLIT", $str );
+?>
 --EXPECT--
 ¥ß¥ê¥Ð¡¼¥ë¥ß¥ê¥Ð¡¼¥ë¥ß¥ê¥Ð¡¼¥ë¥ß¥ê¥Ð¡¼¥ë¥ß¥ê¥Ð¡¼¥ë¥ß¥ê¥Ð¡¼¥ë¥ß¥ê¥Ð¡¼¥ë¥ß¥ê¥Ð¡¼¥ë¥ß¥ê¥Ð¡¼¥ë¥ß¥ê¥Ð¡¼¥ë¥ß¥ê¥Ð¡¼¥ë¥ß¥ê¥Ð¡¼¥ë¥ß¥ê¥Ð¡¼¥ë¥ß¥ê¥Ð¡¼¥ë¥ß¥ê¥Ð¡¼¥ë¥ß¥ê¥Ð¡¼¥ë¥ß¥ê¥Ð¡¼¥ë¥ß¥ê¥Ð¡¼¥ë¥ß¥ê¥Ð¡¼¥ë¥ß¥ê¥Ð¡¼¥ë¥ß¥ê¥Ð¡¼¥ë¥ß¥ê¥Ð¡¼¥ë¥ß¥ê¥Ð¡¼¥ë¥ß¥ê¥Ð¡¼¥ë¥ß¥ê¥Ð¡¼¥ë¥ß¥ê¥Ð¡¼¥ë¥ß¥ê¥Ð¡¼¥ë¥ß¥ê¥Ð¡¼¥ë¥ß¥ê¥Ð¡¼¥ë¥ß¥ê¥Ð¡¼¥ë¥ß¥ê¥Ð¡¼¥ë¥ß¥ê¥Ð¡¼¥ë¥ß¥ê¥Ð¡¼¥ë¥ß¥ê¥Ð¡¼¥ë¥ß¥ê¥Ð¡¼¥ë¥ß¥ê¥Ð¡¼¥ë¥ß¥ê¥Ð¡¼¥ë¥ß¥ê¥Ð¡¼¥ë¥ß¥ê¥Ð¡¼¥ë¥ß¥ê¥Ð¡¼¥ë(¡ë§¥¡ë)
diff --git a/ext/iconv/tests/eucjp2iso2022jp.inc b/ext/iconv/tests/eucjp2iso2022jp.inc
deleted file mode 100644
index 3c3fc341e4..0000000000
--- a/ext/iconv/tests/eucjp2iso2022jp.inc
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-/* charset=EUC-JP */
-
-$str = "
-ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
-ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
-ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
-ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
-ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
-ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
-ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
-ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
-ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
-ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
-ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
-ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
-ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
-ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
-ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
-ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
-ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
-ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
-ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
-ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
-ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
-ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
-ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
-ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
-ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
-ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
-ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
-ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
-ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
-ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
-ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
-ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
-ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
-ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
-ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
-ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
-";
-
-$str = iconv("EUC-JP", "ISO-2022-JP", $str);
-$str = base64_encode($str);
-echo $str."\n";
-
-?>
diff --git a/ext/iconv/tests/eucjp2iso2022jp.phpt b/ext/iconv/tests/eucjp2iso2022jp.phpt
index 6b324ecf46..ae275fe1db 100644
--- a/ext/iconv/tests/eucjp2iso2022jp.phpt
+++ b/ext/iconv/tests/eucjp2iso2022jp.phpt
@@ -2,10 +2,57 @@
 EUC-JP to ISO-2022-JP
 --SKIPIF--
 <?php include('skipif.inc'); ?>
---POST--
---GET--
+--INI--
+error_reporting=2039
 --FILE--
-<?php include('eucjp2iso2022jp.inc'); ?>
+<?php
+include('test.inc');
+/* charset=EUC-JP */
+
+$str = "
+ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
+ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
+ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
+ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
+ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
+ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
+ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
+ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
+ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
+ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
+ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
+ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
+ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
+ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
+ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
+ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
+ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
+ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
+ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
+ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
+ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
+ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
+ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
+ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
+ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
+ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
+ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
+ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
+ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
+ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
+ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
+ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
+ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
+ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
+ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
+ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
+";
+
+$str = iconv("EUC-JP", "ISO-2022-JP", $str);
+$str = base64_encode($str);
+echo $str."\n";
+
+?>
 --EXPECT--
 ChskQkZ8S1w4bCVGJS0lOSVIJEgbKEJFbmdsaXNoIFRleHQKGyRCRnxLXDhsJUYlLSU5JUgkSBsoQkVuZ2xpc2ggVGV4dAobJEJGfEtcOGwlRiUtJTklSCRIGyhCRW5nbGlzaCBUZXh0ChskQkZ8S1w4bCVGJS0lOSVIJEgbKEJFbmdsaXNoIFRleHQKGyRCRnxLXDhsJUYlLSU5JUgkSBsoQkVuZ2xpc2ggVGV4dAobJEJGfEtcOGwlRiUtJTklSCRIGyhCRW5nbGlzaCBUZXh0ChskQkZ8S1w4bCVGJS0lOSVIJEgbKEJFbmdsaXNoIFRleHQKGyRCRnxLXDhsJUYlLSU5JUgkSBsoQkVuZ2xpc2ggVGV4dAobJEJGfEtcOGwlRiUtJTklSCRIGyhCRW5nbGlzaCBUZXh0ChskQkZ8S1w4bCVGJS0lOSVIJEgbKEJFbmdsaXNoIFRleHQKGyRCRnxLXDhsJUYlLSU5JUgkSBsoQkVuZ2xpc2ggVGV4dAobJEJGfEtcOGwlRiUtJTklSCRIGyhCRW5nbGlzaCBUZXh0ChskQkZ8S1w4bCVGJS0lOSVIJEgbKEJFbmdsaXNoIFRleHQKGyRCRnxLXDhsJUYlLSU5JUgkSBsoQkVuZ2xpc2ggVGV4dAobJEJGfEtcOGwlRiUtJTklSCRIGyhCRW5nbGlzaCBUZXh0ChskQkZ8S1w4bCVGJS0lOSVIJEgbKEJFbmdsaXNoIFRleHQKGyRCRnxLXDhsJUYlLSU5JUgkSBsoQkVuZ2xpc2ggVGV4dAobJEJGfEtcOGwlRiUtJTklSCRIGyhCRW5nbGlzaCBUZXh0ChskQkZ8S1w4bCVGJS0lOSVIJEgbKEJFbmdsaXNoIFRleHQKGyRCRnxLXDhsJUYlLSU5JUgkSBsoQkVuZ2xpc2ggVGV4dAobJEJGfEtcOGwlRiUtJTklSCRIGyhCRW5nbGlzaCBUZXh0ChskQkZ8S1w4bCVGJS0lOSVIJEgbKEJFbmdsaXNoIFRleHQKGyRCRnxLXDhsJUYlLSU5JUgkSBsoQkVuZ2xpc2ggVGV4dAobJEJGfEtcOGwlRiUtJTklSCRIGyhCRW5nbGlzaCBUZXh0ChskQkZ8S1w4bCVGJS0lOSVIJEgbKEJFbmdsaXNoIFRleHQKGyRCRnxLXDhsJUYlLSU5JUgkSBsoQkVuZ2xpc2ggVGV4dAobJEJGfEtcOGwlRiUtJTklSCRIGyhCRW5nbGlzaCBUZXh0ChskQkZ8S1w4bCVGJS0lOSVIJEgbKEJFbmdsaXNoIFRleHQKGyRCRnxLXDhsJUYlLSU5JUgkSBsoQkVuZ2xpc2ggVGV4dAobJEJGfEtcOGwlRiUtJTklSCRIGyhCRW5nbGlzaCBUZXh0ChskQkZ8S1w4bCVGJS0lOSVIJEgbKEJFbmdsaXNoIFRleHQKGyRCRnxLXDhsJUYlLSU5JUgkSBsoQkVuZ2xpc2ggVGV4dAobJEJGfEtcOGwlRiUtJTklSCRIGyhCRW5nbGlzaCBUZXh0ChskQkZ8S1w4bCVGJS0lOSVIJEgbKEJFbmdsaXNoIFRleHQKGyRCRnxLXDhsJUYlLSU5JUgkSBsoQkVuZ2xpc2ggVGV4dAobJEJGfEtcOGwlRiUtJTklSCRIGyhCRW5nbGlzaCBUZXh0Cg==
 
diff --git a/ext/iconv/tests/eucjp2sjis.inc b/ext/iconv/tests/eucjp2sjis.inc
deleted file mode 100644
index 568ed9d66d..0000000000
--- a/ext/iconv/tests/eucjp2sjis.inc
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-/* charset=EUC-JP */
-
-$str = "
-ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
-ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
-ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
-ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
-ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
-ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
-ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
-ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
-ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
-ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
-ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
-ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
-ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
-ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
-ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
-ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
-ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
-ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
-ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
-ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
-ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
-ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
-ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
-ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
-ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
-ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
-ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
-ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
-ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
-ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
-ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
-ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
-ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
-ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
-ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
-ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
-";
-
-$str = iconv("EUC-JP", "SJIS", $str);
-$str = base64_encode($str);
-echo $str."\n";
-
-?>
diff --git a/ext/iconv/tests/eucjp2sjis.phpt b/ext/iconv/tests/eucjp2sjis.phpt
index 1af3d7f9ca..90d791a791 100644
--- a/ext/iconv/tests/eucjp2sjis.phpt
+++ b/ext/iconv/tests/eucjp2sjis.phpt
@@ -2,10 +2,57 @@
 EUC-JP to SJIS
 --SKIPIF--
 <?php include('skipif.inc'); ?>
---POST--
---GET--
+--INI--
+error_reporting=2039
 --FILE--
-<?php include('eucjp2sjis.inc'); ?>
+<?php
+include('test.inc');
+/* charset=EUC-JP */
+
+$str = "
+ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
+ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
+ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
+ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
+ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
+ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
+ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
+ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
+ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
+ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
+ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
+ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
+ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
+ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
+ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
+ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
+ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
+ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
+ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
+ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
+ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
+ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
+ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
+ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
+ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
+ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
+ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
+ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
+ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
+ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
+ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
+ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
+ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
+ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
+ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
+ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
+";
+
+$str = iconv("EUC-JP", "SJIS", $str);
+$str = base64_encode($str);
+echo $str."\n";
+
+?>
 --EXPECT--
 CpP6lnuM6oNlg0yDWINngsZFbmdsaXNoIFRleHQKk/qWe4zqg2WDTINYg2eCxkVuZ2xpc2ggVGV4dAqT+pZ7jOqDZYNMg1iDZ4LGRW5nbGlzaCBUZXh0CpP6lnuM6oNlg0yDWINngsZFbmdsaXNoIFRleHQKk/qWe4zqg2WDTINYg2eCxkVuZ2xpc2ggVGV4dAqT+pZ7jOqDZYNMg1iDZ4LGRW5nbGlzaCBUZXh0CpP6lnuM6oNlg0yDWINngsZFbmdsaXNoIFRleHQKk/qWe4zqg2WDTINYg2eCxkVuZ2xpc2ggVGV4dAqT+pZ7jOqDZYNMg1iDZ4LGRW5nbGlzaCBUZXh0CpP6lnuM6oNlg0yDWINngsZFbmdsaXNoIFRleHQKk/qWe4zqg2WDTINYg2eCxkVuZ2xpc2ggVGV4dAqT+pZ7jOqDZYNMg1iDZ4LGRW5nbGlzaCBUZXh0CpP6lnuM6oNlg0yDWINngsZFbmdsaXNoIFRleHQKk/qWe4zqg2WDTINYg2eCxkVuZ2xpc2ggVGV4dAqT+pZ7jOqDZYNMg1iDZ4LGRW5nbGlzaCBUZXh0CpP6lnuM6oNlg0yDWINngsZFbmdsaXNoIFRleHQKk/qWe4zqg2WDTINYg2eCxkVuZ2xpc2ggVGV4dAqT+pZ7jOqDZYNMg1iDZ4LGRW5nbGlzaCBUZXh0CpP6lnuM6oNlg0yDWINngsZFbmdsaXNoIFRleHQKk/qWe4zqg2WDTINYg2eCxkVuZ2xpc2ggVGV4dAqT+pZ7jOqDZYNMg1iDZ4LGRW5nbGlzaCBUZXh0CpP6lnuM6oNlg0yDWINngsZFbmdsaXNoIFRleHQKk/qWe4zqg2WDTINYg2eCxkVuZ2xpc2ggVGV4dAqT+pZ7jOqDZYNMg1iDZ4LGRW5nbGlzaCBUZXh0CpP6lnuM6oNlg0yDWINngsZFbmdsaXNoIFRleHQKk/qWe4zqg2WDTINYg2eCxkVuZ2xpc2ggVGV4dAqT+pZ7jOqDZYNMg1iDZ4LGRW5nbGlzaCBUZXh0CpP6lnuM6oNlg0yDWINngsZFbmdsaXNoIFRleHQKk/qWe4zqg2WDTINYg2eCxkVuZ2xpc2ggVGV4dAqT+pZ7jOqDZYNMg1iDZ4LGRW5nbGlzaCBUZXh0CpP6lnuM6oNlg0yDWINngsZFbmdsaXNoIFRleHQKk/qWe4zqg2WDTINYg2eCxkVuZ2xpc2ggVGV4dAqT+pZ7jOqDZYNMg1iDZ4LGRW5nbGlzaCBUZXh0CpP6lnuM6oNlg0yDWINngsZFbmdsaXNoIFRleHQKk/qWe4zqg2WDTINYg2eCxkVuZ2xpc2ggVGV4dAqT+pZ7jOqDZYNMg1iDZ4LGRW5nbGlzaCBUZXh0Cg==
 
diff --git a/ext/iconv/tests/eucjp2utf8.inc b/ext/iconv/tests/eucjp2utf8.inc
deleted file mode 100644
index 030d3aab57..0000000000
--- a/ext/iconv/tests/eucjp2utf8.inc
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-/* charset=EUC-JP */
-
-$str = "
-ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
-ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
-ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
-ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
-ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
-ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
-ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
-ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
-ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
-ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
-ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
-ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
-ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
-ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
-ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
-ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
-ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
-ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
-ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
-ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
-ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
-ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
-ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
-ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
-ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
-ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
-ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
-ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
-ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
-ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
-ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
-ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
-ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
-ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
-ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
-ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
-";
-
-$str = iconv("EUC-JP", "UTF-8", $str); /* libiconv(1.8) doesn't know "UTF8" but "UTF-8". */ 
-$str = base64_encode($str);
-echo $str."\n";
-
-?>
diff --git a/ext/iconv/tests/eucjp2utf8.phpt b/ext/iconv/tests/eucjp2utf8.phpt
index 92ae50a146..00fa454572 100644
--- a/ext/iconv/tests/eucjp2utf8.phpt
+++ b/ext/iconv/tests/eucjp2utf8.phpt
@@ -2,10 +2,57 @@
 EUC-JP to UTF8
 --SKIPIF--
 <?php include('skipif.inc');?>
---POST--
---GET--
+--INI--
+error_reporting=2039
 --FILE--
-<?php include('eucjp2utf8.inc'); ?>
+<?php
+include('test.inc');
+/* charset=EUC-JP */
+
+$str = "
+ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
+ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
+ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
+ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
+ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
+ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
+ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
+ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
+ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
+ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
+ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
+ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
+ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
+ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
+ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
+ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
+ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
+ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
+ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
+ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
+ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
+ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
+ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
+ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
+ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
+ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
+ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
+ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
+ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
+ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
+ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
+ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
+ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
+ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
+ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
+ÆüËܸì¥Æ¥­¥¹¥È¤ÈEnglish Text
+";
+
+$str = iconv("EUC-JP", "UTF-8", $str); /* libiconv(1.8) doesn't know "UTF8" but "UTF-8". */ 
+$str = base64_encode($str);
+echo $str."\n";
+
+?>
 --EXPECT--
 CuaXpeacrOiqnuODhuOCreOCueODiOOBqEVuZ2xpc2ggVGV4dArml6XmnKzoqp7jg4bjgq3jgrnjg4jjgahFbmdsaXNoIFRleHQK5pel5pys6Kqe44OG44Kt44K544OI44GoRW5nbGlzaCBUZXh0CuaXpeacrOiqnuODhuOCreOCueODiOOBqEVuZ2xpc2ggVGV4dArml6XmnKzoqp7jg4bjgq3jgrnjg4jjgahFbmdsaXNoIFRleHQK5pel5pys6Kqe44OG44Kt44K544OI44GoRW5nbGlzaCBUZXh0CuaXpeacrOiqnuODhuOCreOCueODiOOBqEVuZ2xpc2ggVGV4dArml6XmnKzoqp7jg4bjgq3jgrnjg4jjgahFbmdsaXNoIFRleHQK5pel5pys6Kqe44OG44Kt44K544OI44GoRW5nbGlzaCBUZXh0CuaXpeacrOiqnuODhuOCreOCueODiOOBqEVuZ2xpc2ggVGV4dArml6XmnKzoqp7jg4bjgq3jgrnjg4jjgahFbmdsaXNoIFRleHQK5pel5pys6Kqe44OG44Kt44K544OI44GoRW5nbGlzaCBUZXh0CuaXpeacrOiqnuODhuOCreOCueODiOOBqEVuZ2xpc2ggVGV4dArml6XmnKzoqp7jg4bjgq3jgrnjg4jjgahFbmdsaXNoIFRleHQK5pel5pys6Kqe44OG44Kt44K544OI44GoRW5nbGlzaCBUZXh0CuaXpeacrOiqnuODhuOCreOCueODiOOBqEVuZ2xpc2ggVGV4dArml6XmnKzoqp7jg4bjgq3jgrnjg4jjgahFbmdsaXNoIFRleHQK5pel5pys6Kqe44OG44Kt44K544OI44GoRW5nbGlzaCBUZXh0CuaXpeacrOiqnuODhuOCreOCueODiOOBqEVuZ2xpc2ggVGV4dArml6XmnKzoqp7jg4bjgq3jgrnjg4jjgahFbmdsaXNoIFRleHQK5pel5pys6Kqe44OG44Kt44K544OI44GoRW5nbGlzaCBUZXh0CuaXpeacrOiqnuODhuOCreOCueODiOOBqEVuZ2xpc2ggVGV4dArml6XmnKzoqp7jg4bjgq3jgrnjg4jjgahFbmdsaXNoIFRleHQK5pel5pys6Kqe44OG44Kt44K544OI44GoRW5nbGlzaCBUZXh0CuaXpeacrOiqnuODhuOCreOCueODiOOBqEVuZ2xpc2ggVGV4dArml6XmnKzoqp7jg4bjgq3jgrnjg4jjgahFbmdsaXNoIFRleHQK5pel5pys6Kqe44OG44Kt44K544OI44GoRW5nbGlzaCBUZXh0CuaXpeacrOiqnuODhuOCreOCueODiOOBqEVuZ2xpc2ggVGV4dArml6XmnKzoqp7jg4bjgq3jgrnjg4jjgahFbmdsaXNoIFRleHQK5pel5pys6Kqe44OG44Kt44K544OI44GoRW5nbGlzaCBUZXh0CuaXpeacrOiqnuODhuOCreOCueODiOOBqEVuZ2xpc2ggVGV4dArml6XmnKzoqp7jg4bjgq3jgrnjg4jjgahFbmdsaXNoIFRleHQK5pel5pys6Kqe44OG44Kt44K544OI44GoRW5nbGlzaCBUZXh0CuaXpeacrOiqnuODhuOCreOCueODiOOBqEVuZ2xpc2ggVGV4dArml6XmnKzoqp7jg4bjgq3jgrnjg4jjgahFbmdsaXNoIFRleHQK5pel5pys6Kqe44OG44Kt44K544OI44GoRW5nbGlzaCBUZXh0Cg==
 
diff --git a/ext/iconv/tests/iconv001.phpt b/ext/iconv/tests/iconv001.phpt
index fde6553856..ae0329397b 100644
--- a/ext/iconv/tests/iconv001.phpt
+++ b/ext/iconv/tests/iconv001.phpt
@@ -2,10 +2,11 @@
 iconv test
 --SKIPIF--
 <?php include('skipif.inc'); ?>
---POST--
---GET--
+--INI--
+error_reporting=2039
 --FILE--
 <?php
+include('test.inc');
 echo "iconv extension is available\n";
 $test = "æøå";
 var_dump("ISO-8859-1: $test");
diff --git a/ext/iconv/tests/iconv002.inc b/ext/iconv/tests/iconv002.inc
deleted file mode 100644
index f7ae53d4bd..0000000000
--- a/ext/iconv/tests/iconv002.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-/*
-Expected output:
-&#97;&#98;&#99;&#100;
-abcd
-*/
-
-   $s = unpack("V*", iconv("ascii","UCS-4LE", "abcd"));
-   foreach($s as $c) { print "&#$c;"; } print "\n";
-
-   $s = pack("NNNN", 97, 98, 99, 100);
-   $q = iconv("UCS-4BE", "ascii", $s);
-   print $q; print "\n";
-?>
diff --git a/ext/iconv/tests/iconv002.phpt b/ext/iconv/tests/iconv002.phpt
index 4333a0fb67..f5015800bc 100644
--- a/ext/iconv/tests/iconv002.phpt
+++ b/ext/iconv/tests/iconv002.phpt
@@ -2,8 +2,24 @@
 UCS4BE to ASCII
 --SKIPIF--
 <?php include('skipif.inc'); ?>
+--INI--
+error_reporting=2039
 --FILE--
-<?php include('iconv002.inc'); ?>
+<?php
+include('test.inc');
+/*
+Expected output:
+&#97;&#98;&#99;&#100;
+abcd
+*/
+
+   $s = unpack("V*", iconv("ascii","UCS-4LE", "abcd"));
+   foreach($s as $c) { print "&#$c;"; } print "\n";
+
+   $s = pack("NNNN", 97, 98, 99, 100);
+   $q = iconv("UCS-4BE", "ascii", $s);
+   print $q; print "\n";
+?>
 --EXPECT--
 &#97;&#98;&#99;&#100;
 abcd
diff --git a/ext/iconv/tests/ob_iconv_handler.phpt b/ext/iconv/tests/ob_iconv_handler.phpt
index d3dc59f3c8..4055e95ea6 100644
--- a/ext/iconv/tests/ob_iconv_handler.phpt
+++ b/ext/iconv/tests/ob_iconv_handler.phpt
@@ -2,8 +2,11 @@
 ob_output_handler
 --SKIPIF--
 <?php include('skipif.inc'); ?>
+--INI--
+error_reporting=2039
 --FILE--
 <?php
+include('test.inc');
 iconv_set_encoding('internal_encoding', 'EUC-JP');
 iconv_set_encoding('output_encoding', 'Shift_JIS');
 ob_start('ob_iconv_handler');
diff --git a/ext/iconv/tests/skipif.inc b/ext/iconv/tests/skipif.inc
index 4fea1b0d43..dcfd0e2ca1 100644
--- a/ext/iconv/tests/skipif.inc
+++ b/ext/iconv/tests/skipif.inc
@@ -6,6 +6,6 @@ if (!extension_loaded("iconv") && ini_get("enable_dl")) {
   @dl("iconv$dlext");
 }
 if (!extension_loaded("iconv")) {
-    die("skip\n");
+    die("skip iconv extension not available\n");
 }
 ?>
\ No newline at end of file
diff --git a/ext/iconv/tests/test.inc b/ext/iconv/tests/test.inc
new file mode 100644
index 0000000000..360c309632
--- /dev/null
+++ b/ext/iconv/tests/test.inc
@@ -0,0 +1,8 @@
+<?php
+// This script prints "skip" if condition does not meet.
+
+if (!extension_loaded("iconv") && ini_get("enable_dl")) {
+  $dlext = (substr(PHP_OS, 0, 3) == "WIN") ? ".dll" : ".so";
+  @dl("iconv$dlext");
+}
+?>
\ No newline at end of file
diff --git a/ext/iconv/tests/translit-failure.phpt b/ext/iconv/tests/translit-failure.phpt
index 2bd4a61b01..ef3f5f059a 100644
--- a/ext/iconv/tests/translit-failure.phpt
+++ b/ext/iconv/tests/translit-failure.phpt
@@ -5,8 +5,11 @@ Translit failure
 include('skipif.inc');
 ( ICONV_IMPL != "libiconv" ) and die("skip ICONV_IMPL != \"libiconv\""); 
 ?>
+--INI--
+error_reporting=2039
 --FILE--
 <?php
+include('test.inc');
 // Should be ok.
 // Content from file is from libiconv testkit. Tested both
 // with a string as an implode, no difference.
diff --git a/ext/iconv/tests/translit-utf8.inc b/ext/iconv/tests/translit-utf8.inc
deleted file mode 100644
index e0e191aa12..0000000000
--- a/ext/iconv/tests/translit-utf8.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php // vim600: syn=php
-error_reporting(E_ALL);
-$utf = implode('', file('ext/iconv/tests/Quotes.UTF-8'));
-
-print(iconv("UTF-8", "ISO-8859-1//TRANSLIT", $utf));
-print(iconv("UTF-8", "ASCII//TRANSLIT", $utf));
-?>
diff --git a/ext/iconv/tests/translit-utf8.phpt b/ext/iconv/tests/translit-utf8.phpt
index bd9903413e..fd6452bf96 100644
--- a/ext/iconv/tests/translit-utf8.phpt
+++ b/ext/iconv/tests/translit-utf8.phpt
@@ -5,8 +5,17 @@ Translit UTF-8 quotes
 include('skipif.inc');
 ( ICONV_IMPL != "libiconv" ) and die("skip ICONV_IMPL != \"libiconv\""); 
 ?>
+--INI--
+error_reporting=2047
 --FILE--
-<?php include('translit-utf8.inc'); ?>
+<?php // vim600: syn=php
+include('test.inc');
+//error_reporting(E_ALL);
+$utf = implode('', file('ext/iconv/tests/Quotes.UTF-8'));
+
+print(iconv("UTF-8", "ISO-8859-1//TRANSLIT", $utf));
+print(iconv("UTF-8", "ASCII//TRANSLIT", $utf));
+?>
 --EXPECT--
 "Hello"
 `Hello´