ensure make test fails like other php branches

diff --git a/fix-test-run.patch b/fix-test-run.patch
index 2231d77977dc3288c23d9f95a8fa3a1b68e181b8..7cd0ee9610ba6bcd8a95888320c2bcfe28682350 100644 (file)
--- a/fix-test-run.patch
+++ b/fix-test-run.patch
@@ -13,7 +13,7 @@
  PHP_SUBST(PHP_ZEND_EX)
  
 --- 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
++++ php-5.2.17/Makefile.global 2016-11-23 04:44:22.853127691 +0200
 @@ -77,7 +77,8 @@
                done; \
        fi
@@ -24,7 +24,7 @@
  PHP_TEST_SHARED_EXTENSIONS =  ` \
        if test "x$(PHP_MODULES)" != "x"; then \
                for i in $(PHP_MODULES)""; do \
-@@ -88,6 +89,12 @@
+@@ -88,10 +89,16 @@
                for i in $(PHP_ZEND_EX)""; do \
                        . $$i; $(top_srcdir)/build/shtool echo -n -- " -d $(ZEND_EXT_TYPE)=$(top_builddir)/modules/$$dlname"; \
                done; \
@@ -35,8 +35,13 @@
 +                      $(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\ ]*='
  
+ 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) -v '^(zend_)?extension(_debug)?(_ts)?[\t\ ]*=' "$$INI_FILE" > $(top_builddir)/tmp-php.ini; \
 @@ -320,7 +327,10 @@
                TEST_PHP_EXECUTABLE=$(PHP_EXECUTABLE) \
                TEST_PHP_SRCDIR=$(top_srcdir) \

diff --git a/php.spec b/php.spec
index 6e99b5dcb3812a431cf1f206d6fd0d21c18a1c2e..0f23297a62e60d7ea36a207898d2c9d026fe4401 100644 (file)
--- a/php.spec
+++ b/php.spec
@@ -112,7 +112,7 @@ ERROR: You need to select at least one Apache SAPI to build shared modules.
 %define                magic_mime      /usr/share/misc/magic.mime
 %endif
 
-%define                rel     21
+%define                rel     22
 %define                orgname php
 %define                ver_suffix 52
 %define                php_suffix %{!?with_default_php:%{ver_suffix}}