MFB51: 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 44db5cd404d67c89753f1e834d93654b60725249..9eb6944f01b8c3c5cfb2f9ec9260e08251faf0d3 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
 unicode.script_encoding=ISO-8859-1

diff --git a/ext/iconv/tests/eucjp2sjis.phpt b/ext/iconv/tests/eucjp2sjis.phpt
index 5acac62f6a577b7afd273f19c538f17bf7c16a8d..80c07636c81cee9089a2a234573bf0653627d5c7 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
 unicode.script_encoding=ISO-8859-1

diff --git a/ext/iconv/tests/eucjp2utf8.phpt b/ext/iconv/tests/eucjp2utf8.phpt
index 4bc721b4990f087a81bfc289f11073593f7d2491..2b74516ce9a154510f66afa50be8bf8606885085 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
 unicode.script_encoding=ISO-8859-1

diff --git a/ext/iconv/tests/iconv001.phpt b/ext/iconv/tests/iconv001.phpt
index c65ee747a348fc81df2a18505c5220fef78876f7..0402f371a126ba027edd37106881fa6181536303 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--
 unicode.script_encoding=ISO-8859-1
 unicode.output_encoding=ISO-8859-1

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 960dc8f806903b2c86501fc5efb7da393f7bb67d..43beada2fbb047371b6696116b41509b3fa15458 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--
 unicode.script_encoding=ISO-8859-1
 unicode.output_encoding=ISO-8859-1

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--