Fix timout tests on travis when memcheks run

Author: pinepain

.travis.yml

@@ -26,6 +26,7 @@ before_install:
   - sudo apt-get install -y libv8-${V8}-dev
 
 before_script:
+  - echo 'variables_order = "EGPCS"' >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
   - phpize && ./configure && make
 
 script:

README.md

@@ -8,7 +8,7 @@ PHP extension for V8 JavaScript engine
 
 
 ## Developers note
-
+ - to be able to customize some tests make sure you have `` in your php.ini
  - `export DEV_TESTS=1` allows to run tests that made for development reason (e.g. test some weird behavior or for debugging)
  - To prevent asking test suite to send results to PHP QA team do `export NO_INTERACTION=1`
 

tests/V8Isolate_limit_time.phpt

@@ -25,7 +25,20 @@ $file_name = 'test.js';
 
 $script = new v8\Script($context, new \v8\StringValue($isolate, $source), new \v8\ScriptOrigin($file_name));
 
-$time_limit = 1.5;
+// NOTE: this check is a bit fragile but should fits our need
+$needs_more_time = isset($_ENV['TRAVIS']) && isset($_ENV['TEST_PHP_ARGS']) && $_ENV['TEST_PHP_ARGS'] == '-m';
+
+if ($needs_more_time) {
+  // On travis when valgrind active it takes more time to complete all operations so we just increase initial limits
+  $time_limit = 5.0;
+  $low_range = 4.5;
+  $high_range = 7.5;
+} else {
+  $time_limit = 1.5;
+  $low_range = 1.45;
+  $high_range = 1.6;
+}
+
 $helper->assert('Time limit accessor report no hit', false === $isolate->IsTimeLimitHit());
 $helper->assert('Get time limit default value is zero', 0.0 === $isolate->GetTimeLimit());
 $isolate->SetTimeLimit($time_limit);
@@ -44,7 +57,7 @@ try {
   $helper->line();
   $t = microtime(true) - $t;
   $helper->dump(round($t, 9));
-  $helper->assert('Script execution time is between 1.500 and 1.600', $t >= 1.500 && $t < 1.599);
+  $helper->assert("Script execution time is within specified range ({$low_range}, {$high_range})", $t >= $low_range && $t < $high_range);
 }
 
 $helper->assert('Get time limit returns valid value', $time_limit === $isolate->GetTimeLimit());
@@ -61,7 +74,7 @@ object(v8\Isolate)#3 (5) {
   ["snapshot":"v8\Isolate":private]=>
   NULL
   ["time_limit":"v8\Isolate":private]=>
-  float(1.5)
+  float(%f)
   ["time_limit_hit":"v8\Isolate":private]=>
   bool(false)
   ["memory_limit":"v8\Isolate":private]=>
@@ -73,16 +86,16 @@ object(v8\Isolate)#3 (5) {
 v8\Exceptions\TimeLimitException: Time limit exceeded
 script execution terminated
 
-float(1.5%d)
-Script execution time is between 1.500 and 1.600: ok
+float(%f)
+Script execution time is within specified range (%f, %f): ok
 Get time limit returns valid value: ok
 Time limit accessor report hit: ok
 
 object(v8\Isolate)#3 (5) {
   ["snapshot":"v8\Isolate":private]=>
   NULL
   ["time_limit":"v8\Isolate":private]=>
-  float(1.5)
+  float(%f)
   ["time_limit_hit":"v8\Isolate":private]=>
   bool(true)
   ["memory_limit":"v8\Isolate":private]=>

tests/V8Isolate_limit_time_nested.phpt

@@ -57,7 +57,21 @@ $file_name1 = 'test.js';
 
 $script1 = new v8\Script($context1, new \v8\StringValue($isolate1, $source1), new \v8\ScriptOrigin($file_name1));
 
-$isolate1->SetTimeLimit(1.5);
+// NOTE: this check is a bit fragile but should fits our need
+$needs_more_time = isset($_ENV['TRAVIS']) && isset($_ENV['TEST_PHP_ARGS']) && $_ENV['TEST_PHP_ARGS'] == '-m';
+
+if ($needs_more_time) {
+    // On travis when valgrind active it takes more time to complete all operations so we just increase initial limits
+    $time_limit = 5.0;
+    $low_range = 4.5;
+    $high_range = 7.5;
+} else {
+    $time_limit = 1.5;
+    $low_range = 1.45;
+    $high_range = 1.6;
+}
+
+$isolate1->SetTimeLimit($time_limit);
 $helper->dump($isolate1);
 $helper->line();
 
