summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Ulya Trofimovich <skvadrik@google.com> 2024-07-05 07:57:25 +0000
committer Ulya Trofimovich <skvadrik@google.com> 2024-07-09 15:31:52 +0000
commit0c16114bacb21725a475755fffda697d60ac2e0f (patch)
tree9e81e7c5fadd915250e202dd42dfbff934dc983f
parent270cdb2befd4fd5e4af697700f84eca25016aa4c (diff)
Increase dex2oat timeout for VM tests.
Some checker tests are slow and have been regularly failing on LUCI with dex2oat timeout, allow them more time to finish. Test: Ran VM tests on LUCI with this patch (using led). Bug: 283085397 Change-Id: I0e77858f3c407e8db4a17d84050cf2c68396cfad
-rwxr-xr-xtest/default_run.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/test/default_run.py b/test/default_run.py
index 9fdd5a0909..07fc9418b3 100755
--- a/test/default_run.py
+++ b/test/default_run.py
@@ -828,6 +828,9 @@ def default_run(ctx, args, **kwargs):
# Use SIGRTMIN+2 to try to dump threads.
# Use -k 1m to SIGKILL it a minute later if it hasn't ended.
dex2oat_cmdline = f"timeout -k {DEX2OAT_TIMEOUT}s -s SIGRTMIN+2 {DEX2OAT_RT_TIMEOUT}s {dex2oat_cmdline} --watchdog-timeout={DEX2OAT_TIMEOUT}000"
+ elif ON_VM:
+ # Increase dex2oat timeout for VM testing environment, as some checker tests are slow.
+ dex2oat_cmdline = f"{dex2oat_cmdline} --watchdog-timeout={5 * DEX2OAT_TIMEOUT}000"
if PROFILE or RANDOM_PROFILE:
vdex_cmdline = f"{dex2oat_cmdline} {VDEX_ARGS} --input-vdex={DEX_LOCATION}/oat/{ISA}/{name}.vdex --output-vdex={DEX_LOCATION}/oat/{ISA}/{name}.vdex"
elif TEST_VDEX: