diff options
| author | Remi Collet <fedora@famillecollet.com> | 2017-02-28 13:03:15 +0100 |
|---|---|---|
| committer | Remi Collet <fedora@famillecollet.com> | 2017-02-28 13:03:15 +0100 |
| commit | b9c8ca3b0b109e0e1c32ad47cc6ef2f3e200c54c (patch) | |
| tree | 2478d11100e2a0b59989c576876e4fbe979ee9f8 /php-upstream.patch | |
| parent | 1b50f87d488a5080797544ca6be22c47b0d58212 (diff) | |
PHP 7.1.3RC1
Diffstat (limited to 'php-upstream.patch')
| -rw-r--r-- | php-upstream.patch | 57 |
1 files changed, 57 insertions, 0 deletions
diff --git a/php-upstream.patch b/php-upstream.patch new file mode 100644 index 0000000..c1e0abf --- /dev/null +++ b/php-upstream.patch @@ -0,0 +1,57 @@ +From 3006d1de5b1b2903af3ad1e8c72c3cfe6cd1af15 Mon Sep 17 00:00:00 2001 +From: Remi Collet <remi@php.net> +Date: Tue, 28 Feb 2017 11:36:24 +0100 +Subject: [PATCH] make test slower again + +--- + Zend/tests/bug74093.phpt | 40 ++++++++++++++++++++-------------------- + 1 file changed, 20 insertions(+), 20 deletions(-) + +diff --git a/Zend/tests/bug74093.phpt b/Zend/tests/bug74093.phpt +index 22c78a6..7f20285 100644 +--- a/Zend/tests/bug74093.phpt ++++ b/Zend/tests/bug74093.phpt +@@ -1,20 +1,20 @@ +---TEST--
+-Bug #74093 (Maximum execution time of n+2 seconds exceed not written in error_log)
+---SKIPIF--
+-<?php
+-if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
+-if (PHP_ZTS) die("skip only for no-zts build");
+-if (substr(PHP_OS, 0, 3) == 'WIN') die("skip not for Windows");
+-?>
+---INI--
+-memory_limit=1G
+-max_execution_time=1
+-hard_timeout=1
+---FILE--
+-<?php
+-$a1 = range(1, 1000000);
+-$a2 = range(100000, 999999);
+-array_intersect($a1, $a2);
+-?>
+---EXPECTF--
+-Fatal error: Maximum execution time of 1+1 seconds exceeded %s
++--TEST-- ++Bug #74093 (Maximum execution time of n+2 seconds exceed not written in error_log) ++--SKIPIF-- ++<?php ++if (getenv("SKIP_SLOW_TESTS")) die("skip slow test"); ++if (PHP_ZTS) die("skip only for no-zts build"); ++if (substr(PHP_OS, 0, 3) == 'WIN') die("skip not for Windows"); ++?> ++--INI-- ++memory_limit=1G ++max_execution_time=1 ++hard_timeout=1 ++--FILE-- ++<?php ++$a1 = range(1, 1000000); ++$a2 = range(100000, 1999999); ++array_intersect($a1, $a2); ++?> ++--EXPECTF-- ++Fatal error: Maximum execution time of 1+1 seconds exceeded %s +-- +2.1.4 + |