summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Nicolas Geoffray <ngeoffray@google.com> 2018-08-27 10:03:50 +0100
committer Nicolas Geoffray <ngeoffray@google.com> 2018-08-27 10:03:50 +0100
commit1fc309a2a78795ac68d264b6cfafc2f1154e551c (patch)
treeeedc1d0b265e18acff28723c0ff3c07befb7451a
parentbdf294e34a0d1d84596f46ff58924f12dd640f4c (diff)
Always set compiler filter to 'quicken' for jdwp tests.
Now that the 'art' script runs dex2oat before invoking dalvikvm, the default compiler filter is 'speed'. To avoid timeouts when running unneeded AOT compilation (jdwp tests run debuggable), just set the compiler filter to quicken. Test: run-jdwp-tests.sh Change-Id: I7bef19d5424b85ea19d96c1f443a46a2208c773c
-rwxr-xr-xtools/run-jdwp-tests.sh8
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/run-jdwp-tests.sh b/tools/run-jdwp-tests.sh
index a435f2e03e..b0b5810dcc 100755
--- a/tools/run-jdwp-tests.sh
+++ b/tools/run-jdwp-tests.sh
@@ -311,10 +311,10 @@ if [[ "$plugin" != "" ]]; then
vm_args="$vm_args --vm-arg $plugin"
fi
-if $use_jit; then
- vm_args="$vm_args --vm-arg -Xcompiler-option --vm-arg --compiler-filter=quicken"
- debuggee_args="$debuggee_args -Xcompiler-option --compiler-filter=quicken"
-fi
+# Because we're running debuggable, we discard any AOT code.
+# Therefore we run de2oat with 'quicken' to avoid spending time compiling.
+vm_args="$vm_args --vm-arg -Xcompiler-option --vm-arg --compiler-filter=quicken"
+debuggee_args="$debuggee_args -Xcompiler-option --compiler-filter=quicken"
if $instant_jit; then
debuggee_args="$debuggee_args -Xjitthreshold:0"