@@ -71,7 +85,7 @@ try {
     $helper->line();
     $t = microtime(true) - $t;
     $helper->dump(round($t, 9));
-    $helper->assert('Script execution time is between 1.500 and 1.600', $t >= 1.500 && $t < 1.599);
+    $helper->assert("Script execution time is within specified range ({$low_range}, {$high_range})", $t >= $low_range && $t < $high_range);
 }
 
 $helper->line();
@@ -82,7 +96,7 @@ object(v8\Isolate)#2 (5) {
   ["snapshot":"v8\Isolate":private]=>
   NULL
   ["time_limit":"v8\Isolate":private]=>
-  float(1.5)
+  float(%f)
   ["time_limit_hit":"v8\Isolate":private]=>
   bool(false)
   ["memory_limit":"v8\Isolate":private]=>
@@ -100,14 +114,14 @@ function call terminated
 v8\Exceptions\TimeLimitException: Time limit exceeded
 script execution terminated
 
-float(1.5%d)
-Script execution time is between 1.500 and 1.600: ok
+float(%f)
+Script execution time is within specified range (%f, %f): ok
 
 object(v8\Isolate)#2 (5) {
   ["snapshot":"v8\Isolate":private]=>
   NULL
   ["time_limit":"v8\Isolate":private]=>
-  float(1.5)
+  float(%f)
   ["time_limit_hit":"v8\Isolate":private]=>
   bool(true)
   ["memory_limit":"v8\Isolate":private]=>

tests/V8Isolate_limit_time_not_hit.phpt

@@ -60,7 +60,7 @@ object(v8\Isolate)#3 (5) {
   ["snapshot":"v8\Isolate":private]=>
   NULL
   ["time_limit":"v8\Isolate":private]=>
-  float(1.5)
+  float(%f)
   ["time_limit_hit":"v8\Isolate":private]=>
   bool(false)
   ["memory_limit":"v8\Isolate":private]=>
@@ -81,7 +81,7 @@ object(v8\Isolate)#3 (5) {
   ["snapshot":"v8\Isolate":private]=>
   NULL
   ["time_limit":"v8\Isolate":private]=>
-  float(1.5)
+  float(%f)
   ["time_limit_hit":"v8\Isolate":private]=>
   bool(false)
   ["memory_limit":"v8\Isolate":private]=>

tests/V8Isolate_limit_time_set_during_execution.phpt

@@ -17,9 +17,23 @@ $global_template1 = new v8\ObjectTemplate($isolate1);
 
 $context1 = new v8\Context($isolate1, $extensions1, $global_template1);
 
-$func = new v8\FunctionObject($context1, function (\v8\FunctionCallbackInfo $info) use (&$helper) {
+// NOTE: this check is a bit fragile but should fits our need
+$needs_more_time = isset($_ENV['TRAVIS']) && isset($_ENV['TEST_PHP_ARGS']) && $_ENV['TEST_PHP_ARGS'] == '-m';
+
+if ($needs_more_time) {
+    // On travis when valgrind active it takes more time to complete all operations so we just increase initial limits
+    $time_limit = 5.0;
+    $low_range = 4.5;
+    $high_range = 7.5;
+} else {
+    $time_limit = 1.5;
+    $low_range = 1.45;
+    $high_range = 1.6;
+}
+
+$func = new v8\FunctionObject($context1, function (\v8\FunctionCallbackInfo $info) use (&$helper, $time_limit) {
     $isolate = $info->GetIsolate();
-    $isolate->SetTimeLimit(1.5);
+    $isolate->SetTimeLimit($time_limit);
 });
 
 
@@ -46,7 +60,7 @@ try {
     $helper->line();
     $t = microtime(true) - $t;
     $helper->dump(round($t, 9));
-    $helper->assert('Script execution time is between 1.500 and 1.600', $t >= 1.500 && $t < 1.599);
+    $helper->assert("Script execution time is within specified range ({$low_range}, {$high_range})", $t >= $low_range && $t < $high_range);
 }
 
 $helper->line();
@@ -70,14 +84,14 @@ object(v8\Isolate)#2 (5) {
 v8\Exceptions\TimeLimitException: Time limit exceeded
 script execution terminated
 
-float(1.5%d)
-Script execution time is between 1.500 and 1.600: ok
+float(%f)
+Script execution time is within specified range (%f, %f): ok
 
 object(v8\Isolate)#2 (5) {
   ["snapshot":"v8\Isolate":private]=>
   NULL
   ["time_limit":"v8\Isolate":private]=>
-  float(1.5)
+  float(%f)
   ["time_limit_hit":"v8\Isolate":private]=>
   bool(true)
   ["memory_limit":"v8\Isolate":private]=>