diff options
author | Christopher Jones <christopher.jones@oracle.com> | 2015-08-26 21:24:05 +1000 |
---|---|---|
committer | Christopher Jones <christopher.jones@oracle.com> | 2015-08-26 21:24:05 +1000 |
commit | 22ad36428aadc16c6a02ce463015fbf9eac44b59 (patch) | |
tree | 21af8192f11ff7ed377889166034a5e9fdf0fbce | |
parent | a52902faf48d3d634e712961c4226dea24f402c7 (diff) | |
parent | 91712c35f8681c0764ca0969fef31b350df548aa (diff) | |
download | php-git-22ad36428aadc16c6a02ce463015fbf9eac44b59.tar.gz |
Merge branch 'master' of https://git.php.net/repository/php-src
-rw-r--r-- | tests/basic/timeout_variation_5.phpt | 2 | ||||
-rw-r--r-- | tests/basic/timeout_variation_6.phpt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/basic/timeout_variation_5.phpt b/tests/basic/timeout_variation_5.phpt index a6836c5a2e..1c28c00ac9 100644 --- a/tests/basic/timeout_variation_5.phpt +++ b/tests/basic/timeout_variation_5.phpt @@ -1,5 +1,5 @@ --TEST-- -Timeout within function containing exteption +Timeout within function containing exception --SKIPIF-- <?php if (getenv("SKIP_SLOW_TESTS")) die("skip slow test"); diff --git a/tests/basic/timeout_variation_6.phpt b/tests/basic/timeout_variation_6.phpt index d3d843ca86..fb3c3a7aca 100644 --- a/tests/basic/timeout_variation_6.phpt +++ b/tests/basic/timeout_variation_6.phpt @@ -1,5 +1,5 @@ --TEST-- -Timeout within function trowing exteption before timeout reached +Timeout within function trowing exception before timeout reached --SKIPIF-- <?php if (getenv("SKIP_SLOW_TESTS")) die("skip slow test"); |