summaryrefslogtreecommitdiff
path: root/Makefile.global
diff options
context:
space:
mode:
authorfoobar <sniper@php.net>2007-06-09 12:06:53 (GMT)
committerfoobar <sniper@php.net>2007-06-09 12:06:53 (GMT)
commit37e8ce097cb5439f6a6833f65e5b76ae280e95ae (patch)
treeee6359acc5b7d6fc62be432d11759d0e0e3f15b6 /Makefile.global
parentf199649ad6d686383da12201dadf1b76583a45b3 (diff)
downloadphp-37e8ce097cb5439f6a6833f65e5b76ae280e95ae.tar.gz
- Fix special case of no ini file in use or not found
Diffstat (limited to 'Makefile.global')
-rw-r--r--Makefile.global2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.global b/Makefile.global
index ea9866b..dd7c272 100644
--- a/Makefile.global
+++ b/Makefile.global
@@ -79,7 +79,7 @@ test: all
CC="$(CC)" \
$(PHP_EXECUTABLE) $(PHP_TEST_SETTINGS) $(top_srcdir)/run-tests.php -d extension_dir=modules/ $(PHP_TEST_SHARED_EXTENSIONS) tests/; \
elif test ! -z "$(SAPI_CLI_PATH)" && test -x "$(SAPI_CLI_PATH)"; then \
- $(EGREP) -v '^extension[\t\ ]=' `$(top_builddir)/$(SAPI_CLI_PATH) -r 'echo php_ini_loaded_file();'` > $(top_builddir)/tmp-php.ini; \
+ $(EGREP) -v '^extension[\t\ ]=' `$(top_builddir)/$(SAPI_CLI_PATH) -r 'echo (php_ini_loaded_file()) ? php_ini_loaded_file() : "no_ini_file";'` > $(top_builddir)/tmp-php.ini; \
TEST_PHP_EXECUTABLE=$(top_builddir)/$(SAPI_CLI_PATH) \
TEST_PHP_SRCDIR=$(top_srcdir) \
CC="$(CC)" \