com php-src: fix tests: ext/iconv/tests/iconv_basic_00 1.phpt ext/phar/tests/bug69453.phpt ext/pha r/tests/create_path_error.phpt

Commit: 2b9c7f881a30767b0aeed94e88cc978544e78094 Author: Anatol Belski <ab@php.net> Fri, 21 Aug 2015 15:13:39 +0200 Parents: aa23bc6d1d2a559555a8b9033b2d26b5bca13567 Branches: PHP-5.6 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=2b9c7f881a30767b0aeed94e88cc978544e78094 Log: fix tests Changed paths: M ext/iconv/tests/iconv_basic_001.phpt M ext/phar/tests/bug69453.phpt M ext/phar/tests/create_path_error.phpt Diff: diff --git a/ext/iconv/tests/iconv_basic_001.phpt b/ext/iconv/tests/iconv_basic_001.phpt index 079eb67..9f33f6b 100644 --- a/ext/iconv/tests/iconv_basic_001.phpt +++ b/ext/iconv/tests/iconv_basic_001.phpt @@ -5,7 +5,7 @@ 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');} ?> -<?php if(setlocale(LC_ALL, "en_US.utf8",) === false) { die('skip en_US.utf8 locales not available'); } ?> +<?php if(setlocale(LC_ALL, "en_US.utf8") === false) { die('skip en_US.utf8 locales not available'); } ?> --FILE-- <?php setlocale(LC_ALL, "en_US.utf8"); diff --git a/ext/phar/tests/bug69453.phpt b/ext/phar/tests/bug69453.phpt index 4a2a37f..ddd2992 100644 --- a/ext/phar/tests/bug69453.phpt +++ b/ext/phar/tests/bug69453.phpt @@ -14,8 +14,8 @@ $r = new Phar($fname, 0); ==DONE== --EXPECTF-- -exception 'UnexpectedValueException' with message 'phar error: "%s/bug69453.tar.phar" is a corrupted tar file (checksum mismatch of file "")' in %s:%d +exception 'UnexpectedValueException' with message 'phar error: "%s%ebug69453.tar.phar" is a corrupted tar file (checksum mismatch of file "")' in %s:%d Stack trace: -#0 %s/bug69453.php(%d): Phar->__construct('%s', 0) +#0 %s%ebug69453.php(%d): Phar->__construct('%s', 0) #1 {main} -==DONE== \ No newline at end of file +==DONE== diff --git a/ext/phar/tests/create_path_error.phpt b/ext/phar/tests/create_path_error.phpt index 886ba81..fe2cd3e 100644 --- a/ext/phar/tests/create_path_error.phpt +++ b/ext/phar/tests/create_path_error.phpt @@ -75,11 +75,11 @@ string(5) "query" 6: 7: 8: -9:Error: file_put_contents(phar:///%s): failed to open stream: phar error: invalid path "%s" contains illegal character -10:Error: file_put_contents(phar:///%s): failed to open stream: phar error: invalid path "%s" contains illegal character -11:Error: file_put_contents(phar:///%s): failed to open stream: phar error: invalid path "%s" contains illegal character -12:Error: file_put_contents(phar:///%s): failed to open stream: phar error: invalid path "%s" contains illegal character -13:Error: file_put_contents(phar:///%s): failed to open stream: phar error: invalid path "%s" contains illegal character +9:Error: file_put_contents(phar://%s): failed to open stream: phar error: invalid path "%s" contains illegal character +10:Error: file_put_contents(phar://%s): failed to open stream: phar error: invalid path "%s" contains illegal character +11:Error: file_put_contents(phar://%s): failed to open stream: phar error: invalid path "%s" contains illegal character +12:Error: file_put_contents(phar://%s): failed to open stream: phar error: invalid path "%s" contains illegal character +13:Error: file_put_contents(phar://%s): failed to open stream: phar error: invalid path "%s" contains illegal character Exception: Entry a does not exist and cannot be created: phar error: invalid path "a" contains illegal character ===DONE===