From 48d4a4bdca7d565e2d8aad7008876a1230ba1d13 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Elan=20Ruusam=C3=A4e?= <glen@delfi.ee>
Date: Wed, 21 Jan 2015 15:06:19 +0200
Subject: [PATCH] make tests fail by default

same change also in upstream:
https://github.com/php/php-src/commit/180767373d03238431103c02a93de19df49c14dc
---
 fix-test-run.patch | 13 +++++++++++--
 php.spec           |  2 +-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/fix-test-run.patch b/fix-test-run.patch
index 4e48667..15f3d3b 100644
--- a/fix-test-run.patch
+++ b/fix-test-run.patch
@@ -12,8 +12,8 @@
  PHP_SUBST(PHP_MODULES)
  PHP_SUBST(PHP_ZEND_EX)
  
---- php-5.3.29/Makefile.global	2014-08-19 17:47:47.112627301 +0300
-+++ php-5.3.29/Makefile.global	2014-11-23 04:22:05.601031944 +0200
+--- php-5.3.29/Makefile.global	2014-11-23 04:22:05.601031944 +0200
++++ php-5.3.29/Makefile.global	2015-01-21 15:04:38.046113239 +0200
 @@ -77,8 +77,15 @@
  		done; \
  	fi
@@ -31,6 +31,15 @@
  	if test "x$(PHP_MODULES)" != "x"; then \
  		for i in $(PHP_MODULES)""; do \
  			. $$i; $(top_srcdir)/build/shtool echo -n -- " -d extension=$$dlname"; \
+@@ -92,7 +99,7 @@
+ 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) -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) \
diff --git a/php.spec b/php.spec
index 1b43aa9..713436f 100644
--- a/php.spec
+++ b/php.spec
@@ -119,7 +119,7 @@ ERROR: You need to select at least one Apache SAPI to build shared modules.
 %endif
 %endif
 
-%define		rel	5
+%define		rel	6
 %define		orgname	php
 %define		ver_suffix 53
 %define		php_suffix %{!?with_default_php:%{ver_suffix}}
-- 
2.44.0