summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoe Watkins <krakjoe@php.net>2017-02-03 05:55:29 +0000
committerJoe Watkins <krakjoe@php.net>2017-02-03 05:55:29 +0000
commit309d3daa39fa7df56bf958c69b2f3930dbcb780f (patch)
tree29e0e62a4987f097db72be59cbabeda866964b07
parent795a4c1bb384a7e0d56705d43e95b9bfcc3265b5 (diff)
parenta52afd27ab53ba94d0e3b0d95cbfe557eeb5bfbc (diff)
downloadphp-git-309d3daa39fa7df56bf958c69b2f3930dbcb780f.tar.gz
Merge branch 'PHP-7.1'
* PHP-7.1: increase wait time in timeout_variation_10.phpt by 1 second
-rw-r--r--tests/basic/timeout_variation_10.phpt2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/basic/timeout_variation_10.phpt b/tests/basic/timeout_variation_10.phpt
index 158119e62f..373be27b3d 100644
--- a/tests/basic/timeout_variation_10.phpt
+++ b/tests/basic/timeout_variation_10.phpt
@@ -14,7 +14,7 @@ set_time_limit($t);
function f()
{
echo "call";
- busy_wait(4);
+ busy_wait(5);
}
register_shutdown_function("f");