cvs: php4 /ext/iconv/tests 001.phpt bug16069.phpt translit-failure.phpt translit-utf8.phpt
| From: | Moriyoshi Koizumi | Date: | Mon, 21 Oct 2002 10:35:04 +0000 |
| Subject: | cvs: php4 /ext/iconv/tests 001.phpt bug16069.phpt translit-failure.phpt translit-utf8.phpt | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-15101@lists.php.net to get a copy of this message | ||
moriyoshi Mon Oct 21 06:35:04 2002 EDT
Modified files:
/php4/ext/iconv/tests 001.phpt bug16069.phpt translit-failure.phpt
translit-utf8.phpt
Log:
Let them say why they are skipped
Index: php4/ext/iconv/tests/001.phpt
diff -u php4/ext/iconv/tests/001.phpt:1.4 php4/ext/iconv/tests/001.phpt:1.5
--- php4/ext/iconv/tests/001.phpt:1.4 Sat Feb 2 21:18:30 2002
+++ php4/ext/iconv/tests/001.phpt Mon Oct 21 06:35:02 2002
@@ -8,11 +8,10 @@
<?php
echo "iconv extension is available\n";
$test = "æøå";
-printf("ISO-8859-1: %s\nUTF-8: %s\n",
- $test, iconv("ISO-8859-1", "UTF-8", $test));
-
+var_dump("ISO-8859-1: $test");
+var_dump("UTF-8: ".iconv( "ISO-8859-1", "UTF-8", $test ) );
?>
--EXPECT--
iconv extension is available
-ISO-8859-1: æøå
-UTF-8: æøå
+string(15) "ISO-8859-1: æøå"
+string(13) "UTF-8: æøå"
Index: php4/ext/iconv/tests/bug16069.phpt
diff -u php4/ext/iconv/tests/bug16069.phpt:1.1 php4/ext/iconv/tests/bug16069.phpt:1.2
--- php4/ext/iconv/tests/bug16069.phpt:1.1 Wed Oct 9 16:30:30 2002
+++ php4/ext/iconv/tests/bug16069.phpt Mon Oct 21 06:35:02 2002
@@ -1,7 +1,12 @@
--TEST--
Bug #16069
--SKIPIF--
-<?php include( 'skipif.inc' ); if( @iconv('CP932',
'EUC-JP//TRANSLIT', "\x87\x6d") == '' ) die("skip\n"); ?>
+<?php
+include( 'skipif.inc' );
+if (@iconv('CP932', 'EUC-JP//TRANSLIT', "\x87\x6d")=='') {
+ die("skip CP932 translit not available\n");
+}
+?>
--POST--
--GET--
--FILE--
Index: php4/ext/iconv/tests/translit-failure.phpt
diff -u php4/ext/iconv/tests/translit-failure.phpt:1.5
php4/ext/iconv/tests/translit-failure.phpt:1.6
--- php4/ext/iconv/tests/translit-failure.phpt:1.5 Mon Oct 14 19:09:48 2002
+++ php4/ext/iconv/tests/translit-failure.phpt Mon Oct 21 06:35:02 2002
@@ -3,7 +3,7 @@
--SKIPIF--
<?php
include('skipif.inc');
-( ICONV_IMPL != "libiconv" ) and die("skip");
+( ICONV_IMPL != "libiconv" ) and die("skip ICONV_IMPL !=
\"libiconv\"");
?>
--FILE--
<?php
@@ -15,7 +15,7 @@
set_time_limit(5);
/*
- * The bug (fixed in libiconv 1.8) was confirmed that iconv goes into a
+ * The bug (fixed in libiconv 1.8) was confirmed that iconv goes into an
* infinite loop when ASCII//TRANSLIT is performed. We should stop it in
* some time.
*/
Index: php4/ext/iconv/tests/translit-utf8.phpt
diff -u php4/ext/iconv/tests/translit-utf8.phpt:1.3 php4/ext/iconv/tests/translit-utf8.phpt:1.4
--- php4/ext/iconv/tests/translit-utf8.phpt:1.3 Fri Oct 11 14:07:47 2002
+++ php4/ext/iconv/tests/translit-utf8.phpt Mon Oct 21 06:35:02 2002
@@ -3,7 +3,7 @@
--SKIPIF--
<?php
include('skipif.inc');
-( ICONV_IMPL != "libiconv" ) and die("skip");
+( ICONV_IMPL != "libiconv" ) and die("skip ICONV_IMPL !=
\"libiconv\"");
?>
--FILE--
<?php include('translit-utf8.inc'); ?>