summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIlia Alshanetsky <iliaa@php.net>2005-10-25 14:22:56 +0000
committerIlia Alshanetsky <iliaa@php.net>2005-10-25 14:22:56 +0000
commit9490f1c847e502ae3af196903dedbb29e2e72fea (patch)
tree42d3197d73c8ddc3c9d2582a889af495ebf5cfe7
parenta0c8d5d80aa62d956bf1513de7dad391ff2f0af9 (diff)
downloadphp-git-9490f1c847e502ae3af196903dedbb29e2e72fea.tar.gz
Do not run tests if iconv extension is unavailable.
-rw-r--r--ext/iconv/tests/bug16069.phpt2
-rw-r--r--ext/iconv/tests/eucjp2iso2022jp.phpt2
-rw-r--r--ext/iconv/tests/eucjp2sjis.phpt2
-rw-r--r--ext/iconv/tests/eucjp2utf8.phpt2
-rw-r--r--ext/iconv/tests/iconv001.phpt2
-rw-r--r--ext/iconv/tests/iconv002.phpt2
-rw-r--r--ext/iconv/tests/ob_iconv_handler.phpt2
-rw-r--r--ext/iconv/tests/translit-failure.phpt2
-rw-r--r--ext/iconv/tests/translit-utf8.phpt2
9 files changed, 9 insertions, 9 deletions
diff --git a/ext/iconv/tests/bug16069.phpt b/ext/iconv/tests/bug16069.phpt
index 5756923022..246b90c6cd 100644
--- 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 13dab43d4c..9318c60de2 100644
--- 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 c1cac62e85..a995125815 100644
--- 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 2100385cd6..4ffcfef516 100644
--- 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 d2c1f3ed60..3ef49246e5 100644
--- 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 8aded58866..034b3761fa 100644
--- 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 f26f87e97c..20f916935a 100644
--- 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 a97e29c029..d8b9fbff83 100644
--- 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 64991aab8d..aa5131f2c3 100644
--- 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--