Commit 393f788c authored by Michael Achenbach's avatar Michael Achenbach Committed by Commit Bot

Reland "[test] Remove longer timeout on bots"

This is a reland of e632f8f4

Original change's description:
> [test] Remove longer timeout on bots
>
> CQ_INCLUDE_TRYBOTS=luci.v8.try:v8_linux_gc_stress_dbg
> CQ_INCLUDE_TRYBOTS=luci.v8.try:v8_linux_gcc_rel
> CQ_INCLUDE_TRYBOTS=luci.v8.try:v8_linux64_msan_rel
> CQ_INCLUDE_TRYBOTS=luci.v8.try:v8_linux64_tsan_rel
> CQ_INCLUDE_TRYBOTS=luci.v8.try:v8_linux_arm64_dbg
> CQ_INCLUDE_TRYBOTS=luci.v8.try:v8_mac64_asan_rel
> CQ_INCLUDE_TRYBOTS=luci.v8.try:v8_win64_dbg
> CQ_INCLUDE_TRYBOTS=luci.v8.try:v8_android_arm64_n5x_rel_ng
> CQ_INCLUDE_TRYBOTS=luci.v8.try:v8_linux64_cfi_rel_ng
> CQ_INCLUDE_TRYBOTS=luci.v8.try:v8_linux64_ubsan_rel_ng
> CQ_INCLUDE_TRYBOTS=luci.v8.try:v8_linux_arm_lite_rel_ng
> CQ_INCLUDE_TRYBOTS=luci.v8.try:v8_linux_noi18n_rel_ng
> CQ_INCLUDE_TRYBOTS=luci.v8.try:v8_mac64_dbg_ng
>
> Bug: v8:9145
> Change-Id: I6efee8579d9d9e0aad0431f6b87c152141d4ec7f
> Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/1581261
> Commit-Queue: Michael Achenbach <machenbach@chromium.org>
> Reviewed-by: Tamer Tas <tmrts@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#61107}

