diff options
Diffstat (limited to 'Makefile.global')
| -rw-r--r-- | Makefile.global | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Makefile.global b/Makefile.global index 160dc5b6a0..d4a92a2e27 100644 --- a/Makefile.global +++ b/Makefile.global @@ -45,15 +45,15 @@ install-modules: build-modules @rm -f modules/*.la >/dev/null 2>&1 @$(INSTALL) modules/* $(INSTALL_ROOT)$(EXTENSION_DIR) -install-tester: - @echo "Installing regression tester: $(INSTALL_ROOT)$(PEAR_INSTALLDIR)/" - @$(mkinstalldirs) $(INSTALL_ROOT)$(PEAR_INSTALLDIR) - @$(INSTALL) -m 755 $(top_srcdir)/run-tests.php $(INSTALL_ROOT)$(PEAR_INSTALLDIR) - -install-su: install-pear install-tester +install-su: install-pear test: - -@if test -x $(SAPI_CLI_PATH) && test ! -z $(SAPI_CLI_PATH); then \ + -@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/; \ + 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) \ CC="$(CC)" \ |