diff options
| author | Anatol Belski <ab@php.net> | 2014-11-24 16:27:43 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-11-24 16:27:43 +0100 |
| commit | 7582b57c87909da0bd3efbb3664c30df11274491 (patch) | |
| tree | eb0d78c9fc7acadc6aa601441ad2cd9ac56dab44 /ext | |
| parent | 99818a576f0dd7fd5ef2869a27b62e1c3e5f48bd (diff) | |
| parent | 3578e5b25008157abd086e52ec1d179566359610 (diff) | |
| download | php-git-7582b57c87909da0bd3efbb3664c30df11274491.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
fix dir separator in test
fork test for windows
update for LiteSpeed
update for LiteSpeed
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/exif/tests/bug68113.phpt | 6 | ||||
| -rw-r--r-- | ext/iconv/tests/iconv_basic_001-win32.phpt | 19 | ||||
| -rw-r--r-- | ext/iconv/tests/iconv_basic_001.phpt | 3 |
3 files changed, 24 insertions, 4 deletions
diff --git a/ext/exif/tests/bug68113.phpt b/ext/exif/tests/bug68113.phpt index 0fa4c4aca8..e4a1cbf53b 100644 --- a/ext/exif/tests/bug68113.phpt +++ b/ext/exif/tests/bug68113.phpt @@ -10,8 +10,8 @@ var_dump(exif_thumbnail(__DIR__."/bug68113.jpg")); ?> Done --EXPECTF-- -Warning: exif_thumbnail(bug68113.jpg): File structure corrupted in %s/bug68113.php on line 2 +Warning: exif_thumbnail(bug68113.jpg): File structure corrupted in %s%ebug68113.php on line 2 -Warning: exif_thumbnail(bug68113.jpg): Invalid JPEG file in %s/bug68113.php on line 2 +Warning: exif_thumbnail(bug68113.jpg): Invalid JPEG file in %s%ebug68113.php on line 2 bool(false) -Done
\ No newline at end of file +Done diff --git a/ext/iconv/tests/iconv_basic_001-win32.phpt b/ext/iconv/tests/iconv_basic_001-win32.phpt new file mode 100644 index 0000000000..59a3dbd863 --- /dev/null +++ b/ext/iconv/tests/iconv_basic_001-win32.phpt @@ -0,0 +1,19 @@ +--TEST-- +Test the basics to function iconv. +--CREDITS-- +Rodrigo Prado de Jesus <royopa [at] gmail [dot] com> +--SKIPIF-- +<?php extension_loaded('iconv') or die('skip iconv extension is not available'); ?> +<?php if(substr(PHP_OS, 0, 3) != 'WIN' ) {die('skip windows only test');} ?> +--FILE-- +<?php +$in_charset = 'UTF-8'; +$out_charset = 'ASCII//TRANSLIT'; +$string_to_translate = 'Žluťoučký kůň\n'; + +$string_out = iconv($in_charset, $out_charset, $string_to_translate); + +var_dump($string_out); +?> +--EXPECT-- +string(16) "Zlutouck'y kun\n" diff --git a/ext/iconv/tests/iconv_basic_001.phpt b/ext/iconv/tests/iconv_basic_001.phpt index e5c5ddc428..6fcb5dbe8a 100644 --- a/ext/iconv/tests/iconv_basic_001.phpt +++ b/ext/iconv/tests/iconv_basic_001.phpt @@ -4,6 +4,7 @@ Test the basics to function iconv. Rodrigo Prado de Jesus <royopa [at] gmail [dot] com> --SKIPIF-- <?php extension_loaded('iconv') or die('skip iconv extension is not available'); ?> +<?php if(substr(PHP_OS, 0, 3) == 'WIN' ) {die('skip not for windows');} ?> --FILE-- <?php $in_charset = 'UTF-8'; @@ -15,4 +16,4 @@ $string_out = iconv($in_charset, $out_charset, $string_to_translate); var_dump($string_out); ?> --EXPECT-- -string(15) "Zlutoucky kun\n"
\ No newline at end of file +string(15) "Zlutoucky kun\n" |