From: foobar <sniper@php.net>
Date: Fri, 29 Jun 2007 14:30:35 +0000 (+0000)
Subject: MFH
X-Git-Tag: php-5.2.4RC1~254
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9e1c9cad2dbe083d0d4b84747e52817b8beed3da;p=php

MFH
---

diff --git a/Makefile.global b/Makefile.global
index 8115f1e030..b46ff2d73d 100644
--- a/Makefile.global
+++ b/Makefile.global
@@ -69,10 +69,16 @@ install-headers:
 	
 install-su: install-pear
 
-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'
+PHP_TEST_SETTINGS = -d 'open_basedir=' -d 'safe_mode=0' -d 'output_buffering=0' -d 'memory_limit=-1'
+PHP_TEST_SHARED_EXTENSIONS = ` \
+	if test "$(PHP_MODULES)"; then \
+		for i in "$(PHP_MODULES)"; do \
+			. $$i; shared_exts="$$exts -d extension=$$dlname"; \
+		done; \
+		echo $$shared_exts; \
+	fi`
 
-test: all 
+test: all
 	-@if test ! -z "$(PHP_EXECUTABLE)" && test -x "$(PHP_EXECUTABLE)"; then \
 		TEST_PHP_EXECUTABLE=$(PHP_EXECUTABLE) \
 		TEST_PHP_SRCDIR=$(top_srcdir) \
@@ -80,10 +86,10 @@ test: all
 			$(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 \
 		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 \
+		if test "$(INI_FILE)"; then \
 			$(EGREP) -v '^extension[\t\ ]=' "$(INI_FILE)" > $(top_builddir)/tmp-php.ini; \
+		else \
+			echo > $(top_builddir)/tmp-php.ini; \
 		fi; \
 		TEST_PHP_EXECUTABLE=$(top_builddir)/$(SAPI_CLI_PATH) \
 		TEST_PHP_SRCDIR=$(top_srcdir) \