sniper Wed Jun 6 18:27:54 2007 UTC
Modified files:
/php-src Makefile.global
Log:
- Fix for passing of shared extensions to run-tests.php
http://cvs.php.net/viewvc.cgi/php-src/Makefile.global?r1=1.72&r2=1.73&diff_format=u
Index: php-src/Makefile.global
diff -u php-src/Makefile.global:1.72 php-src/Makefile.global:1.73
--- php-src/Makefile.global:1.72 Wed Apr 11 16:02:56 2007
+++ php-src/Makefile.global Wed Jun 6 18:27:54 2007
@@ -66,38 +66,41 @@
fi \
done; \
fi
+
+PHP_TEST_SHARED_EXTENSIONS=`(for i in $(PHP_MODULES); do . $$i ; echo -n "-d
extension=$$dlname "; done)`
+PHP_TEST_SETTINGS=-d 'open_basedir=' -d 'output_buffering=0' -d
'memory_limit=-1'
-test: all
+test: all
[EMAIL PROTECTED] test ! -z "$(PHP_EXECUTABLE)" && test -x
"$(PHP_EXECUTABLE)"; then \
TEST_PHP_EXECUTABLE=$(PHP_EXECUTABLE) \
TEST_PHP_SRCDIR=$(top_srcdir) \
CC="$(CC)" \
- $(PHP_EXECUTABLE) -d 'open_basedir=' -d
'output_buffering=0' -d 'memory_limit=-1' $(top_srcdir)/run-tests.php -d
'extension_dir=modules/' -d `( . $(PHP_MODULES) ; echo extension=$$dlname)`
tests/; \
+ $(PHP_EXECUTABLE) $(PHP_TEST_SETTINGS)
$(top_srcdir)/run-tests.php -U -d extension_dir=modules/
$(PHP_TEST_SHARED_EXTENSIONS) 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)" \
- $(top_builddir)/$(SAPI_CLI_PATH) -d 'open_basedir=' -d
'output_buffering=0' -d 'memory_limit=-1' $(top_srcdir)/run-tests.php -U
$(TESTS); \
+ $(top_builddir)/$(SAPI_CLI_PATH) $(PHP_TEST_SETTINGS)
$(top_srcdir)/run-tests.php -U -d extension_dir=$(top_builddir)/modules/
$(PHP_TEST_SHARED_EXTENSIONS) $(TESTS); \
else \
echo "ERROR: Cannot run tests without CLI sapi."; \
fi
utest: all
- [EMAIL PROTECTED] test -x $(SAPI_CLI_PATH) && test ! -z
$(SAPI_CLI_PATH); then \
+ [EMAIL PROTECTED] 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)" \
- $(top_builddir)/$(SAPI_CLI_PATH) -d 'open_basedir=' -d
'output_buffering=0' -d 'memory_limit=-1' $(top_srcdir)/run-tests.php -u
$(TESTS); \
+ $(top_builddir)/$(SAPI_CLI_PATH) $(PHP_TEST_SETTINGS)
$(top_srcdir)/run-tests.php -u -d extension_dir=$(top_builddir)/modules/
$(PHP_TEST_SHARED_EXTENSIONS) $(TESTS); \
else \
echo "ERROR: Cannot run tests without CLI sapi."; \
fi
ntest: all
- [EMAIL PROTECTED] test -x $(SAPI_CLI_PATH) && test ! -z
$(SAPI_CLI_PATH); then \
+ [EMAIL PROTECTED] 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)" \
- $(top_builddir)/$(SAPI_CLI_PATH) -d 'open_basedir=' -d
'output_buffering=0' -d 'memory_limit=-1' $(top_srcdir)/run-tests.php -N
$(TESTS); \
+ $(top_builddir)/$(SAPI_CLI_PATH) $(PHP_TEST_SETTINGS)
$(top_srcdir)/run-tests.php -N -d extension_dir=$(top_builddir)/modules/
$(PHP_TEST_SHARED_EXTENSIONS) $(TESTS); \
else \
echo "ERROR: Cannot run tests without CLI sapi."; \
fi
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
