From: foobar <sniper@php.net>
Date: Mon, 10 Apr 2006 14:59:33 +0000 (+0000)
Subject: cleanup
X-Git-Tag: RELEASE_1_3~105
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b42a8b2f3161b14d44188403d1a0cbedf3a97079;p=php

cleanup
---

diff --git a/ext/iconv/tests/bug16069.phpt b/ext/iconv/tests/bug16069.phpt
index 246b90c6cd..3fe5159e47 100644
--- 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 9eb6944f01..3adacaf3db 100644
--- 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 80c07636c8..4e0e52db88 100644
--- 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 2b74516ce9..b75cd83a3e 100644
--- 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 0402f371a1..a0c201087c 100644
--- 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 034b3761fa..0b5ca4843c 100644
--- 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 43beada2fb..16871cd365 100644
--- 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
index 78f180462f..0000000000
--- 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 d8b9fbff83..132966928d 100644
--- 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 0151dc385c..650c02c694 100644
--- 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'));