diff options
| author | Antony Dovgal <tony2001@php.net> | 2007-06-26 10:22:48 +0000 |
|---|---|---|
| committer | Antony Dovgal <tony2001@php.net> | 2007-06-26 10:22:48 +0000 |
| commit | 83e33eac024a9a88aa2d22ac72f2182da9379afb (patch) | |
| tree | 7ede68b6e32751caf0291256e493bb70833b7fc0 /Makefile.global | |
| parent | dc1c6f74c8a5ba8c3ca9f2579cea23a989c92742 (diff) | |
| download | php-git-83e33eac024a9a88aa2d22ac72f2182da9379afb.tar.gz | |
MFH
Diffstat (limited to 'Makefile.global')
| -rw-r--r-- | Makefile.global | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/Makefile.global b/Makefile.global index dd7c2722d7..8115f1e030 100644 --- a/Makefile.global +++ b/Makefile.global @@ -69,7 +69,7 @@ install-headers: install-su: install-pear -PHP_TEST_SHARED_EXTENSIONS=`(for i in $(PHP_MODULES); do . $$i ; echo -n "-d extension=$$dlname "; done)` +PHP_TEST_SHARED_EXTENSIONS=`(if test ! -z "$(PHP_MODULES)"; then for i in $(PHP_MODULES); do . $$i ; echo -n "-d extension=$$dlname "; done; fi;)` PHP_TEST_SETTINGS=-d 'open_basedir=' -d 'safe_mode=0' -d 'output_buffering=0' -d 'memory_limit=-1' test: all @@ -79,7 +79,12 @@ 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()) ? php_ini_loaded_file() : "no_ini_file";'` > $(top_builddir)/tmp-php.ini; \ + INI_FILE=`$(top_builddir)/$(SAPI_CLI_PATH) -r 'echo php_ini_loaded_file();'`; \ + if test -z "$(INI_FILE)"; then \ + echo "" > $(top_builddir)/tmp-php.ini; \ + else \ + $(EGREP) -v '^extension[\t\ ]=' "$(INI_FILE)" > $(top_builddir)/tmp-php.ini; \ + fi; \ TEST_PHP_EXECUTABLE=$(top_builddir)/$(SAPI_CLI_PATH) \ TEST_PHP_SRCDIR=$(top_srcdir) \ CC="$(CC)" \ |