summaryrefslogtreecommitdiff
path: root/Makefile.global
diff options
context:
space:
mode:
authorHartmut Holzgraefe <hholzgra@php.net>2005-08-08 17:49:32 (GMT)
committerHartmut Holzgraefe <hholzgra@php.net>2005-08-08 17:49:32 (GMT)
commitd4fd9a58cfd5a88d92aadf2ac62df25c340b8876 (patch)
treed598b2527318310251e5b6c85716883fa0739a1d /Makefile.global
parent98f245e5f91b51b051199f91453e2a8998db7c52 (diff)
downloadphp-d4fd9a58cfd5a88d92aadf2ac62df25c340b8876.tar.gz
put the -d extension loading options in the right place,
get rid of basename
Diffstat (limited to 'Makefile.global')
-rw-r--r--Makefile.global4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.global b/Makefile.global
index d4a92a2..62d4a61 100644
--- a/Makefile.global
+++ b/Makefile.global
@@ -47,12 +47,12 @@ install-modules: build-modules
install-su: install-pear
-test:
+test: all
-@if test ! -z $(PHP_EXECUTABLE) && test -x $(PHP_EXECUTABLE); then \
TEST_PHP_EXECUTABLE=$(PHP_EXECUTABLE) \
TEST_PHP_SRCDIR=$(top_srcdir) \
CC="$(CC)" \
- $(PHP_EXECUTABLE) -d 'extension_dir=modules/' -d 'extension='`basename $(PHP_MODULES) .la`'.so' -d 'open_basedir=' -d 'safe_mode=0' -d 'output_buffering=0' -d 'memory_limit=-1' $(top_srcdir)/run-tests.php tests/; \
+ $(PHP_EXECUTABLE) -d 'open_basedir=' -d 'safe_mode=0' -d 'output_buffering=0' -d 'memory_limit=-1' $(top_srcdir)/run-tests.php -d 'extension_dir=modules/' -d `( . $(PHP_MODULES) ; echo extension=$$dlname)` tests/; \
elif test ! -z $(SAPI_CLI_PATH) && test -x $(SAPI_CLI_PATH); then \
TEST_PHP_EXECUTABLE=$(top_builddir)/$(SAPI_CLI_PATH) \
TEST_PHP_SRCDIR=$(top_srcdir) \