commit fef5e2c93f8f4371d52eec56dd8da7012e970da5
author Stuart Scott <stuartscott@google.com> Fri Sep 05 17:37:18 2014 -0700
committer Stuart Scott <stuartscott@google.com> Wed Sep 17 10:18:16 2014 -0700
tree abf28a2910419b55eac7ca2872b9fb99193c7d7c
parent beb727c733565b48db1c3ee5ff3ca990b4682fc7

Add 64bit support to tests and runners in CTS

Change-Id: I9a676e19d3ef88f76d8cd862b6fb78917a227159

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 3630446..0307375 100644
--- a/tools/vm-tests-tf/src/util/build/BuildDalvikSuite.java
+++ b/tools/vm-tests-tf/src/util/build/BuildDalvikSuite.java
@@ -211,19 +211,19 @@
         curJunitFileData = getWarningMessage() +
         "package " + pName + ";\n" +
         "import java.io.IOException;\n" +
+        "import com.android.tradefed.testtype.IAbi;\n" +
+        "import com.android.tradefed.testtype.IAbiReceiver;\n" +
         "import com.android.tradefed.testtype.DeviceTestCase;\n" +
-        "import com.android.tradefed.config.Option;\n" +
-        "import com.android.tradefed.config.Option.Importance;\n" +
         "import com.android.tradefed.util.AbiFormatter;\n" +
         "\n" +
-        "public class " + sourceName + " extends DeviceTestCase {\n";
+        "public class " + sourceName + " extends DeviceTestCase implements IAbiReceiver {\n";
     }
 
     private String getShellExecJavaLine(String classpath, String mainclass) {
       String cmd = String.format("ANDROID_DATA=%s dalvikvm|#ABI#| -Xmx512M -Xss32K " +
               "-Djava.io.tmpdir=%s -classpath %s %s", TARGET_JAR_ROOT_PATH, TARGET_JAR_ROOT_PATH,
               classpath, mainclass);
-      return "String cmd = AbiFormatter.formatCmdForAbi(\"" + cmd + "\", mForceAbi);\n" +
+      return "String cmd = AbiFormatter.formatCmdForAbi(\"" + cmd + "\", mAbi.getBitness());\n" +
           "String res = getDevice().executeShellCommand(cmd);\n" +
           "// A sucessful adb shell command returns an empty string.\n" +
           "assertEquals(cmd, \"\", res);";
@@ -283,9 +283,12 @@
 
             openCTSHostFileFor(pName, classOnlyName);
 
-            curJunitFileData += "@Option(name = AbiFormatter.FORCE_ABI_STRING,\n" +
-                "description = AbiFormatter.FORCE_ABI_DESCRIPTION,\n" +
-                "importance = Importance.IF_UNSET)\nprivate String mForceAbi = null;\n\n";
+            curJunitFileData += "\n" +
+                    "protected IAbi mAbi;\n" +
+                    "@Override\n" +
+                    "public void setAbi(IAbi abi) {\n" +
+                    "    mAbi = abi;\n" +
+                    "}\n\n";
 
             List<String> methods = entry.getValue();
             Collections.sort(methods, new Comparator<String>() {