diff options
| author | Moriyoshi Koizumi <moriyoshi@php.net> | 2002-10-21 10:35:02 +0000 |
|---|---|---|
| committer | Moriyoshi Koizumi <moriyoshi@php.net> | 2002-10-21 10:35:02 +0000 |
| commit | d953754d74e1a6a84daa01f12fcc336de5f4d6a8 (patch) | |
| tree | bc6adf61c6852c6c6e4762bc7f8d8c0b60759ff8 | |
| parent | a26a849bb3dbd85f19f12d5bd074f35ce2070b25 (diff) | |
| download | php-git-d953754d74e1a6a84daa01f12fcc336de5f4d6a8.tar.gz | |
Let them say why they are skipped
| -rw-r--r-- | ext/iconv/tests/001.phpt | 9 | ||||
| -rw-r--r-- | ext/iconv/tests/bug16069.phpt | 7 | ||||
| -rw-r--r-- | ext/iconv/tests/translit-failure.phpt | 4 | ||||
| -rw-r--r-- | ext/iconv/tests/translit-utf8.phpt | 2 |
4 files changed, 13 insertions, 9 deletions
diff --git a/ext/iconv/tests/001.phpt b/ext/iconv/tests/001.phpt index a6f41199ae..fde6553856 100644 --- a/ext/iconv/tests/001.phpt +++ b/ext/iconv/tests/001.phpt @@ -8,11 +8,10 @@ iconv test <?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: æøå" diff --git a/ext/iconv/tests/bug16069.phpt b/ext/iconv/tests/bug16069.phpt index 9088ce8d4e..7623ba0f5f 100644 --- a/ext/iconv/tests/bug16069.phpt +++ b/ext/iconv/tests/bug16069.phpt @@ -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-- diff --git a/ext/iconv/tests/translit-failure.phpt b/ext/iconv/tests/translit-failure.phpt index 93379d98bc..2bd4a61b01 100644 --- a/ext/iconv/tests/translit-failure.phpt +++ b/ext/iconv/tests/translit-failure.phpt @@ -3,7 +3,7 @@ Translit failure --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 @@ include('skipif.inc'); 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. */ diff --git a/ext/iconv/tests/translit-utf8.phpt b/ext/iconv/tests/translit-utf8.phpt index 537919c363..bd9903413e 100644 --- a/ext/iconv/tests/translit-utf8.phpt +++ b/ext/iconv/tests/translit-utf8.phpt @@ -3,7 +3,7 @@ Translit UTF-8 quotes --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'); ?> |