jani Mon, 30 Nov 2009 20:31:52 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=291521
Log: - Fix tests assuming wrong ini options and extensions that might not be there Changed paths: U php/php-src/branches/PHP_5_2/Zend/tests/bug50174.phpt U php/php-src/branches/PHP_5_2/ext/iconv/tests/iconv_encoding_basic.phpt U php/php-src/branches/PHP_5_2/ext/iconv/tests/iconv_substr_basic.phpt U php/php-src/branches/PHP_5_3/Zend/tests/bug50174.phpt U php/php-src/branches/PHP_5_3/ext/iconv/tests/iconv_encoding_basic.phpt U php/php-src/branches/PHP_5_3/ext/iconv/tests/iconv_substr_basic.phpt U php/php-src/trunk/ext/iconv/tests/iconv_encoding_basic.phpt U php/php-src/trunk/ext/iconv/tests/iconv_substr_basic.phpt Modified: php/php-src/branches/PHP_5_2/Zend/tests/bug50174.phpt =================================================================== --- php/php-src/branches/PHP_5_2/Zend/tests/bug50174.phpt 2009-11-30 20:11:15 UTC (rev 291520) +++ php/php-src/branches/PHP_5_2/Zend/tests/bug50174.phpt 2009-11-30 20:31:52 UTC (rev 291521) @@ -1,5 +1,7 @@ --TEST-- Bug #50174 (Incorrectly matched docComment) +--SKIPIF-- +<?php if (!extension_loaded('reflection') || !extension_loaded('spl')) print "skip"; ?> --FILE-- <?php Modified: php/php-src/branches/PHP_5_2/ext/iconv/tests/iconv_encoding_basic.phpt =================================================================== --- php/php-src/branches/PHP_5_2/ext/iconv/tests/iconv_encoding_basic.phpt 2009-11-30 20:11:15 UTC (rev 291520) +++ php/php-src/branches/PHP_5_2/ext/iconv/tests/iconv_encoding_basic.phpt 2009-11-30 20:31:52 UTC (rev 291521) @@ -5,6 +5,10 @@ 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 @@ ["internal_encoding"]=> string(5) "UTF-8" } -Done \ No newline at end of file +Done Modified: php/php-src/branches/PHP_5_2/ext/iconv/tests/iconv_substr_basic.phpt =================================================================== --- php/php-src/branches/PHP_5_2/ext/iconv/tests/iconv_substr_basic.phpt 2009-11-30 20:11:15 UTC (rev 291520) +++ php/php-src/branches/PHP_5_2/ext/iconv/tests/iconv_substr_basic.phpt 2009-11-30 20:31:52 UTC (rev 291521) @@ -5,6 +5,10 @@ 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 @@ -- Multibyte string 2 -- string(42) "e8aa9ee38386e382ade382b9e38388e381a7e38199" -Done \ No newline at end of file +Done Modified: php/php-src/branches/PHP_5_3/Zend/tests/bug50174.phpt =================================================================== --- php/php-src/branches/PHP_5_3/Zend/tests/bug50174.phpt 2009-11-30 20:11:15 UTC (rev 291520) +++ php/php-src/branches/PHP_5_3/Zend/tests/bug50174.phpt 2009-11-30 20:31:52 UTC (rev 291521) @@ -1,5 +1,7 @@ --TEST-- Bug #50174 (Incorrectly matched docComment) +--SKIPIF-- +<?php if (!extension_loaded('reflection') || !extension_loaded('spl')) print "skip"; ?> --FILE-- <?php Modified: php/php-src/branches/PHP_5_3/ext/iconv/tests/iconv_encoding_basic.phpt =================================================================== --- php/php-src/branches/PHP_5_3/ext/iconv/tests/iconv_encoding_basic.phpt 2009-11-30 20:11:15 UTC (rev 291520) +++ php/php-src/branches/PHP_5_3/ext/iconv/tests/iconv_encoding_basic.phpt 2009-11-30 20:31:52 UTC (rev 291521) @@ -5,6 +5,10 @@ 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 @@ ["internal_encoding"]=> string(5) "UTF-8" } -Done \ No newline at end of file +Done Modified: php/php-src/branches/PHP_5_3/ext/iconv/tests/iconv_substr_basic.phpt =================================================================== --- php/php-src/branches/PHP_5_3/ext/iconv/tests/iconv_substr_basic.phpt 2009-11-30 20:11:15 UTC (rev 291520) +++ php/php-src/branches/PHP_5_3/ext/iconv/tests/iconv_substr_basic.phpt 2009-11-30 20:31:52 UTC (rev 291521) @@ -5,6 +5,10 @@ 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 @@ -- Multibyte string 2 -- string(42) "e8aa9ee38386e382ade382b9e38388e381a7e38199" -Done \ No newline at end of file +Done Modified: php/php-src/trunk/ext/iconv/tests/iconv_encoding_basic.phpt =================================================================== --- php/php-src/trunk/ext/iconv/tests/iconv_encoding_basic.phpt 2009-11-30 20:11:15 UTC (rev 291520) +++ php/php-src/trunk/ext/iconv/tests/iconv_encoding_basic.phpt 2009-11-30 20:31:52 UTC (rev 291521) @@ -5,6 +5,10 @@ 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 @@ ["internal_encoding"]=> string(5) "UTF-8" } -Done \ No newline at end of file +Done Modified: php/php-src/trunk/ext/iconv/tests/iconv_substr_basic.phpt =================================================================== --- php/php-src/trunk/ext/iconv/tests/iconv_substr_basic.phpt 2009-11-30 20:11:15 UTC (rev 291520) +++ php/php-src/trunk/ext/iconv/tests/iconv_substr_basic.phpt 2009-11-30 20:31:52 UTC (rev 291521) @@ -5,6 +5,10 @@ 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]) @@ -36,8 +40,8 @@ $result_2 = iconv_substr($string_mb, 2, 7, 'utf-8'); var_dump(bin2hex($result_2)); +echo "Done"; ?> -===DONE=== --EXPECT-- *** Testing iconv_substr() : basic functionality *** @@ -52,4 +56,4 @@ -- Multibyte string 2 -- unicode(42) "e8aa9ee38386e382ade382b9e38388e381a7e38199" -===DONE=== \ No newline at end of file +Done
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php