cleanup

diff --git a/ext/iconv/tests/bug16069.phpt b/ext/iconv/tests/bug16069.phpt
index 246b90c6cd306adbe7e82d231c90337b020f51f5..3fe5159e4772a3b87b986bebf9f5a9f613c7fc65 100644 (file)
--- a/ext/iconv/tests/bug16069.phpt
+++ b/ext/iconv/tests/bug16069.phpt
@@ -11,7 +11,6 @@ if (@iconv('CP932', 'EUC-JP//TRANSLIT', "\x87\x6d")=='') {
 error_reporting=2039
 --FILE--
 <?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 );

diff --git a/ext/iconv/tests/eucjp2iso2022jp.phpt b/ext/iconv/tests/eucjp2iso2022jp.phpt
index 9eb6944f01b8c3c5cfb2f9ec9260e08251faf0d3..3adacaf3db5568672b5a07875f867f50444d386f 100644 (file)
--- a/ext/iconv/tests/eucjp2iso2022jp.phpt
+++ b/ext/iconv/tests/eucjp2iso2022jp.phpt
@@ -8,7 +8,6 @@ unicode.script_encoding=ISO-8859-1
 unicode.output_encoding=ISO-8859-1
 --FILE--
 <?php
-/* include('test.inc'); */
 /* charset=EUC-JP */
 
 function hexdump($str) {

diff --git a/ext/iconv/tests/eucjp2sjis.phpt b/ext/iconv/tests/eucjp2sjis.phpt
index 80c07636c81cee9089a2a234573bf0653627d5c7..4e0e52db88897354c46643d88d912eee8bb91ca9 100644 (file)
--- a/ext/iconv/tests/eucjp2sjis.phpt
+++ b/ext/iconv/tests/eucjp2sjis.phpt
@@ -8,7 +8,6 @@ unicode.script_encoding=ISO-8859-1
 unicode.output_encoding=ISO-8859-1
 --FILE--
 <?php
-/* include('test.inc'); */
 /* charset=EUC-JP */
 
 $str = "

diff --git a/ext/iconv/tests/eucjp2utf8.phpt b/ext/iconv/tests/eucjp2utf8.phpt
index 2b74516ce9a154510f66afa50be8bf8606885085..b75cd83a3e998461caf60cc1035c134823a88a86 100644 (file)
--- a/ext/iconv/tests/eucjp2utf8.phpt
+++ b/ext/iconv/tests/eucjp2utf8.phpt
@@ -8,7 +8,6 @@ unicode.script_encoding=ISO-8859-1
 unicode.output_encoding=ISO-8859-1
 --FILE--
 <?php
-/* include('test.inc'); */
 /* charset=EUC-JP */
 
 $str = "

diff --git a/ext/iconv/tests/iconv001.phpt b/ext/iconv/tests/iconv001.phpt
index 0402f371a126ba027edd37106881fa6181536303..a0c201087c147be14df4964d8be9cd33bf6a18da 100644 (file)
--- a/ext/iconv/tests/iconv001.phpt
+++ b/ext/iconv/tests/iconv001.phpt
@@ -8,7 +8,6 @@ unicode.output_encoding=ISO-8859-1
 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.phpt b/ext/iconv/tests/iconv002.phpt
index 034b3761faf7970dfcc8ddf82a566b75a1de8194..0b5ca4843cbeea538a254b0ceb1ac1c814387c57 100644 (file)
--- a/ext/iconv/tests/iconv002.phpt
+++ b/ext/iconv/tests/iconv002.phpt
@@ -11,7 +11,6 @@ if (@iconv("ascii","UCS-4LE", "abcd") == '') {
 error_reporting=2039
 --FILE--
 <?php
-/* include('test.inc'); */
 /*
 Expected output:
 &#97;&#98;&#99;&#100;

diff --git a/ext/iconv/tests/ob_iconv_handler.phpt b/ext/iconv/tests/ob_iconv_handler.phpt
index 43beada2fbb047371b6696116b41509b3fa15458..16871cd365a6df80142e3d8357d20692e5305232 100644 (file)
--- a/ext/iconv/tests/ob_iconv_handler.phpt
+++ b/ext/iconv/tests/ob_iconv_handler.phpt
@@ -8,7 +8,6 @@ unicode.output_encoding=ISO-8859-1
 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/test.inc b/ext/iconv/tests/test.inc
deleted file mode 100644 (file)
index 78f1804..0000000
--- a/ext/iconv/tests/test.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-// Do not dl load extension
-//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 d8b9fbff839b09d578b2244322566cbdcfa15b98..132966928db91bb9ecba821f4885ab55374eb822 100644 (file)
--- a/ext/iconv/tests/translit-failure.phpt
+++ b/ext/iconv/tests/translit-failure.phpt
@@ -3,13 +3,12 @@ Translit failure
 --SKIPIF--
 <?php
 include('skipif.inc');
-( ICONV_IMPL != "libiconv" ) and die("skip ICONV_IMPL != \"libiconv\""); 
+(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.phpt b/ext/iconv/tests/translit-utf8.phpt
index 0151dc385c3701de4f4c206b73b00d54275788d5..650c02c694922f2a56742848f2ef71b44695a621 100644 (file)
--- a/ext/iconv/tests/translit-utf8.phpt
+++ b/ext/iconv/tests/translit-utf8.phpt
@@ -3,13 +3,12 @@ Translit UTF-8 quotes
 --SKIPIF--
 <?php
 include('skipif.inc');
-( ICONV_IMPL != "libiconv" ) and die("skip ICONV_IMPL != \"libiconv\""); 
+(ICONV_IMPL != "libiconv") and die("skip ICONV_IMPL != \"libiconv\""); 
 ?>
 --INI--
 error_reporting=2047
 --FILE--
 <?php // vim600: syn=php
-/* include('test.inc'); */
 //error_reporting(E_ALL);
 $utf = implode('', file(dirname(__FILE__).'/Quotes.UTF-8'));