commit a9e90c2479baac572f7f7017fb3134773abf063d
author Calin Juravle <calin@google.com> Mon Oct 09 14:55:50 2017 -0700
committer Calin Juravle <calin@google.com> Tue Oct 10 17:08:02 2017 +0000
tree bcd181b534dbbbc8b76914a83d5ffb797f05a795
parent b84073e406fe0c05427cce99dc6bd60d021c7d75

Do not compile vm-test at runtime

MR1 does not have the verifier fix from master:
d3ea5b3d7f6a829fba5979657ee8af9d8b2a7fdb and using '&' does not discard
the oat file anymore.

The temporary workaround for test to pass is to force them to interpreter.

Note that Merged-In is commit d3ea5b3d7f6a829fba5979657ee8af9d8b2a7fdb as
we don't want this to be merged down stream.

Test: cts-tradefed run commandAndExit cts --m vm-tests-tf
Bug: 67478181

Merged-In: I00aa37f5fb097b37e267bd4332638fa3092b4fe9
Change-Id: Icc0d0ba996e6b577011e5cb2ecd6468d3fae2676

tools/vm-tests-tf/src/util/build/BuildDalvikSuite.java

diff --git a/tools/vm-tests-tf/src/util/build/BuildDalvikSuite.java b/tools/vm-tests-tf/src/util/build/BuildDalvikSuite.java
index dc927d9..187858c 100644
--- a/tools/vm-tests-tf/src/util/build/BuildDalvikSuite.java
+++ b/tools/vm-tests-tf/src/util/build/BuildDalvikSuite.java
@@ -243,7 +243,7 @@
     }
 
     private String getShellExecJavaLine(String classpath, String mainclass) {
-      String cmd = String.format("ANDROID_DATA=%s dalvikvm|#ABI#| -Xmx512M -Xss32K " +
+      String cmd = String.format("ANDROID_DATA=%s dalvikvm|#ABI#| -Xmx512M -Xss32K -Xnodex2oat " +
               "-Djava.io.tmpdir=%s -classpath %s %s", TARGET_JAR_ROOT_PATH, TARGET_JAR_ROOT_PATH,
               classpath, mainclass);
       StringBuilder code = new StringBuilder();