com php-src: Fix php_ini_loaded_file() test: ex t/standard/tests/php_ini_loaded_file.phpt

From: Date: Thu, 16 Aug 2012 15:46:34 +0000
Subject: com php-src: Fix php_ini_loaded_file() test: ex t/standard/tests/php_ini_loaded_file.phpt
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-69852@lists.php.net to get a copy of this message
Commit: 9a38bd66c87e8f6e1ac8e28014bb42686d5742d3 Author: Nikita Popov <nikic@php.net> Thu, 16 Aug 2012 17:46:34 +0200 Parents: fc26aa7f3e223ab8e3d5c07b4b0c6dd3cf09cb83 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=9a38bd66c87e8f6e1ac8e28014bb42686d5742d3 Log: Fix php_ini_loaded_file() test If running ./run-tests.php directly there isn't necessarily an ini file, so the function can also return false. Changed paths: M ext/standard/tests/php_ini_loaded_file.phpt Diff: diff --git a/ext/standard/tests/php_ini_loaded_file.phpt b/ext/standard/tests/php_ini_loaded_file.phpt index 747e019..7d44158 100644 --- a/ext/standard/tests/php_ini_loaded_file.phpt +++ b/ext/standard/tests/php_ini_loaded_file.phpt @@ -10,5 +10,5 @@ precision=12 <?php var_dump(php_ini_loaded_file()); ?> ---EXPECTF-- -string(%d) "%sphp.ini" +--EXPECTREGEX-- +string\(\d+\) ".*php\.ini"|bool\(false\)

« previous php.cvs (#69852) next »