diff options
| author | Joe Watkins <krakjoe@php.net> | 2017-02-03 05:55:16 +0000 |
|---|---|---|
| committer | Joe Watkins <krakjoe@php.net> | 2017-02-03 05:55:16 +0000 |
| commit | a52afd27ab53ba94d0e3b0d95cbfe557eeb5bfbc (patch) | |
| tree | fad61f1424cc016aaaa3abaa23d5939caf9ab5b1 /tests | |
| parent | e81f30ad1d003c5250b1025c963ed0a178d4c51a (diff) | |
| parent | 25271feeb0ab55fef89d4b7388277be06b21856d (diff) | |
| download | php-git-a52afd27ab53ba94d0e3b0d95cbfe557eeb5bfbc.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
increase wait time in timeout_variation_10.phpt by 1 second
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/basic/timeout_variation_10.phpt | 2 |
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"); |