[test] Increase timeout for full debug and predictable

Bug: v8:9145 Change-Id: Idb1a838666ea21cb260a141929fd80b400913836 Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/1596731 Reviewed-by: Tamer Tas <[email protected]> Commit-Queue: Michael Achenbach <[email protected]> Cr-Commit-Position: refs/heads/master@{#61262}
zzuhit · May 7, 2019 · c1e08aa · c1e08aa
1 parent 17e7cf5
commit c1e08aa
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 1 deletion.
diff --git a/BUILD.gn b/BUILD.gn
@@ -1291,6 +1291,7 @@ action("v8_dump_build_config") {
     "$root_out_dir/v8_build_config.json",
   ]
   is_gcov_coverage = v8_code_coverage && !is_clang
+  is_full_debug = v8_enable_debugging_features && !v8_optimized_debug
   args = [
     rebase_path("$root_out_dir/v8_build_config.json", root_build_dir),
     "current_cpu=\"$current_cpu\"",
@@ -1301,6 +1302,7 @@ action("v8_dump_build_config") {
     "is_clang=$is_clang",
     "is_component_build=$is_component_build",
     "is_debug=$v8_enable_debugging_features",
+    "is_full_debug=$is_full_debug",
     "is_gcov_coverage=$is_gcov_coverage",
     "is_msan=$is_msan",
     "is_tsan=$is_tsan",

diff --git a/tools/testrunner/base_runner.py b/tools/testrunner/base_runner.py
@@ -185,6 +185,7 @@ def __init__(self, build_config):
     self.is_android = build_config['is_android']
     self.is_clang = build_config['is_clang']
     self.is_debug = build_config['is_debug']
+    self.is_full_debug = build_config['is_full_debug']
     self.msan = build_config['is_msan']
     self.no_i18n = not build_config['v8_enable_i18n_support']
     self.no_snap = not build_config['v8_use_snapshot']
@@ -722,9 +723,11 @@ def _timeout_scalefactor(self, options):
     if self.build_config.lite_mode:
       factor *= 2
     if self.build_config.predictable:
-      factor *= 2.5
+      factor *= 3
     if self.build_config.use_sanitizer:
       factor *= 1.5
+    if self.build_config.is_full_debug:
+      factor *= 2
 
     return factor
 

diff --git a/tools/unittests/testdata/testroot1/v8_build_config.json b/tools/unittests/testdata/testroot1/v8_build_config.json
@@ -7,6 +7,7 @@
   "is_clang": true,
   "is_component_build": false,
   "is_debug": false,
+  "is_full_debug": false,
   "is_gcov_coverage": false,
   "is_ubsan_vptr": false,
   "is_msan": false,

diff --git a/tools/unittests/testdata/testroot2/v8_build_config.json b/tools/unittests/testdata/testroot2/v8_build_config.json
@@ -7,6 +7,7 @@
   "is_clang": true,
   "is_component_build": false,
   "is_debug": false,
+  "is_full_debug": false,
   "is_gcov_coverage": false,
   "is_ubsan_vptr": false,
   "is_msan": false,