moriyoshi Tue Oct 29 11:25:24 2002 EDT
Modified files:
/php4/ext/iconv/tests bug16069.phpt eucjp2iso2022jp.phpt
eucjp2sjis.phpt eucjp2utf8.phpt iconv001.phpt
iconv002.phpt ob_iconv_handler.phpt
translit-failure.phpt translit-utf8.phpt
Log:
Removed dl() stuff
Index: php4/ext/iconv/tests/bug16069.phpt
diff -u php4/ext/iconv/tests/bug16069.phpt:1.3 php4/ext/iconv/tests/bug16069.phpt:1.4
--- php4/ext/iconv/tests/bug16069.phpt:1.3 Mon Oct 28 12:15:21 2002
+++ php4/ext/iconv/tests/bug16069.phpt Tue Oct 29 11:25:23 2002
@@ -2,7 +2,7 @@
Bug #16069
--SKIPIF--
<?php
-include( 'skipif.inc' );
+/* include( 'skipif.inc' ); */
if (@iconv('CP932', 'EUC-JP//TRANSLIT', "\x87\x6d")=='') {
die("skip CP932 translit not available\n");
}
@@ -11,7 +11,7 @@
error_reporting=2039
--FILE--
<?php
-include('test.inc');
+/* 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 );
Index: php4/ext/iconv/tests/eucjp2iso2022jp.phpt
diff -u php4/ext/iconv/tests/eucjp2iso2022jp.phpt:1.3
php4/ext/iconv/tests/eucjp2iso2022jp.phpt:1.4
--- php4/ext/iconv/tests/eucjp2iso2022jp.phpt:1.3 Mon Oct 28 12:15:21 2002
+++ php4/ext/iconv/tests/eucjp2iso2022jp.phpt Tue Oct 29 11:25:23 2002
@@ -1,12 +1,12 @@
--TEST--
EUC-JP to ISO-2022-JP
--SKIPIF--
-<?php include('skipif.inc'); ?>
+<?php /* include('skipif.inc'); */ ?>
--INI--
error_reporting=2039
--FILE--
<?php
-include('test.inc');
+/* include('test.inc'); */
/* charset=EUC-JP */
$str = "
Index: php4/ext/iconv/tests/eucjp2sjis.phpt
diff -u php4/ext/iconv/tests/eucjp2sjis.phpt:1.2
php4/ext/iconv/tests/eucjp2sjis.phpt:1.3
--- php4/ext/iconv/tests/eucjp2sjis.phpt:1.2 Mon Oct 28 12:15:21 2002
+++ php4/ext/iconv/tests/eucjp2sjis.phpt Tue Oct 29 11:25:23 2002
@@ -1,12 +1,12 @@
--TEST--
EUC-JP to SJIS
--SKIPIF--
-<?php include('skipif.inc'); ?>
+<?php /* include('skipif.inc'); */ ?>
--INI--
error_reporting=2039
--FILE--
<?php
-include('test.inc');
+/* include('test.inc'); */
/* charset=EUC-JP */
$str = "
Index: php4/ext/iconv/tests/eucjp2utf8.phpt
diff -u php4/ext/iconv/tests/eucjp2utf8.phpt:1.6
php4/ext/iconv/tests/eucjp2utf8.phpt:1.7
--- php4/ext/iconv/tests/eucjp2utf8.phpt:1.6 Mon Oct 28 12:15:21 2002
+++ php4/ext/iconv/tests/eucjp2utf8.phpt Tue Oct 29 11:25:23 2002
@@ -1,12 +1,12 @@
--TEST--
EUC-JP to UTF8
--SKIPIF--
-<?php include('skipif.inc');?>
+<?php /* include('skipif.inc'); */ ?>
--INI--
error_reporting=2039
--FILE--
<?php
-include('test.inc');
+/* include('test.inc'); */
/* charset=EUC-JP */
$str = "
Index: php4/ext/iconv/tests/iconv001.phpt
diff -u php4/ext/iconv/tests/iconv001.phpt:1.2 php4/ext/iconv/tests/iconv001.phpt:1.3
--- php4/ext/iconv/tests/iconv001.phpt:1.2 Mon Oct 28 12:15:21 2002
+++ php4/ext/iconv/tests/iconv001.phpt Tue Oct 29 11:25:23 2002
@@ -1,12 +1,12 @@
--TEST--
iconv test
--SKIPIF--
-<?php include('skipif.inc'); ?>
+<?php /* include('skipif.inc'); */ ?>
--INI--
error_reporting=2039
--FILE--
<?php
-include('test.inc');
+/* include('test.inc'); */
echo "iconv extension is available\n";
$test = "���";
var_dump("ISO-8859-1: $test");
Index: php4/ext/iconv/tests/iconv002.phpt
diff -u php4/ext/iconv/tests/iconv002.phpt:1.2 php4/ext/iconv/tests/iconv002.phpt:1.3
--- php4/ext/iconv/tests/iconv002.phpt:1.2 Mon Oct 28 12:15:21 2002
+++ php4/ext/iconv/tests/iconv002.phpt Tue Oct 29 11:25:23 2002
@@ -1,12 +1,12 @@
--TEST--
UCS4BE to ASCII
--SKIPIF--
-<?php include('skipif.inc'); ?>
+<?php /* include('skipif.inc'); */ ?>
--INI--
error_reporting=2039
--FILE--
<?php
-include('test.inc');
+/* include('test.inc'); */
/*
Expected output:
abcd
Index: php4/ext/iconv/tests/ob_iconv_handler.phpt
diff -u php4/ext/iconv/tests/ob_iconv_handler.phpt:1.2
php4/ext/iconv/tests/ob_iconv_handler.phpt:1.3
--- php4/ext/iconv/tests/ob_iconv_handler.phpt:1.2 Mon Oct 28 12:15:21 2002
+++ php4/ext/iconv/tests/ob_iconv_handler.phpt Tue Oct 29 11:25:23 2002
@@ -1,12 +1,12 @@
--TEST--
ob_output_handler
--SKIPIF--
-<?php include('skipif.inc'); ?>
+<?php /* include('skipif.inc'); */ ?>
--INI--
error_reporting=2039
--FILE--
<?php
-include('test.inc');
+/* include('test.inc'); */
iconv_set_encoding('internal_encoding', 'EUC-JP');
iconv_set_encoding('output_encoding', 'Shift_JIS');
ob_start('ob_iconv_handler');
Index: php4/ext/iconv/tests/translit-failure.phpt
diff -u php4/ext/iconv/tests/translit-failure.phpt:1.7
php4/ext/iconv/tests/translit-failure.phpt:1.8
--- php4/ext/iconv/tests/translit-failure.phpt:1.7 Mon Oct 28 12:15:21 2002
+++ php4/ext/iconv/tests/translit-failure.phpt Tue Oct 29 11:25:23 2002
@@ -2,14 +2,14 @@
Translit failure
--SKIPIF--
<?php
-include('skipif.inc');
+/* include('skipif.inc'); */
( ICONV_IMPL != "libiconv" ) and die("skip ICONV_IMPL != \"libiconv\"");
?>
--INI--
error_reporting=2039
--FILE--
<?php
-include('test.inc');
+/* include('test.inc'); */
// Should be ok.
// Content from file is from libiconv testkit. Tested both
// with a string as an implode, no difference.
Index: php4/ext/iconv/tests/translit-utf8.phpt
diff -u php4/ext/iconv/tests/translit-utf8.phpt:1.5
php4/ext/iconv/tests/translit-utf8.phpt:1.6
--- php4/ext/iconv/tests/translit-utf8.phpt:1.5 Mon Oct 28 12:15:21 2002
+++ php4/ext/iconv/tests/translit-utf8.phpt Tue Oct 29 11:25:23 2002
@@ -2,14 +2,14 @@
Translit UTF-8 quotes
--SKIPIF--
<?php
-include('skipif.inc');
+/* include('skipif.inc'); */
( ICONV_IMPL != "libiconv" ) and die("skip ICONV_IMPL != \"libiconv\"");
?>
--INI--
error_reporting=2047
--FILE--
<?php // vim600: syn=php
-include('test.inc');
+/* include('test.inc'); */
//error_reporting(E_ALL);
$utf = implode('', file('ext/iconv/tests/Quotes.UTF-8'));
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
