PHP_SUBST(PHP_MODULES)
PHP_SUBST(PHP_ZEND_EX)
---- php-5.3.2/Makefile.global 2010-03-16 16:14:24.340804566 +0200
-+++ php-5.3.2/Makefile.global 2010-03-16 16:31:36.972576955 +0200
-@@ -77,7 +77,7 @@
+--- php-5.3.8/Makefile.global~ 2011-10-14 08:58:00.288329595 +0300
++++ php-5.3.8/Makefile.global 2011-10-14 08:50:16.670234576 +0300
+@@ -77,8 +77,15 @@
done; \
fi
-PHP_TEST_SETTINGS = -d 'open_basedir=' -d 'output_buffering=0' -d 'memory_limit=-1'
+PHP_TEST_SETTINGS = -d 'open_basedir=' -d 'output_buffering=0' -d 'memory_limit=-1' -d 'safe_mode=0'
++PHP_TEST_SHARED_SYSTEM_EXTENSIONS =
PHP_TEST_SHARED_EXTENSIONS = ` \
++ if test "x$(PHP_TEST_SHARED_SYSTEM_EXTENSIONS)" != "x"; then \
++ for i in $(PHP_TEST_SHARED_SYSTEM_EXTENSIONS)""; do \
++ dlname=$$i.$(SHLIB_DL_SUFFIX_NAME); \
++ $(top_srcdir)/build/shtool echo -n -- " -d extension=$(EXTENSION_DIR)/$$dlname"; \
++ done; \
++ fi; \
if test "x$(PHP_MODULES)" != "x"; then \
for i in $(PHP_MODULES)""; do \
-@@ -320,7 +320,10 @@
+ . $$i; $(top_srcdir)/build/shtool echo -n -- " -d extension=$$dlname"; \
+@@ -107,7 +114,10 @@
TEST_PHP_EXECUTABLE=$(PHP_EXECUTABLE) \
TEST_PHP_SRCDIR=$(top_srcdir) \
CC="$(CC)" \
- $(PHP_EXECUTABLE) -n -c $(top_builddir)/tmp-php.ini $(PHP_TEST_SETTINGS) $(top_srcdir)/run-tests.php -n -c $(top_builddir)/tmp-php.ini -d extension_dir=$(top_builddir)/modules/ $(PHP_TEST_SHARED_EXTENSIONS) $(TESTS); \
+ $(PHP_EXECUTABLE) -n -c $(top_builddir)/tmp-php.ini \
-+ -d extension_dir=$(top_builddir)/modules/ -d 'extension=pcre.$(SHLIB_DL_SUFFIX_NAME)' \
++ -d extension_dir=$(top_builddir)/modules/ -d 'extension=$(EXTENSION_DIR)/pcre.$(SHLIB_DL_SUFFIX_NAME)' \
+ $(PHP_TEST_SETTINGS) $(top_srcdir)/run-tests.php -n -c $(top_builddir)/tmp-php.ini \
+ -d extension_dir=$(top_builddir)/modules/ $(PHP_TEST_SHARED_EXTENSIONS) $(RUN_TESTS_SETTINGS) $(TESTS); \
+ rm $(top_builddir)/tmp-php.ini; \
else \
echo "ERROR: Cannot run tests without CLI sapi."; \
- fi