com php-src: test fixes + added skipif for slow tests: tests/basic/timeout_config.inc tests/basic/timeout_vari ation_0.phpt
tests/basic/timeout_variation_1.ph pt tests/basic/timeout_variation_10.phpt tests/ba sic/timeout_variation_2.phpt tests/basic/timeout_va
riation_3.phpt tests/basic/timeout_variation_4. phpt tests/basic/timeout_variation_5.phpt tests/bas ic/timeout_variation_6.phpt
tests/basic/timeout_var iation_7.phpt tests/basic/timeout_variation_

Commit: fd51bd4a9efec93c8a400d0059af821671012c67 Author: Anatol Belski <ab@php.net> Mon, 16 Mar 2015 13:55:40 -0700 Parents: 042dd8602e114253bddbd10a6df6c7bf24b3d7e5 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=fd51bd4a9efec93c8a400d0059af821671012c67 Log: test fixes + added skipif for slow tests Changed paths: M tests/basic/timeout_config.inc M tests/basic/timeout_variation_0.phpt M tests/basic/timeout_variation_1.phpt M tests/basic/timeout_variation_10.phpt M tests/basic/timeout_variation_2.phpt M tests/basic/timeout_variation_3.phpt M tests/basic/timeout_variation_4.phpt M tests/basic/timeout_variation_5.phpt M tests/basic/timeout_variation_6.phpt M tests/basic/timeout_variation_7.phpt M tests/basic/timeout_variation_8.phpt M tests/basic/timeout_variation_9.phpt Diff: diff --git a/tests/basic/timeout_config.inc b/tests/basic/timeout_config.inc index e9a6c60..18a00b2 100644 --- a/tests/basic/timeout_config.inc +++ b/tests/basic/timeout_config.inc @@ -2,10 +2,10 @@ $t = 3; -function busy_sleep($how_long) +function busy_wait($how_long) { - $now = time(); + $until = time() + $how_long; - while($now + $how_long > time()); + while ($until > time()); } diff --git a/tests/basic/timeout_variation_0.phpt b/tests/basic/timeout_variation_0.phpt index 51670d5..6e7ef15 100644 --- a/tests/basic/timeout_variation_0.phpt +++ b/tests/basic/timeout_variation_0.phpt @@ -1,19 +1,22 @@ --TEST-- Timeout within while loop +--SKIPIF-- +<?php + if (getenv("SKIP_SLOW_TESTS")) die("skip slow test"); +?> --FILE-- <?php include dirname(__FILE__) . DIRECTORY_SEPARATOR . "timeout_config.inc"; +$t = 3; set_time_limit($t); -while(1) { - echo 1; - busy_sleep(1); +while (1) { + busy_wait(1); } ?> never reached here --EXPECTF-- -111 Fatal error: Maximum execution time of 3 seconds exceeded in %s on line %d diff --git a/tests/basic/timeout_variation_1.phpt b/tests/basic/timeout_variation_1.phpt index 3f2d238..4245d0b 100644 --- a/tests/basic/timeout_variation_1.phpt +++ b/tests/basic/timeout_variation_1.phpt @@ -1,5 +1,9 @@ --TEST-- Timeout within function +--SKIPIF-- +<?php + if (getenv("SKIP_SLOW_TESTS")) die("skip slow test"); +?> --FILE-- <?php @@ -10,7 +14,7 @@ set_time_limit($t); function hello ($t) { echo "call"; - busy_sleep($t*2); + busy_wait($t*2); } hello($t); diff --git a/tests/basic/timeout_variation_10.phpt b/tests/basic/timeout_variation_10.phpt index edfb712..b3d533d 100644 --- a/tests/basic/timeout_variation_10.phpt +++ b/tests/basic/timeout_variation_10.phpt @@ -1,5 +1,9 @@ --TEST-- Timeout within shutdown function, variation +--SKIPIF-- +<?php + if (getenv("SKIP_SLOW_TESTS")) die("skip slow test"); +?> --FILE-- <?php @@ -11,7 +15,7 @@ set_time_limit($t); function f() { echo "call"; - busy_sleep(4); + busy_wait(4); } register_shutdown_function("f"); diff --git a/tests/basic/timeout_variation_2.phpt b/tests/basic/timeout_variation_2.phpt index 74da955..e591fc5 100644 --- a/tests/basic/timeout_variation_2.phpt +++ b/tests/basic/timeout_variation_2.phpt @@ -1,5 +1,9 @@ --TEST-- Timeout within array_walk +--SKIPIF-- +<?php + if (getenv("SKIP_SLOW_TESTS")) die("skip slow test"); +?> --FILE-- <?php @@ -10,8 +14,7 @@ set_time_limit($t); function cb(&$i, $k, $p) { - echo 1; - busy_sleep(1); + busy_wait(1); } $a = array(1 => 1, 2 => 1, 3 => 1, 4 => 1, 5 => 1, 6 => 1, 7 => 1); @@ -20,5 +23,4 @@ array_walk($a, "cb", "junk"); ?> never reached here --EXPECTF-- -111 Fatal error: Maximum execution time of 3 seconds exceeded in %s on line %d diff --git a/tests/basic/timeout_variation_3.phpt b/tests/basic/timeout_variation_3.phpt index 0c4b9e8..7bff096 100644 --- a/tests/basic/timeout_variation_3.phpt +++ b/tests/basic/timeout_variation_3.phpt @@ -1,5 +1,9 @@ --TEST-- Timeout within eval +--SKIPIF-- +<?php + if (getenv("SKIP_SLOW_TESTS")) die("skip slow test"); +?> --FILE-- <?php @@ -10,7 +14,7 @@ set_time_limit($t); function hello ($t) { echo "call", PHP_EOL; - busy_sleep($t*2); + busy_wait($t*2); } eval('hello($t);'); diff --git a/tests/basic/timeout_variation_4.phpt b/tests/basic/timeout_variation_4.phpt index 102b92a..6fccce8 100644 --- a/tests/basic/timeout_variation_4.phpt +++ b/tests/basic/timeout_variation_4.phpt @@ -1,5 +1,9 @@ --TEST-- Timeout within call_user_func +--SKIPIF-- +<?php + if (getenv("SKIP_SLOW_TESTS")) die("skip slow test"); +?> --FILE-- <?php @@ -10,7 +14,7 @@ set_time_limit($t); function hello ($t) { echo "call", PHP_EOL; - busy_sleep($t*2); + busy_wait($t*2); } call_user_func('hello', $t); diff --git a/tests/basic/timeout_variation_5.phpt b/tests/basic/timeout_variation_5.phpt index 38dde0d..493c31c 100644 --- a/tests/basic/timeout_variation_5.phpt +++ b/tests/basic/timeout_variation_5.phpt @@ -1,5 +1,9 @@ --TEST-- Timeout within function containing exteption +--SKIPIF-- +<?php + if (getenv("SKIP_SLOW_TESTS")) die("skip slow test"); +?> --FILE-- <?php @@ -10,7 +14,7 @@ set_time_limit($t); function f($t) { echo "call"; - busy_sleep($t*2); + busy_wait($t*2); throw new Exception("never reached here"); } diff --git a/tests/basic/timeout_variation_6.phpt b/tests/basic/timeout_variation_6.phpt index 355354f..70c8394 100644 --- a/tests/basic/timeout_variation_6.phpt +++ b/tests/basic/timeout_variation_6.phpt @@ -1,5 +1,9 @@ --TEST-- Timeout within function trowing exteption before timeout reached +--SKIPIF-- +<?php + if (getenv("SKIP_SLOW_TESTS")) die("skip slow test"); +?> --FILE-- <?php @@ -10,7 +14,7 @@ set_time_limit($t); function f($t) { echo "call"; - busy_sleep($t-1); + busy_wait($t-1); throw new Exception("exception before timeout"); } diff --git a/tests/basic/timeout_variation_7.phpt b/tests/basic/timeout_variation_7.phpt index 5ae8e07..9dfed20 100644 --- a/tests/basic/timeout_variation_7.phpt +++ b/tests/basic/timeout_variation_7.phpt @@ -1,5 +1,9 @@ --TEST-- Timeout within for loop +--SKIPIF-- +<?php + if (getenv("SKIP_SLOW_TESTS")) die("skip slow test"); +?> --FILE-- <?php @@ -8,13 +12,11 @@ include dirname(__FILE__) . DIRECTORY_SEPARATOR . "timeout_config.inc"; $t = 3; set_time_limit($t); -for($i = 0; $i < 42; $i++) { - echo 1; - busy_sleep(1); +for ($i = 0; $i < 42; $i++) { + busy_wait(1); } ?> never reached here --EXPECTF-- -111 Fatal error: Maximum execution time of 3 seconds exceeded in %s on line %d diff --git a/tests/basic/timeout_variation_8.phpt b/tests/basic/timeout_variation_8.phpt index 25a208c...ab3724e 100644 --- a/tests/basic/timeout_variation_8.phpt +++ b/tests/basic/timeout_variation_8.phpt @@ -1,20 +1,22 @@ --TEST-- Timeout within foreach loop +--SKIPIF-- +<?php + if (getenv("SKIP_SLOW_TESTS")) die("skip slow test"); +?> --FILE-- <?php +$t = 3; include dirname(__FILE__) . DIRECTORY_SEPARATOR . "timeout_config.inc"; -$t = 3; set_time_limit($t); -foreach(range(0, 42) as $i) { - echo 1; - busy_sleep(1); +foreach (range(0, 42) as $i) { + busy_wait(1); } ?> never reached here --EXPECTF-- -111 Fatal error: Maximum execution time of 3 seconds exceeded in %s on line %d diff --git a/tests/basic/timeout_variation_9.phpt b/tests/basic/timeout_variation_9.phpt index 520b0ee..003cd05 100644 --- a/tests/basic/timeout_variation_9.phpt +++ b/tests/basic/timeout_variation_9.phpt @@ -1,5 +1,9 @@ --TEST-- Timeout within shutdown function +--SKIPIF-- +<?php + if (getenv("SKIP_SLOW_TESTS")) die("skip slow test"); +?> --FILE-- <?php @@ -11,7 +15,7 @@ set_time_limit($t); function f() { echo "call"; - busy_sleep(4); + busy_wait(4); } register_shutdown_function("f");