- Up to 8.1.5

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

diff --git a/fix-test-run.patch b/fix-test-run.patch
index 3de5b431778e7ac0c2ebc1ab7fb8b355be1c8fe7..cde2b04855fbe168e1cc149a7921119d0069950d 100644 (file)
--- a/fix-test-run.patch
+++ b/fix-test-run.patch
@@ -1,62 +1,42 @@
---- php-5.4.0alpha2/configure.in~      2011-08-07 12:43:31.000000000 +0300
-+++ php-5.4.0alpha2/configure.in       2011-08-07 12:44:11.495394662 +0300
-@@ -1271,6 +1271,11 @@
-   ;;
- esac
+--- php-5.4.0alpha2/configure.ac~      2011-08-07 12:43:31.000000000 +0300
++++ php-5.4.0alpha2/configure.ac       2011-08-07 12:44:11.495394662 +0300
+@@ -1271,6 +1271,9 @@
+   AC_DEFINE_UNQUOTED(PHP_BUILD_ARCH,"$PHP_BUILD_ARCH",[build architecture])
+ fi
  
-+# shift so that pcre, spl, ... are loaded first
++# shift so that extensions like xml are loaded first
 +PHP_MODULES=$(echo "$PHP_MODULES" | sed -e 's,\(.*\)\(\$(phplibdir)/xml.la \),\2\1,')
-+PHP_MODULES=$(echo "$PHP_MODULES" | sed -e 's,\(.*\)\(\$(phplibdir)/spl.la \),\2\1,')
-+PHP_MODULES=$(echo "$PHP_MODULES" | sed -e 's,\(.*\)\(\$(phplibdir)/pcre.la \),\2\1,')
 +
  PHP_SUBST_OLD(PHP_INSTALLED_SAPIS)
  
- PHP_SUBST(PHP_EXECUTABLE)
---- php-5.5.0alpha2/Makefile.global~   2013-01-02 15:26:29.000000000 +0200
-+++ php-5.5.0alpha2/Makefile.global    2013-01-02 15:29:53.064968422 +0200
-@@ -77,7 +77,8 @@
+ PHP_SUBST(PHP_FASTCGI_OBJS)
+--- php-5.5.11/build/Makefile.global   2014-04-27 15:05:38.963814051 +0300
++++ php-5.5.11/build/Makefile.global   2014-04-27 15:09:54.438443707 +0300
+@@ -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\ ]*='
- 
-@@ -118,7 +118,10 @@
++      fi; \
+       if test "x$(PHP_MODULES)" != "x"; then \
+               for i in $(PHP_MODULES)""; do \
+                       . $$i; $(top_srcdir)/build/shtool echo -n -- " -d extension=$$dlname"; \
+@@ -111,7 +118,9 @@
                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=$(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); \
                TEST_RESULT_EXIT_CODE=$$?; \
                rm $(top_builddir)/tmp-php.ini; \
                exit $$TEST_RESULT_EXIT_CODE; \
---- 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 \