diff options
| author | Jani Taskinen <jani@php.net> | 2009-11-30 20:31:52 +0000 |
|---|---|---|
| committer | Jani Taskinen <jani@php.net> | 2009-11-30 20:31:52 +0000 |
| commit | 565cec5cfc4f5979c493edcbcc685eb306284810 (patch) | |
| tree | 937e6776fcf784e26263e5695156ba4cdf80f93d | |
| parent | be62e2c702cec1facae54701348ac13f6ca7942a (diff) | |
| download | php-git-565cec5cfc4f5979c493edcbcc685eb306284810.tar.gz | |
- Fix tests assuming wrong ini options and extensions that might not be there
| -rw-r--r-- | Zend/tests/bug50174.phpt | 2 | ||||
| -rw-r--r-- | ext/iconv/tests/iconv_encoding_basic.phpt | 6 | ||||
| -rw-r--r-- | ext/iconv/tests/iconv_substr_basic.phpt | 6 |
3 files changed, 12 insertions, 2 deletions
diff --git a/Zend/tests/bug50174.phpt b/Zend/tests/bug50174.phpt index 6ed5733b67..fef65136ba 100644 --- a/Zend/tests/bug50174.phpt +++ b/Zend/tests/bug50174.phpt @@ -1,5 +1,7 @@ --TEST-- Bug #50174 (Incorrectly matched docComment) +--SKIPIF-- +<?php if (!extension_loaded('reflection') || !extension_loaded('spl')) print "skip"; ?> --FILE-- <?php diff --git a/ext/iconv/tests/iconv_encoding_basic.phpt b/ext/iconv/tests/iconv_encoding_basic.phpt index 150f49b590..746858161c 100644 --- a/ext/iconv/tests/iconv_encoding_basic.phpt +++ b/ext/iconv/tests/iconv_encoding_basic.phpt @@ -5,6 +5,10 @@ Test iconv_get_encoding()/iconv_set_encoding() function : basic functionality extension_loaded('iconv') or die('skip'); function_exists('iconv_get_encoding') or die("skip iconv_get_encoding() is not available in this build"); ?> +--INI-- +iconv.input_encoding=ISO-8859-1 +iconv.internal_encoding=ISO-8859-1 +iconv.output_encoding=ISO-8859-1 --FILE-- <?php /* Prototype : mixed iconv_get_encoding([string type]) @@ -91,4 +95,4 @@ array(3) { ["internal_encoding"]=> string(5) "UTF-8" } -Done
\ No newline at end of file +Done diff --git a/ext/iconv/tests/iconv_substr_basic.phpt b/ext/iconv/tests/iconv_substr_basic.phpt index b8db8a124f..0754fc8779 100644 --- a/ext/iconv/tests/iconv_substr_basic.phpt +++ b/ext/iconv/tests/iconv_substr_basic.phpt @@ -5,6 +5,10 @@ Test iconv_substr() function : basic functionality extension_loaded('iconv') or die('skip'); function_exists('iconv_substr') or die("skip iconv_substr() is not available in this build"); ?> +--INI-- +iconv.input_encoding=ISO-8859-1 +iconv.internal_encoding=ISO-8859-1 +iconv.output_encoding=ISO-8859-1 --FILE-- <?php /* Prototype : string iconv_substr(string str, int offset, [int length, string charset]) @@ -52,4 +56,4 @@ string(14) "a5e69cace8aa9e" -- Multibyte string 2 -- string(42) "e8aa9ee38386e382ade382b9e38388e381a7e38199" -Done
\ No newline at end of file +Done |