Do not run tests if iconv extension is unavailable.

diff --git a/ext/iconv/tests/bug16069.phpt b/ext/iconv/tests/bug16069.phpt
index 5756923022d2f6734e4b779f89d4816091e13a05..246b90c6cd306adbe7e82d231c90337b020f51f5 100644 (file)
--- a/ext/iconv/tests/bug16069.phpt
+++ b/ext/iconv/tests/bug16069.phpt
@@ -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 to EUC-JP translit not available\n");
 }

diff --git a/ext/iconv/tests/eucjp2iso2022jp.phpt b/ext/iconv/tests/eucjp2iso2022jp.phpt
index 13dab43d4cc06304cad84ec852df6773cb9de96b..9318c60de201748be3ac33f87920193444f0ecc3 100644 (file)
--- a/ext/iconv/tests/eucjp2iso2022jp.phpt
+++ b/ext/iconv/tests/eucjp2iso2022jp.phpt
@@ -1,7 +1,7 @@
 --TEST--
 EUC-JP to ISO-2022-JP
 --SKIPIF--
-<?php /* include('skipif.inc'); */ ?>
+<?php include('skipif.inc'); ?>
 --INI--
 error_reporting=2039
 --FILE--

diff --git a/ext/iconv/tests/eucjp2sjis.phpt b/ext/iconv/tests/eucjp2sjis.phpt
index c1cac62e8549e6d17250da87a5a9ae4871816326..a995125815326e03cc936e33bf7a82449a20ba27 100644 (file)
--- a/ext/iconv/tests/eucjp2sjis.phpt
+++ b/ext/iconv/tests/eucjp2sjis.phpt
@@ -1,7 +1,7 @@
 --TEST--
 EUC-JP to SJIS
 --SKIPIF--
-<?php /* include('skipif.inc'); */ ?>
+<?php include('skipif.inc'); ?>
 --INI--
 error_reporting=2039
 --FILE--

diff --git a/ext/iconv/tests/eucjp2utf8.phpt b/ext/iconv/tests/eucjp2utf8.phpt
index 2100385cd6015b04d939807d60b174aa4badede0..4ffcfef516553c267ff1ecb3b31408fcff38ae63 100644 (file)
--- a/ext/iconv/tests/eucjp2utf8.phpt
+++ b/ext/iconv/tests/eucjp2utf8.phpt
@@ -1,7 +1,7 @@
 --TEST--
 EUC-JP to UTF8
 --SKIPIF--
-<?php /* include('skipif.inc'); */ ?>
+<?php include('skipif.inc'); ?>
 --INI--
 error_reporting=2039
 --FILE--

diff --git a/ext/iconv/tests/iconv001.phpt b/ext/iconv/tests/iconv001.phpt
index d2c1f3ed60d1a6f94250c54c227ce856e9279758..3ef49246e56945171bb1aa9c6e947455d7a717cb 100644 (file)
--- a/ext/iconv/tests/iconv001.phpt
+++ b/ext/iconv/tests/iconv001.phpt
@@ -1,7 +1,7 @@
 --TEST--
 iconv() test 1
 --SKIPIF--
-<?php /* include('skipif.inc'); */ ?>
+<?php include('skipif.inc'); ?>
 --INI--
 error_reporting=2039
 --FILE--

diff --git a/ext/iconv/tests/iconv002.phpt b/ext/iconv/tests/iconv002.phpt
index 8aded58866d3e81df3143625a82f4b5ec24a14c0..034b3761faf7970dfcc8ddf82a566b75a1de8194 100644 (file)
--- a/ext/iconv/tests/iconv002.phpt
+++ b/ext/iconv/tests/iconv002.phpt
@@ -2,7 +2,7 @@
 iconv() test 2 (UCS4BE to ASCII)
 --SKIPIF--
 <?php
-/* include('skipif.inc'); */
+include('skipif.inc');
 if (@iconv("ascii","UCS-4LE", "abcd") == '') {
        die("skip conversion to UCS-4LE not supported"); 
 }

diff --git a/ext/iconv/tests/ob_iconv_handler.phpt b/ext/iconv/tests/ob_iconv_handler.phpt
index f26f87e97ce375d45d2e734b0ac95dd7ec73d352..20f916935aa9cc91bfe871b1610df6158b6a03c6 100644 (file)
--- a/ext/iconv/tests/ob_iconv_handler.phpt
+++ b/ext/iconv/tests/ob_iconv_handler.phpt
@@ -1,7 +1,7 @@
 --TEST--
 ob_iconv_handler()
 --SKIPIF--
-<?php /* include('skipif.inc'); */ ?>
+<?php include('skipif.inc'); ?>
 --INI--
 error_reporting=2039
 --FILE--

diff --git a/ext/iconv/tests/translit-failure.phpt b/ext/iconv/tests/translit-failure.phpt
index a97e29c029ee505ab2b97caa66568773046d18d6..d8b9fbff839b09d578b2244322566cbdcfa15b98 100644 (file)
--- a/ext/iconv/tests/translit-failure.phpt
+++ b/ext/iconv/tests/translit-failure.phpt
@@ -2,7 +2,7 @@
 Translit failure
 --SKIPIF--
 <?php
-/* include('skipif.inc'); */
+include('skipif.inc');
 ( ICONV_IMPL != "libiconv" ) and die("skip ICONV_IMPL != \"libiconv\""); 
 ?>
 --INI--

diff --git a/ext/iconv/tests/translit-utf8.phpt b/ext/iconv/tests/translit-utf8.phpt
index 64991aab8d8c7ccdcc99ea2676a21a4ded56400a..aa5131f2c312bf558b8e54c9a28822ca5b3bfeb7 100644 (file)
--- a/ext/iconv/tests/translit-utf8.phpt
+++ b/ext/iconv/tests/translit-utf8.phpt
@@ -2,7 +2,7 @@
 Translit UTF-8 quotes
 --SKIPIF--
 <?php
-/* include('skipif.inc'); */
+include('skipif.inc');
 ( ICONV_IMPL != "libiconv" ) and die("skip ICONV_IMPL != \"libiconv\""); 
 ?>
 --INI--