Merge branch 'PHP-7.1'

remicollet · remicollet · commit 18293f9a6fe1 · 2017-02-28T11:36:42.000+01:00
* PHP-7.1:
  make test slower again
diff --git 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
