diff options
10 files changed, 52 insertions, 23 deletions
diff --git a/dx-ref/dx.jar b/dx-ref/dx.jar Binary files differindex 6c04a3f0..0ff9b8c6 100644 --- a/dx-ref/dx.jar +++ b/dx-ref/dx.jar diff --git a/jack/tests/com/android/jack/BridgeTest.java b/jack/tests/com/android/jack/BridgeTest.java index 8d53304a..2c4577d5 100644 --- a/jack/tests/com/android/jack/BridgeTest.java +++ b/jack/tests/com/android/jack/BridgeTest.java @@ -52,9 +52,9 @@ public class BridgeTest { @Test public void test002() throws Exception { File[] bootclasspath = new File[]{TestTools.getFromAndroidTree( - "out/target/common/obj/JAVA_LIBRARIES/core_intermediates/classes.jar"), + "out/target/common/obj/JAVA_LIBRARIES/core-libart_intermediates/classes.zip"), TestTools.getFromAndroidTree( - "out/host/common/obj/JAVA_LIBRARIES/junit4-hostdex-jack_intermediates/classes.jar")}; + "out/host/common/obj/JAVA_LIBRARIES/junit4-hostdex-jack_intermediates/classes.zip")}; TestTools.runCompilation(TestTools.buildCommandLineArgs(bootclasspath, null, TestTools.getJackTestsWithJackFolder("bridge/test002"))); } diff --git a/jack/tests/com/android/jack/ComparisonTest.java b/jack/tests/com/android/jack/ComparisonTest.java index 5dc0854c..e5d16e85 100644 --- a/jack/tests/com/android/jack/ComparisonTest.java +++ b/jack/tests/com/android/jack/ComparisonTest.java @@ -39,9 +39,9 @@ public class ComparisonTest { @Test public void testCompile() throws Exception { File[] bootclasspath = new File[]{TestTools.getFromAndroidTree( - "out/target/common/obj/JAVA_LIBRARIES/core_intermediates/classes.jar"), + "out/target/common/obj/JAVA_LIBRARIES/core-libart_intermediates/classes.zip"), TestTools.getFromAndroidTree( - "out/host/common/obj/JAVA_LIBRARIES/junit4-hostdex-jack_intermediates/classes.jar")}; + "out/host/common/obj/JAVA_LIBRARIES/junit4-hostdex-jack_intermediates/classes.zip")}; TestTools.runCompilation(TestTools.buildCommandLineArgs(bootclasspath, null, TestTools.getJackTestsWithJackFolder("comparison/test001"))); } diff --git a/jack/tests/com/android/jack/TestTools.java b/jack/tests/com/android/jack/TestTools.java index c24bca92..85335430 100644 --- a/jack/tests/com/android/jack/TestTools.java +++ b/jack/tests/com/android/jack/TestTools.java @@ -140,8 +140,8 @@ public class TestTools { } @Nonnull - public static File getDalvikTestFolder(@Nonnull String testName) { - return getFromAndroidTree("dalvik/tests/" + testName + "/src"); + public static File getArtTestFolder(@Nonnull String testName) { + return getFromAndroidTree("art/test/" + testName + "/src"); } @Nonnull @@ -175,19 +175,19 @@ public class TestTools { @Nonnull public static Sourcelist getTargetLibSourcelist(@Nonnull String moduleName) { return getSourcelistWithAbsPath("out/target/common/obj/JAVA_LIBRARIES/" + moduleName - + "_intermediates/sources.list"); + + "_intermediates/jayces.java-source-list"); } @Nonnull public static Sourcelist getHostLibSourcelist(@Nonnull String moduleName) { return getSourcelistWithAbsPath("out/host/common/obj/JAVA_LIBRARIES/" + moduleName - + "_intermediates/sources.list"); + + "_intermediates/jayces.java-source-list"); } @Nonnull public static Sourcelist getTargetAppSourcelist(@Nonnull String moduleName) { return getSourcelistWithAbsPath("out/target/common/obj/APPS/" + moduleName - + "_intermediates/sources.list"); + + "_intermediates/jayces.java-source-list"); } @Nonnull @@ -613,6 +613,26 @@ public class TestTools { float instructionNumberTolerance, @CheckForNull JarJarRules jarjarRules, @CheckForNull ProguardFlags[] proguardFlagFiles) throws Exception { + checkStructure(new Options(), + bootclasspath, + classpath, + fileOrSourceList, + withDebugInfo, + compareInstructionNumber, + instructionNumberTolerance, + jarjarRules, + proguardFlagFiles); + } + + public static void checkStructure(@Nonnull Options options, + @CheckForNull File[] bootclasspath, + @CheckForNull File[] classpath, + @Nonnull File fileOrSourceList, + boolean withDebugInfo, + boolean compareInstructionNumber, + float instructionNumberTolerance, + @CheckForNull JarJarRules jarjarRules, + @CheckForNull ProguardFlags[] proguardFlagFiles) throws Exception { boolean runDxOptimizations = !withDebugInfo; boolean useEcjAsRefCompiler = withDebugInfo; @@ -620,7 +640,6 @@ public class TestTools { File jackDexFolder = TestTools.createTempDir("jack", "dex"); - Options options = new Options(); if (runDxOptimizations) { options.enableDxOptimizations(); } else { diff --git a/jack/tests/com/android/jack/ToolchainTest.java b/jack/tests/com/android/jack/ToolchainTest.java index e4408961..9577aa10 100644 --- a/jack/tests/com/android/jack/ToolchainTest.java +++ b/jack/tests/com/android/jack/ToolchainTest.java @@ -16,6 +16,8 @@ package com.android.jack; +import com.android.jack.config.id.JavaVersionPropertyId.JavaVersion; + import org.junit.BeforeClass; import org.junit.Ignore; import org.junit.Test; @@ -42,13 +44,15 @@ public class ToolchainTest { @BeforeClass public static void setup() throws Exception { - CORE_SOURCELIST = TestTools.getTargetLibSourcelist("core"); + CORE_SOURCELIST = TestTools.getTargetLibSourcelist("core-libart"); BOUNCY_SOURCELIST = TestTools.getTargetLibSourcelist("bouncycastle"); - JUNIT_SOURCELIST = TestTools.getHostLibSourcelist("junit4-jack"); + JUNIT_SOURCELIST = TestTools.getHostLibSourcelist("junit4-hostdex-jack"); File coreOut = TestTools.createTempFile("core", ".zip"); - TestTools.compileSourceToJack(new Options(), CORE_SOURCELIST, null, coreOut, true); + Options options = new Options(); + options.addProperty(Options.JAVA_SOURCE_VERSION.getName(), JavaVersion.JAVA_7.toString()); + TestTools.compileSourceToJack(options, CORE_SOURCELIST, null, coreOut, true); corePath = coreOut; } @@ -116,7 +120,7 @@ public class ToolchainTest { TestTools.compileSourceToJack( new Options(), JUNIT_SOURCELIST, corePath.getAbsolutePath() + File.pathSeparator + TestTools.getFromAndroidTree( - "out/host/common/obj/JAVA_LIBRARIES/hamcrest-core-hostdex-jack_intermediates/classes.jar"), junitJack, true); + "out/host/common/obj/JAVA_LIBRARIES/hamcrest-core-hostdex-jack_intermediates/classes.zip"), junitJack, true); File junitOutFolder = TestTools.createTempDir("junit", "dex"); TestTools.compileJackToDex(new Options(), junitJack, junitOutFolder, false); diff --git a/jack/tests/com/android/jack/compile/androidtree/core/CoreCompilationTest.java b/jack/tests/com/android/jack/compile/androidtree/core/CoreCompilationTest.java index 9ed68c10..9dc3ce4f 100644 --- a/jack/tests/com/android/jack/compile/androidtree/core/CoreCompilationTest.java +++ b/jack/tests/com/android/jack/compile/androidtree/core/CoreCompilationTest.java @@ -25,6 +25,7 @@ import com.android.jack.TestTools; import com.android.jack.backend.dex.DexFileWriter; import com.android.jack.category.RedundantTests; import com.android.jack.category.SlowTests; +import com.android.jack.config.id.JavaVersionPropertyId.JavaVersion; import com.android.sched.vfs.Container; import org.junit.BeforeClass; @@ -42,19 +43,23 @@ public class CoreCompilationTest { @BeforeClass public static void setUpClass() { CoreCompilationTest.class.getClassLoader().setDefaultAssertionStatus(true); - SOURCELIST = TestTools.getTargetLibSourcelist("core"); + SOURCELIST = TestTools.getTargetLibSourcelist("core-libart"); } @Test @Category(RedundantTests.class) public void compileCore() throws Exception { File outDexFolder = TestTools.createTempDir("core", ".dex"); - TestTools.compileSourceToDex(new Options(), SOURCELIST, null, outDexFolder, false); + Options options = new Options(); + options.addProperty(Options.JAVA_SOURCE_VERSION.getName(), JavaVersion.JAVA_7.toString()); + TestTools.compileSourceToDex(options, SOURCELIST, null, outDexFolder, false); } @Test public void compareLibCoreStructure() throws Exception { - TestTools.checkStructure(null, null, SOURCELIST, + Options options = new Options(); + options.addProperty(Options.JAVA_SOURCE_VERSION.getName(), JavaVersion.JAVA_7.toString()); + TestTools.checkStructure(options, null, null, SOURCELIST, false /*withDebugInfo*/, false /*compareInstructionNumber*/, 0.1f, (JarJarRules) null, (ProguardFlags[]) null); } @@ -73,6 +78,7 @@ public class CoreCompilationTest { options.addProperty(Options.JAYCE_FILE_OUTPUT_DIR.getName(), outputFile.getAbsolutePath()); options.addProperty( Options.JAYCE_OUTPUT_CONTAINER_TYPE.getName(), Container.DIR.toString()); + options.addProperty(Options.JAVA_SOURCE_VERSION.getName(), JavaVersion.JAVA_7.toString()); TestTools.compileSourceToDex(options, SOURCELIST, null, coreDexFolderFromJava, false); File coreDexFolderFromJack = TestTools.createTempDir("coreFromJack", "dex"); diff --git a/jack/tests/com/android/jack/compile/androidtree/dalvik/compilerregressions/CompilerRegressionsTest.java b/jack/tests/com/android/jack/compile/androidtree/dalvik/compilerregressions/CompilerRegressionsTest.java index cbe22aa9..63ea06e0 100644 --- a/jack/tests/com/android/jack/compile/androidtree/dalvik/compilerregressions/CompilerRegressionsTest.java +++ b/jack/tests/com/android/jack/compile/androidtree/dalvik/compilerregressions/CompilerRegressionsTest.java @@ -34,7 +34,7 @@ public class CompilerRegressionsTest { public static void setUpClass() { CompilerRegressionsTest.class.getClassLoader().setDefaultAssertionStatus(true); BOOTCLASSPATH = new File[] {TestTools.getFromAndroidTree( - "out/target/common/obj/JAVA_LIBRARIES/core_intermediates/classes.jar")}; + "out/target/common/obj/JAVA_LIBRARIES/core-libart_intermediates/classes.zip")}; } @Test @@ -42,6 +42,6 @@ public class CompilerRegressionsTest { File out = TestTools.createTempFile("out", ".zip"); String classpath = TestTools.getClasspathAsString(BOOTCLASSPATH); TestTools.compileSourceToDex(new Options(), - TestTools.getDalvikTestFolder("083-jit-regressions"), classpath, out, /* zip = */ true); + TestTools.getArtTestFolder("083-compiler-regressions"), classpath, out, /* zip = */ true); } } diff --git a/jack/tests/com/android/jack/compile/androidtree/dalvik/finalizer/FinalizerTest.java b/jack/tests/com/android/jack/compile/androidtree/dalvik/finalizer/FinalizerTest.java index eb0b6442..8704893b 100644 --- a/jack/tests/com/android/jack/compile/androidtree/dalvik/finalizer/FinalizerTest.java +++ b/jack/tests/com/android/jack/compile/androidtree/dalvik/finalizer/FinalizerTest.java @@ -34,14 +34,14 @@ public class FinalizerTest { public static void setUpClass() { FinalizerTest.class.getClassLoader().setDefaultAssertionStatus(true); BOOTCLASSPATH = new File[] {TestTools.getFromAndroidTree( - "out/target/common/obj/JAVA_LIBRARIES/core_intermediates/classes.jar")}; + "out/target/common/obj/JAVA_LIBRARIES/core-libart_intermediates/classes.zip")}; } @Test public void compileFinalizer() throws Exception { File out = TestTools.createTempFile("out", ".zip"); String classpath = TestTools.getClasspathAsString(BOOTCLASSPATH); - TestTools.compileSourceToDex(new Options(), TestTools.getDalvikTestFolder("036-finalizer"), + TestTools.compileSourceToDex(new Options(), TestTools.getArtTestFolder("036-finalizer"), classpath, out, /* zip = */ true); } } diff --git a/jack/tests/com/android/jack/compile/androidtree/dalvik/omnibus/OmnibusCompilationTest.java b/jack/tests/com/android/jack/compile/androidtree/dalvik/omnibus/OmnibusCompilationTest.java index 8a0df8c5..b0b1abf4 100644 --- a/jack/tests/com/android/jack/compile/androidtree/dalvik/omnibus/OmnibusCompilationTest.java +++ b/jack/tests/com/android/jack/compile/androidtree/dalvik/omnibus/OmnibusCompilationTest.java @@ -45,6 +45,6 @@ public class OmnibusCompilationTest { File out = TestTools.createTempFile("out", ".zip"); String classpath = TestTools.getClasspathAsString(BOOTCLASSPATH); TestTools.compileSourceToDex(new Options(), - TestTools.getDalvikTestFolder("003-omnibus-opcodes"), classpath, out, /* zip = */ true); + TestTools.getArtTestFolder("003-omnibus-opcodes"), classpath, out, /* zip = */ true); } } diff --git a/jack/tests/com/android/jack/experimental/incremental/IncrementalTestingEnvironment.java b/jack/tests/com/android/jack/experimental/incremental/IncrementalTestingEnvironment.java index 35a326a1..608dde2e 100644 --- a/jack/tests/com/android/jack/experimental/incremental/IncrementalTestingEnvironment.java +++ b/jack/tests/com/android/jack/experimental/incremental/IncrementalTestingEnvironment.java @@ -162,7 +162,7 @@ public class IncrementalTestingEnvironment extends TestTools { ExecuteFile ef = new ExecuteFile("rm -rf /tmp/android-data/dalvik-cache/*"); ef.run(); - ef = new ExecuteFile("dalvik -classpath " + dexFile.getAbsolutePath() + " " + mainClass); + ef = new ExecuteFile("art -classpath " + dexFile.getAbsolutePath() + " " + mainClass); ByteArrayOutputStream baosOut = new ByteArrayOutputStream(); ef.setOut(baosOut); // Be careful, Output on Err is forgotten |