- add PHP_TEST_SHARED_SYSTEM_EXTENSIONS make var to be able to load extensions from...

Changed files:
    fix-test-run.patch -> 1.5

diff --git a/fix-test-run.patch b/fix-test-run.patch
index 991330c4bc5d3baecaf2711774ecb415923dacc7..0dced2a486c9e76a5fc9b875b4d5fb66f14843ea 100644 (file)
--- a/fix-test-run.patch
+++ b/fix-test-run.patch
@@ -12,18 +12,32 @@
  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
 +++ php-5.3.2/Makefile.global  2010-03-16 16:31:36.972576955 +0200
-@@ -77,7 +77,7 @@
+@@ -77,7 +77,8 @@
                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 = pcre
  PHP_TEST_SHARED_EXTENSIONS =  ` \
        if test "x$(PHP_MODULES)" != "x"; then \
                for i in $(PHP_MODULES)""; do \
-@@ -320,7 +320,10 @@
+@@ -88,6 +89,12 @@
+               for i in $(PHP_ZEND_EX)""; do \
+                       . $$i; $(top_srcdir)/build/shtool echo -n -- " -d $(ZEND_EXT_TYPE)=$(top_builddir)/modules/$$dlname"; \
+               done; \
++      fi; \
++      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`
+ PHP_DEPRECATED_DIRECTIVES_REGEX = '^(define_syslog_variables|register_(globals|long_arrays)?|safe_mode|magic_quotes_(gpc|runtime|sybase)?|(zend_)?extension(_debug)?(_ts)?)[\t\ ]*='
+ 
+@@ -320,7 +327,10 @@
                TEST_PHP_EXECUTABLE=$(PHP_EXECUTABLE) \
                TEST_PHP_SRCDIR=$(top_srcdir) \
                CC="$(CC)" \