Bug 1682723 - Increase WPT timeouts for tsan. r=decoder,jgraham

Differential Revision: https://phabricator.services.mozilla.com/D102316
This commit is contained in:
Alexis Beingessner 2021-01-22 14:20:04 +00:00
parent 172561237f
commit f82cc936bd
2 changed files with 5 additions and 2 deletions

View File

@ -59,6 +59,7 @@ web-platform-tests:
chunks:
by-test-platform:
android.*: 16
linux.*64-tsan/opt: 26
linux.*64-asan/opt: 22
linux.*64-ccov.*/opt: 20
linux.*/debug: 16
@ -70,6 +71,7 @@ web-platform-tests:
max-run-time:
by-test-platform:
.*-ccov.*/.*: 10800
linux.*64-tsan/opt: 14400
linux.*64-asan/opt: 14400
linux.*64(-qr)?/debug: 10800
macosx.*/debug: 10800
@ -124,6 +126,7 @@ web-platform-tests-reftest:
chunks:
by-test-platform:
.*-ccov.*/.*: 8
linux.*64-tsan/opt: 8
linux1804-64(-qr|-asan)/.*: 6
linux1804-64(-shippable|-devedition)?/opt: 3
macosx10.*-64/debug: 6

View File

@ -53,11 +53,11 @@ def get_timeout_multiplier(test_type, run_info_data, **kwargs):
if kwargs["timeout_multiplier"] is not None:
return kwargs["timeout_multiplier"]
if test_type == "reftest":
if run_info_data["debug"] or run_info_data.get("asan"):
if run_info_data["debug"] or run_info_data.get("asan") or run_info_data.get("tsan"):
return 4
else:
return 2
elif run_info_data["debug"] or run_info_data.get("asan"):
elif run_info_data["debug"] or run_info_data.get("asan") or run_info_data.get("tsan"):
if run_info_data.get("ccov"):
return 4
else: