summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikita Popov <nikic@php.net>2016-12-21 21:28:29 +0100
committerNikita Popov <nikic@php.net>2016-12-21 21:28:29 +0100
commit06699abffbee5d1466460bfa9e40e2759fb283f2 (patch)
treea9ea97e392925a6e0bb4141ec88912ba6e2c5454
parent9afc61c21484a5747d7dc7e0387ef61000d840e3 (diff)
parentc41826d1e626962621805eab650b1fcc2f1f49d8 (diff)
downloadphp-git-06699abffbee5d1466460bfa9e40e2759fb283f2.tar.gz
Merge branch 'PHP-7.0' into PHP-7.1
-rw-r--r--Zend/tests/concat_003.phpt6
1 files changed, 3 insertions, 3 deletions
diff --git a/Zend/tests/concat_003.phpt b/Zend/tests/concat_003.phpt
index 07fabd1113..53d8d2f9a4 100644
--- a/Zend/tests/concat_003.phpt
+++ b/Zend/tests/concat_003.phpt
@@ -13,8 +13,8 @@ memory_limit=256m
$time = microtime(TRUE);
/* This might vary on Linux/Windows, so the worst case and also count in slow machines. */
-$t0_max = 0.1;
-$t1_max = 0.4;
+$t0_max = 0.3;
+$t1_max = 1.0;
$datas = [];
for ($i = 0; $i < 220000; $i++)
@@ -34,7 +34,7 @@ for ($i = 0; $i < 220000; $i++)
$t0 = microtime(TRUE) - $time;
var_dump($t0 < $t0_max);
-
+$time = microtime(TRUE);
$texts = '';
foreach ($datas AS $data)
{