commit 37023c01c319ddda7ea11225372fc3d44d88cbd5
author Mads Ager <ager@google.com> Tue Sep 19 13:44:14 2017 +0200
committer Mads Ager <ager@google.com> Tue Sep 19 13:44:14 2017 +0200
tree 8a5ad5f38f5a50fa72d761303d8501c8132b5679
parent 7151e7c7958e1dcc234ddfbfb876c17175b0b393

Enable at least some jctf tests to run with Android Runtime 4.4.4.

Running locally now to update status files. But with these changes
at least all the math tests pass.

R=shertz@google.com, tamaskenez@google.com, zerny@google.com

Change-Id: I472a44c270d5fe7bbe1620d729be9e800778124e

src/test/java/com/android/tools/r8/R8RunArtTestsTest.java

diff --git a/src/test/java/com/android/tools/r8/R8RunArtTestsTest.java b/src/test/java/com/android/tools/r8/R8RunArtTestsTest.java
index bfa9b82..e8db7b4 100644
--- a/src/test/java/com/android/tools/r8/R8RunArtTestsTest.java
+++ b/src/test/java/com/android/tools/r8/R8RunArtTestsTest.java
@@ -1501,8 +1501,10 @@
     }
 
     ArtCommandBuilder builder = buildArtCommand(processedFile, specification, dexVm);
-    builder.appendArtOption("-Ximage:/system/non/existent/jdwp/image.art");
-    for (String s : ToolHelper.getArtBootLibs()) {
+    if (ToolHelper.getDexVm() != DexVm.ART_4_4_4) {
+      builder.appendArtOption("-Ximage:/system/non/existent/image.art");
+    }
+    for (String s : ToolHelper.getBootLibs()) {
       builder.appendBootClassPath(new File(s).getCanonicalPath());
     }
     builder.setMainClass(JUNIT_TEST_RUNNER);

src/test/java/com/android/tools/r8/ToolHelper.java

diff --git a/src/test/java/com/android/tools/r8/ToolHelper.java b/src/test/java/com/android/tools/r8/ToolHelper.java
index e8fcc4c..2271a02 100644
--- a/src/test/java/com/android/tools/r8/ToolHelper.java
+++ b/src/test/java/com/android/tools/r8/ToolHelper.java
@@ -250,6 +250,7 @@
           DexVm.ART_6_0_1, "art-6.0.1",
           DexVm.ART_5_1_1, "art-5.1.1",
           DexVm.ART_4_4_4, "dalvik");
+
   private static final Map<DexVm, String> ART_BINARY_VERSIONS =
       ImmutableMap.of(
           DexVm.ART_DEFAULT, "bin/art",
@@ -263,12 +264,26 @@
           DexVm.ART_DEFAULT, "bin/art",
           DexVm.ART_7_0_0, "bin/art",
           DexVm.ART_6_0_1, "bin/art");
+
+  private static final List<String> DALVIK_BOOT_LIBS =
+      ImmutableList.of(
+          "core-libart-hostdex.jar",
+          "core-hostdex.jar",
+          "apache-xml-hostdex.jar");
+
   private static final List<String> ART_BOOT_LIBS =
       ImmutableList.of(
           "core-libart-hostdex.jar",
           "core-oj-hostdex.jar",
-          "apache-xml-hostdex.jar"
-      );
+          "apache-xml-hostdex.jar");
+
+  private static final Map<DexVm, List<String>> BOOT_LIBS =
+      ImmutableMap.of(
+          DexVm.ART_DEFAULT, ART_BOOT_LIBS,
+          DexVm.ART_7_0_0, ART_BOOT_LIBS,
+          DexVm.ART_6_0_1, ART_BOOT_LIBS,
+          DexVm.ART_5_1_1, ART_BOOT_LIBS,
+          DexVm.ART_4_4_4, DALVIK_BOOT_LIBS);
 
   private static final String LIB_PATH = TOOLS + "/linux/art/lib";
   private static final String DX = TOOLS + "/linux/dx/bin/dx";
@@ -357,10 +372,10 @@
     }
   }
 
-  public static List<String> getArtBootLibs() {
+  public static List<String> getBootLibs() {
     String prefix = getArtDir(getDexVm()) + "/";
     List<String> result = new ArrayList<>();
-    ART_BOOT_LIBS.stream().forEach(x -> result.add(prefix + "framework/" + x));
+    BOOT_LIBS.get(getDexVm()).stream().forEach(x -> result.add(prefix + "framework/" + x));
     return result;
   }