Bug: v8:9145
Change-Id: Id8f0468bbf2d67f62141e7f7c42417d351c3fffa
Cq-Include-Trybots: luci.v8.try:v8_linux_gc_stress_dbg
Cq-Include-Trybots: luci.v8.try:v8_linux_gcc_rel
Cq-Include-Trybots: luci.v8.try:v8_linux64_msan_rel
Cq-Include-Trybots: luci.v8.try:v8_linux64_tsan_rel
Cq-Include-Trybots: luci.v8.try:v8_linux_arm64_dbg
Cq-Include-Trybots: luci.v8.try:v8_mac64_asan_rel
Cq-Include-Trybots: luci.v8.try:v8_win64_dbg
Cq-Include-Trybots: luci.v8.try:v8_android_arm64_n5x_rel_ng
Cq-Include-Trybots: luci.v8.try:v8_linux64_cfi_rel_ng
Cq-Include-Trybots: luci.v8.try:v8_linux64_ubsan_rel_ng
Cq-Include-Trybots: luci.v8.try:v8_linux_arm_lite_rel_ng
Cq-Include-Trybots: luci.v8.try:v8_linux_noi18n_rel_ng
Cq-Include-Trybots: luci.v8.try:v8_mac64_dbg_ng
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/1588429Reviewed-by: 's avatarTamer Tas <tmrts@chromium.org>
Commit-Queue: Michael Achenbach <machenbach@chromium.org>
Cr-Commit-Position: refs/heads/master@{#61167}
parent 611a0d19
...@@ -164,6 +164,7 @@ ...@@ -164,6 +164,7 @@
# Slow tests. # Slow tests.
'copy-on-write-assert': [PASS, SLOW], 'copy-on-write-assert': [PASS, SLOW],
'es6/typedarray-construct-offset-not-smi': [PASS, SLOW], 'es6/typedarray-construct-offset-not-smi': [PASS, SLOW],
'harmony/futex': [PASS, SLOW],
'harmony/regexp-property-script-extensions': [PASS, SLOW], 'harmony/regexp-property-script-extensions': [PASS, SLOW],
'md5': [PASS, SLOW], 'md5': [PASS, SLOW],
'numops-fuzz-part*': [PASS, ['mode == debug', SLOW]], 'numops-fuzz-part*': [PASS, ['mode == debug', SLOW]],
...@@ -309,6 +310,7 @@ ...@@ -309,6 +310,7 @@
# Slow tests. # Slow tests.
'array-constructor': [PASS, SLOW], 'array-constructor': [PASS, SLOW],
'json': [PASS, SLOW], 'json': [PASS, SLOW],
'large-object-literal-slow-elements': [PASS, SLOW],
# BUG(v8:4779): Crashes flakily with stress mode on arm64. # BUG(v8:4779): Crashes flakily with stress mode on arm64.
'array-splice': [PASS, SLOW, ['arch == arm64', NO_VARIANTS]], 'array-splice': [PASS, SLOW, ['arch == arm64', NO_VARIANTS]],
...@@ -561,10 +563,11 @@ ...@@ -561,10 +563,11 @@
# BUG(v8:6924). The test uses a lot of memory. # BUG(v8:6924). The test uses a lot of memory.
'regress/wasm/regress-694433': [SKIP], 'regress/wasm/regress-694433': [SKIP],
'es6/typedarray': [PASS, NO_VARIANTS], 'es6/typedarray': [PASS, NO_VARIANTS],
'regress/regress-752764': [PASS, NO_VARIANTS], 'regress/regress-752764': [PASS, SLOW, NO_VARIANTS],
# Slow tests. # Slow tests.
'es6/block-conflicts-sloppy': [PASS, SLOW], 'es6/block-conflicts-sloppy': [PASS, SLOW],
'math-floor-part1': [PASS, SLOW],
'regress/regress-500980': [PASS, SLOW], 'regress/regress-500980': [PASS, SLOW],
}], # 'tsan == True' }], # 'tsan == True'
......
...@@ -150,7 +150,7 @@ ...@@ -150,7 +150,7 @@
'js1_2/function/Number': [SKIP], 'js1_2/function/Number': [SKIP],
# TODO(2018): Might timeout in debug mode. # TODO(2018): Might timeout in debug mode.
'js1_5/GC/regress-203278-2': [PASS, ['mode == debug', NO_VARIANTS, FAIL]], 'js1_5/GC/regress-203278-2': [PASS, SLOW, ['mode == debug', NO_VARIANTS, FAIL]],
# These tests use invalid LHS expressions in assignments. # These tests use invalid LHS expressions in assignments.
'js1_5/Regress/regress-319391': [SKIP], 'js1_5/Regress/regress-319391': [SKIP],
...@@ -209,8 +209,8 @@ ...@@ -209,8 +209,8 @@
##################### FLAKY TESTS ##################### ##################### FLAKY TESTS #####################
# These tests time out in debug mode but pass in product mode # These tests time out in debug mode but pass in product mode
'js1_5/Regress/regress-360969-05': [PASS, ['mode == debug', NO_VARIANTS]], 'js1_5/Regress/regress-360969-05': [PASS, SLOW, ['mode == debug', NO_VARIANTS]],
'js1_5/Regress/regress-360969-06': [PASS, ['mode == debug', NO_VARIANTS]], 'js1_5/Regress/regress-360969-06': [PASS, SLOW, ['mode == debug', NO_VARIANTS]],
'js1_5/extensions/regress-365527': [PASS, SLOW, ['mode == debug', NO_VARIANTS]], 'js1_5/extensions/regress-365527': [PASS, SLOW, ['mode == debug', NO_VARIANTS]],
'js1_5/Regress/regress-280769-3': [PASS, ['mode == debug', FAIL]], 'js1_5/Regress/regress-280769-3': [PASS, ['mode == debug', FAIL]],
...@@ -712,7 +712,7 @@ ...@@ -712,7 +712,7 @@
# This test seems designed to fail (it produces a 700Mbyte string). # This test seems designed to fail (it produces a 700Mbyte string).
# We fail on out of memory. The important thing is not to crash. # We fail on out of memory. The important thing is not to crash.
'js1_5/Regress/regress-303213': [FAIL, ['mode == debug', NO_VARIANTS]], 'js1_5/Regress/regress-303213': [FAIL, SLOW, ['mode == debug', NO_VARIANTS]],
# This test fails since we now throw in String.prototype.match when apply # This test fails since we now throw in String.prototype.match when apply
# is given null or undefined as this argument (and so does firefox nightly). # is given null or undefined as this argument (and so does firefox nightly).
......
...@@ -190,6 +190,7 @@ class BuildConfig(object): ...@@ -190,6 +190,7 @@ class BuildConfig(object):
self.no_snap = not build_config['v8_use_snapshot'] self.no_snap = not build_config['v8_use_snapshot']
self.predictable = build_config['v8_enable_verify_predictable'] self.predictable = build_config['v8_enable_verify_predictable']
self.tsan = build_config['is_tsan'] self.tsan = build_config['is_tsan']
# TODO(machenbach): We only have ubsan not ubsan_vptr.
self.ubsan_vptr = build_config['is_ubsan_vptr'] self.ubsan_vptr = build_config['is_ubsan_vptr']
self.embedded_builtins = build_config['v8_enable_embedded_builtins'] self.embedded_builtins = build_config['v8_enable_embedded_builtins']
self.verify_csa = build_config['v8_enable_verify_csa'] self.verify_csa = build_config['v8_enable_verify_csa']
...@@ -200,6 +201,11 @@ class BuildConfig(object): ...@@ -200,6 +201,11 @@ class BuildConfig(object):
self.mips_arch_variant = build_config['mips_arch_variant'] self.mips_arch_variant = build_config['mips_arch_variant']
self.mips_use_msa = build_config['mips_use_msa'] self.mips_use_msa = build_config['mips_use_msa']
@property
def use_sanitizer(self):
return (self.asan or self.cfi_vptr or self.msan or self.tsan or
self.ubsan_vptr)
def __str__(self): def __str__(self):
detected_options = [] detected_options = []
...@@ -693,10 +699,6 @@ class BaseTestRunner(object): ...@@ -693,10 +699,6 @@ class BaseTestRunner(object):
} }
def _create_test_config(self, options): def _create_test_config(self, options):
# TODO(machenbach): Remove temporary hard-coded timeout when infra side is
# removed.
if options.buildbot:
options.timeout = 200
timeout = options.timeout * self._timeout_scalefactor(options) timeout = options.timeout * self._timeout_scalefactor(options)
return TestConfig( return TestConfig(
command_prefix=options.command_prefix, command_prefix=options.command_prefix,
...@@ -713,15 +715,16 @@ class BaseTestRunner(object): ...@@ -713,15 +715,16 @@ class BaseTestRunner(object):
) )
def _timeout_scalefactor(self, options): def _timeout_scalefactor(self, options):
"""Increases timeout for slow build configurations."""
factor = self.mode_options.timeout_scalefactor factor = self.mode_options.timeout_scalefactor
# Simulators are slow, therefore allow a longer timeout.
if self.build_config.arch in SLOW_ARCHS: if self.build_config.arch in SLOW_ARCHS:
factor *= 4
if self.build_config.lite_mode:
factor *= 2 factor *= 2
# Predictable mode is slower.
if self.build_config.predictable: if self.build_config.predictable:
factor *= 2 factor *= 2
if self.build_config.use_sanitizer:
factor *= 1.5
return factor return factor
......
...@@ -244,13 +244,16 @@ class TestCase(object): ...@@ -244,13 +244,16 @@ class TestCase(object):
timeout = self._test_config.timeout timeout = self._test_config.timeout
if "--stress-opt" in params: if "--stress-opt" in params:
timeout *= 4 timeout *= 4
if "--jitless" in params:
timeout *= 2
if "--no-opt" in params:
timeout *= 2
if "--noenable-vfp3" in params: if "--noenable-vfp3" in params:
timeout *= 2 timeout *= 2
if self._get_timeout_param() == TIMEOUT_LONG: if self._get_timeout_param() == TIMEOUT_LONG:
timeout *= 10 timeout *= 10
if self.is_slow:
# TODO(majeski): make it slow outcome dependent. timeout *= 4
timeout *= 2
return timeout return timeout
def get_shell(self): def get_shell(self):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment