backport fix-test-run.patch from php 5.5 branch

[packages/php.git] / fix-test-run.patch

diff --git a/fix-test-run.patch b/fix-test-run.patch
index 33d072c0d32bbb74b3d543f3d0127aada7cdd39b..8bddab2110d8c9a1fe2ed86b8032aef571ae94cb 100644 (file)
--- a/fix-test-run.patch
+++ b/fix-test-run.patch
@@ -12,32 +12,35 @@
  PHP_SUBST_OLD(PHP_INSTALLED_SAPIS)
  
  PHP_SUBST(PHP_EXECUTABLE)
---- php-5.3.4/Makefile.global~ 2010-12-12 23:08:32.000000000 +0200
-+++ php-5.3.4/Makefile.global  2010-12-12 23:09:31.246644108 +0200
-@@ -77,7 +77,8 @@
+--- php-5.4.35/Makefile.global 2015-01-21 15:07:46.782561411 +0200
++++ php-5.5.38/Makefile.global 2016-11-23 04:52:33.981224263 +0200
+@@ -81,8 +81,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 = pcre
++PHP_TEST_SHARED_SYSTEM_EXTENSIONS =
  PHP_TEST_SHARED_EXTENSIONS =  ` \
-       if test "x$(PHP_MODULES)" != "x"; then \
-               for i in $(PHP_MODULES)""; do \
-@@ -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\ ]*='
++      fi; \
+       if test "x$(PHP_MODULES)" != "x"; then \
+               for i in $(PHP_MODULES)""; do \
+                       . $$i; $(top_srcdir)/build/shtool echo -n -- " -d extension=$$dlname"; \
+@@ -96,7 +103,7 @@
+ PHP_DEPRECATED_DIRECTIVES_REGEX = '^(magic_quotes_(gpc|runtime|sybase)?|(zend_)?extension(_debug)?(_ts)?)[\t\ ]*='
  
-@@ -114,7 +114,10 @@
+ test: all
+-      -@if test ! -z "$(PHP_EXECUTABLE)" && test -x "$(PHP_EXECUTABLE)"; then \
++      @if test ! -z "$(PHP_EXECUTABLE)" && test -x "$(PHP_EXECUTABLE)"; then \
+               INI_FILE=`$(PHP_EXECUTABLE) -d 'display_errors=stderr' -r 'echo php_ini_loaded_file();' 2> /dev/null`; \
+               if test "$$INI_FILE"; then \
+                       $(EGREP) -h -v $(PHP_DEPRECATED_DIRECTIVES_REGEX) "$$INI_FILE" > $(top_builddir)/tmp-php.ini; \
+@@ -107,7 +114,10 @@
                TEST_PHP_EXECUTABLE=$(PHP_EXECUTABLE) \
                TEST_PHP_SRCDIR=$(top_srcdir) \
                CC="$(CC)" \
@@ -49,14 +52,3 @@
                rm $(top_builddir)/tmp-php.ini; \
        else \
                echo "ERROR: Cannot run tests without CLI sapi."; \
---- 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
-@@ -296,7 +296,7 @@
-       fi
- 
- 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_SYSTEM_EXTENSIONS =
- PHP_TEST_SHARED_EXTENSIONS =  ` \
-       if test "x$(PHP_MODULES)" != "x"; then \
-               for i in $(PHP_MODULES)""; do \