diff options
author | Jean-Marie Henaff <jmhenaff@google.com> | 2015-01-26 17:16:52 +0100 |
---|---|---|
committer | Jean-Marie Henaff <jmhenaff@google.com> | 2015-02-03 09:27:23 +0100 |
commit | e457ff34e60f5126b2c349b75394e4cf123141fc (patch) | |
tree | ca279287be0bb5acf56d7deffe80a768ca376496 | |
parent | 891e26ba9d55d1cbc6b0bd37289dd9e7db70b5ed (diff) | |
download | toolchain_jack-e457ff34e60f5126b2c349b75394e4cf123141fc.zip toolchain_jack-e457ff34e60f5126b2c349b75394e4cf123141fc.tar.gz toolchain_jack-e457ff34e60f5126b2c349b75394e4cf123141fc.tar.bz2 |
Change handling of classpath in compilation in test framework
Make classpath an optional parameter.
This change leads to simpler calls to compilation methods.
Change-Id: Ia8a5e1bf13bfe9690a838784922622d3f3f148d7
67 files changed, 482 insertions, 434 deletions
diff --git a/jack-tests/src/com/android/jack/test/helper/IncrementalTestHelper.java b/jack-tests/src/com/android/jack/test/helper/IncrementalTestHelper.java index 2449a9e..ed7a6cc 100644 --- a/jack-tests/src/com/android/jack/test/helper/IncrementalTestHelper.java +++ b/jack-tests/src/com/android/jack/test/helper/IncrementalTestHelper.java @@ -180,9 +180,11 @@ public class IncrementalTestHelper { File[] bootclasspath = jackToolchain.getDefaultBootClasspath(); - jackToolchain.srcToExe(classpath == null ? AbstractTestTools.getClasspathAsString(bootclasspath) - : AbstractTestTools.getClasspathsAsString(bootclasspath, classpath), dexOutDir, - /* zipFile = */ false, sourceFolder); + jackToolchain.addToClasspath(bootclasspath); + if(classpath != null) { + jackToolchain.addToClasspath(classpath); + } + jackToolchain.srcToExe(dexOutDir,/* zipFile = */ false, sourceFolder); Thread.sleep(1000); } diff --git a/jack-tests/src/com/android/jack/test/helper/RuntimeTestHelper.java b/jack-tests/src/com/android/jack/test/helper/RuntimeTestHelper.java index 11502c7..012e693 100644 --- a/jack-tests/src/com/android/jack/test/helper/RuntimeTestHelper.java +++ b/jack-tests/src/com/android/jack/test/helper/RuntimeTestHelper.java @@ -129,14 +129,14 @@ public class RuntimeTestHelper { AbstractTestTools.createTempFile("lib-ref", referenceTestTools.getLibraryExtension()); File libBinaryRefDir = AbstractTestTools.createTempDir(); libBinaryRef = new File(libBinaryRefDir, referenceTestTools.getBinaryFileName()); - referenceTestTools.srcToLib(referenceBootClasspathAsString, libLibRef, /* zipFiles = */ true, - libSources); + referenceTestTools.addToClasspath(referenceBootClasspath) + .srcToLib(libLibRef, /* zipFiles = */ true, libSources); referenceTestTools.libToExe(libLibRef, libBinaryRefDir, /* zipFile */ false); libLibCandidate = AbstractTestTools.createTempFile("lib-candidate", candidateTestTools.getLibraryExtension()); - candidateTestTools.srcToLib(candidateBootClasspathAsString, libLibCandidate, - /* zipFiles = */ true, libSources); + candidateTestTools.addToClasspath(candidateBootClasspath) + .srcToLib(libLibCandidate, /* zipFiles = */ true, libSources); } // Compile test src @@ -144,19 +144,22 @@ public class RuntimeTestHelper { String candidateClasspathAsString; String referenceClasspathAsString; - File[] candidateClassPath = candidateBootClasspath; + File[] candidateClassPath; + File[] referenceClasspath; if (libSources.length != 0) { candidateClassPath = new File[candidateBootClasspath.length + 1]; System.arraycopy(candidateBootClasspath, 0, candidateClassPath, 0, candidateBootClasspath.length); candidateClassPath[candidateClassPath.length - 1] = libLibCandidate; candidateClasspathAsString = AbstractTestTools.getClasspathAsString(candidateClassPath); - File[] referenceClasspath = new File[referenceBootClasspath.length + 1]; + referenceClasspath = new File[referenceBootClasspath.length + 1]; System.arraycopy(referenceBootClasspath, 0, referenceClasspath, 0, referenceBootClasspath.length); referenceClasspath[referenceClasspath.length - 1] = libLibRef; referenceClasspathAsString = AbstractTestTools.getClasspathAsString(referenceClasspath); } else { + candidateClassPath = candidateBootClasspath; + referenceClasspath = referenceBootClasspath; candidateClasspathAsString = candidateBootClasspathAsString; referenceClasspathAsString = referenceBootClasspathAsString; } @@ -183,7 +186,8 @@ public class RuntimeTestHelper { candidateTestTools.setJarjarRules(jarjarRules); } candidateTestTools.addProguardFlags(proguargFlags.toArray(new File [proguargFlags.size()])); - candidateTestTools.srcToExe(candidateClasspathAsString, testBinaryDir, /* zipFile = */ false, + candidateTestTools.addToClasspath(candidateClassPath) + .srcToExe(testBinaryDir, /* zipFile = */ false, getSrcDir()); } @@ -194,7 +198,8 @@ public class RuntimeTestHelper { referenceTestTools = createReferenceToolchain(); File testLib = AbstractTestTools.createTempFile("testRef", referenceTestTools.getLibraryExtension()); - referenceTestTools.srcToLib(referenceClasspathAsString, testLib, /* zipFiles = */ true, + referenceTestTools.addToClasspath(referenceClasspath) + .srcToLib(testLib, /* zipFiles = */ true, getSrcDir()); // Compile link src @@ -206,26 +211,26 @@ public class RuntimeTestHelper { linkBinary = new File(linkBinaryDir, candidateTestTools.getBinaryFileName()); candidateTestTools.setJarjarRules(jarjarRules); candidateTestTools.addProguardFlags(proguargFlags.toArray(new File [proguargFlags.size()])); - candidateTestTools.srcToExe(candidateBootClasspathAsString, linkBinaryDir, - /* zipFile = */ false, getLinkSrc()); + candidateTestTools.addToClasspath(candidateBootClasspath) + .srcToExe(linkBinaryDir, /* zipFile = */ false, getLinkSrc()); } // Compile ref part src referenceTestTools = createReferenceToolchain(); - List<File> referenceClasspath = new ArrayList<File>(); + List<File> referenceClasspathAsList = new ArrayList<File>(); for (File f : referenceBootClasspath) { - referenceClasspath.add(f); + referenceClasspathAsList.add(f); } if (libLibRef != null) { - referenceClasspath.add(libLibRef); + referenceClasspathAsList.add(libLibRef); } if (testLib != null) { - referenceClasspath.add(testLib); + referenceClasspathAsList.add(testLib); } - referenceClasspathAsString = AbstractTestTools.getClasspathAsString( - referenceClasspath.toArray(new File[referenceClasspath.size()])); + referenceClasspath = + referenceClasspathAsList.toArray(new File[referenceClasspathAsList.size()]); File [] refSources = getRefSrcDir(); @@ -236,8 +241,8 @@ public class RuntimeTestHelper { File refPartBinaryDir = AbstractTestTools.createTempDir(); File refPartBinary = new File(refPartBinaryDir, referenceTestTools.getBinaryFileName()); - referenceTestTools.srcToExe( - referenceClasspathAsString, + referenceTestTools.addToClasspath(referenceClasspath) + .srcToExe( refPartBinaryDir, /* zipFile = */ false, sources.toArray(new File[sources.size()])); diff --git a/jack-tests/src/com/android/jack/test/helper/SourceToDexComparisonTestHelper.java b/jack-tests/src/com/android/jack/test/helper/SourceToDexComparisonTestHelper.java index 2f78c17..64b6022 100644 --- a/jack-tests/src/com/android/jack/test/helper/SourceToDexComparisonTestHelper.java +++ b/jack-tests/src/com/android/jack/test/helper/SourceToDexComparisonTestHelper.java @@ -174,8 +174,9 @@ public class SourceToDexComparisonTestHelper extends GenericComparisonTestHelper } candidateTestTools.setWithDebugInfos(withDebugInfos); candidateTestTools.setSourceLevel(sourceLevel); - candidateTestTools.addProguardFlags(proguardFlagFiles).srcToExe( - AbstractTestTools.getClasspathAsString(candidateClasspath), candidateDexDir, + candidateTestTools.addProguardFlags(proguardFlagFiles) + .addToClasspath(candidateClasspath) + .srcToExe(candidateDexDir, /* zipFile = */ false, filesOrSourceList); } @@ -187,8 +188,8 @@ public class SourceToDexComparisonTestHelper extends GenericComparisonTestHelper } referenceTestTools.setWithDebugInfos(withDebugInfos); referenceTestTools.setSourceLevel(sourceLevel); - referenceTestTools.addProguardFlags(proguardFlagFiles).srcToExe( - AbstractTestTools.getClasspathAsString(referenceClasspath), refDexDir, - /* zipFile = */ false, filesOrSourceList); + referenceTestTools.addProguardFlags(proguardFlagFiles) + .addToClasspath(referenceClasspath) + .srcToExe(refDexDir, /* zipFile = */ false, filesOrSourceList); } } diff --git a/jack-tests/src/com/android/jack/test/toolchain/DummyToolchain.java b/jack-tests/src/com/android/jack/test/toolchain/DummyToolchain.java index 30391f3..b1f7041 100644 --- a/jack-tests/src/com/android/jack/test/toolchain/DummyToolchain.java +++ b/jack-tests/src/com/android/jack/test/toolchain/DummyToolchain.java @@ -34,11 +34,11 @@ public class DummyToolchain extends AndroidToolchain { public DummyToolchain() {} @Override - public void srcToExe(@CheckForNull String classpath, @Nonnull File out, boolean zipFile, + public void srcToExe(@Nonnull File out, boolean zipFile, @Nonnull File... sources) throws Exception {} @Override - public void srcToLib(@CheckForNull String classpath, @Nonnull File out, boolean zipFiles, + public void srcToLib(@Nonnull File out, boolean zipFiles, @Nonnull File... sources) throws Exception {} @Override diff --git a/jack-tests/src/com/android/jack/test/toolchain/IToolchain.java b/jack-tests/src/com/android/jack/test/toolchain/IToolchain.java index 2495eea..44ed63c 100644 --- a/jack-tests/src/com/android/jack/test/toolchain/IToolchain.java +++ b/jack-tests/src/com/android/jack/test/toolchain/IToolchain.java @@ -22,7 +22,6 @@ import java.io.File; import java.io.OutputStream; import java.util.List; -import javax.annotation.CheckForNull; import javax.annotation.Nonnull; import javax.annotation.processing.Processor; @@ -32,11 +31,9 @@ import javax.annotation.processing.Processor; */ public interface IToolchain { - void srcToExe(@CheckForNull String classpath, @Nonnull File out, boolean zipFile, - @Nonnull File... sources) throws Exception; + void srcToExe(@Nonnull File out, boolean zipFile, @Nonnull File... sources) throws Exception; - void srcToLib(@CheckForNull String classpath, @Nonnull File out, boolean zipFiles, - @Nonnull File... sources) throws Exception; + void srcToLib(@Nonnull File out, boolean zipFiles, @Nonnull File... sources) throws Exception; void libToExe(@Nonnull File in, @Nonnull File out, boolean zipFile) throws Exception; @@ -63,6 +60,9 @@ public interface IToolchain { String getLibraryExtension(); @Nonnull + IToolchain addToClasspath(@Nonnull File... classpath); + + @Nonnull IToolchain setWithDebugInfos(boolean withDebugInfos); @Nonnull diff --git a/jack-tests/src/com/android/jack/test/toolchain/JackApiToolchain.java b/jack-tests/src/com/android/jack/test/toolchain/JackApiToolchain.java index a194d08..2185630 100644 --- a/jack-tests/src/com/android/jack/test/toolchain/JackApiToolchain.java +++ b/jack-tests/src/com/android/jack/test/toolchain/JackApiToolchain.java @@ -27,7 +27,6 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; -import javax.annotation.CheckForNull; import javax.annotation.Nonnull; /** @@ -48,12 +47,12 @@ public class JackApiToolchain extends JackBasedToolchain { } @Override - public void srcToExe(@CheckForNull String classpath, @Nonnull File out, boolean zipFile, + public void srcToExe(@Nonnull File out, boolean zipFile, @Nonnull File... sources) throws Exception { try { - srcToCommon(classpath, sources); + srcToCommon(sources); if (zipFile) { jackOptions.setOutputZip(out); @@ -72,12 +71,12 @@ public class JackApiToolchain extends JackBasedToolchain { } @Override - public void srcToLib(@CheckForNull String classpath, @Nonnull File out, boolean zipFiles, + public void srcToLib(@Nonnull File out, boolean zipFiles, @Nonnull File... sources) throws Exception { try { - srcToCommon(classpath, sources); + srcToCommon(sources); if (zipFiles) { jackOptions.setJayceOutputZip(out); @@ -95,7 +94,7 @@ public class JackApiToolchain extends JackBasedToolchain { } } - private void srcToCommon(@CheckForNull String classpath, @Nonnull File... sources) { + private void srcToCommon(@Nonnull File... sources) { addProperties(properties, jackOptions); jackOptions.setSanityChecks(sanityChecks); @@ -104,7 +103,9 @@ public class JackApiToolchain extends JackBasedToolchain { jackOptions.applyShrobFlags(); } - jackOptions.setClasspath(classpath); + if (classpath.size() > 0) { + jackOptions.setClasspath(getClasspathAsString()); + } fillEcjArgs(sources); @@ -181,6 +182,10 @@ public class JackApiToolchain extends JackBasedToolchain { jackOptions.setJarjarRulesFile(jarjarRules); + if (classpath.size() > 0) { + jackOptions.setClasspath(getClasspathAsString()); + } + if (jackOptions.getFlags() != null) { jackOptions.applyShrobFlags(); } diff --git a/jack-tests/src/com/android/jack/test/toolchain/JackCliToolchain.java b/jack-tests/src/com/android/jack/test/toolchain/JackCliToolchain.java index 3322d95..574f446 100644 --- a/jack-tests/src/com/android/jack/test/toolchain/JackCliToolchain.java +++ b/jack-tests/src/com/android/jack/test/toolchain/JackCliToolchain.java @@ -56,12 +56,12 @@ public class JackCliToolchain extends JackBasedToolchain { } @Override - public void srcToExe(@CheckForNull String classpath, @Nonnull File out, - boolean zipFile, @Nonnull File... sources) throws Exception { + public void srcToExe(@Nonnull File out, boolean zipFile, @Nonnull File... sources) + throws Exception { List<String> args = new ArrayList<String>(); - srcToCommon(args, classpath, sources); + srcToCommon(args, sources); if (zipFile) { args.add("--output-dex-zip"); @@ -102,12 +102,12 @@ public class JackCliToolchain extends JackBasedToolchain { } @Override - public void srcToLib(@CheckForNull String classpath, @Nonnull File out, - boolean zipFiles, @Nonnull File... sources) throws Exception { + public void srcToLib(@Nonnull File out, boolean zipFiles, @Nonnull File... sources) + throws Exception { List<String> args = new ArrayList<String>(); - srcToCommon(args, classpath, sources); + srcToCommon(args, sources); if (zipFiles) { args.add("--output-jack"); @@ -133,8 +133,7 @@ public class JackCliToolchain extends JackBasedToolchain { } - private void srcToCommon(@Nonnull List<String> args, @CheckForNull String classpath, - @Nonnull File... sources) { + private void srcToCommon(@Nonnull List<String> args, @Nonnull File... sources) { args.add("java"); args.add("-cp"); args.add(jackPrebuilt.getAbsolutePath()); @@ -154,9 +153,9 @@ public class JackCliToolchain extends JackBasedToolchain { addProperties(properties, args); - if (classpath != null) { + if (classpath.size() > 0) { args.add("--classpath"); - args.add(classpath); + args.add(getClasspathAsString()); } for (File res : resImport) { @@ -268,6 +267,11 @@ public class JackCliToolchain extends JackBasedToolchain { addProperties(properties, args); + if (classpath.size() > 0) { + args.add("--classpath"); + args.add(getClasspathAsString()); + } + if (jarjarRules != null) { args.add("--config-jarjar"); args.add(jarjarRules.getAbsolutePath()); diff --git a/jack-tests/src/com/android/jack/test/toolchain/LegacyJillToolchain.java b/jack-tests/src/com/android/jack/test/toolchain/LegacyJillToolchain.java index 1e3e37e..ae4f273 100644 --- a/jack-tests/src/com/android/jack/test/toolchain/LegacyJillToolchain.java +++ b/jack-tests/src/com/android/jack/test/toolchain/LegacyJillToolchain.java @@ -44,15 +44,15 @@ public class LegacyJillToolchain extends JillBasedToolchain { } @Override - public void srcToExe(@Nonnull String classpath, @Nonnull File out, boolean zipFile, - @Nonnull File... sources) throws Exception { + public void srcToExe(@Nonnull File out, boolean zipFile, @Nonnull File... sources) + throws Exception { try { File jarFile = AbstractTestTools.createTempFile("legacyLib", ".jar"); File jarFileJarjar = AbstractTestTools.createTempFile("legacyLibJarjar", ".jar"); File jarFileProguard = AbstractTestTools.createTempFile("legacyLibProguard", ".jar"); - srcToLib(classpath, jarFile, true /* zipFiles = */, sources); + srcToLib(jarFile, true /* zipFiles = */, sources); if (jarjarRules != null) { processWithJarJar(jarjarRules, jarFile, jarFileJarjar); @@ -61,7 +61,7 @@ public class LegacyJillToolchain extends JillBasedToolchain { } if (proguardFlags.size() > 0) { - processWithProguard(classpath, proguardFlags, jarFileJarjar, + processWithProguard(getClasspathAsString(), proguardFlags, jarFileJarjar, jarFileProguard); } else { jarFileProguard = jarFileJarjar; @@ -78,8 +78,8 @@ public class LegacyJillToolchain extends JillBasedToolchain { } @Override - public void srcToLib(@Nonnull String classpath, @Nonnull File out, boolean zipFiles, - @Nonnull File... sources) throws Exception { + public void srcToLib(@Nonnull File out, boolean zipFiles, @Nonnull File... sources) + throws Exception { if (withDebugInfos) { // TODO(jmhenaff): warning log? @@ -93,7 +93,7 @@ public class LegacyJillToolchain extends JillBasedToolchain { classesDir = out; } - compileWithExternalRefCompiler(sources, classpath, classesDir); + compileWithExternalRefCompiler(sources, getClasspathAsString(), classesDir); if (staticLibs.size() > 0) { for (File staticLib : staticLibs) { diff --git a/jack-tests/src/com/android/jack/test/toolchain/LegacyToolchain.java b/jack-tests/src/com/android/jack/test/toolchain/LegacyToolchain.java index 07af214..8603980 100644 --- a/jack-tests/src/com/android/jack/test/toolchain/LegacyToolchain.java +++ b/jack-tests/src/com/android/jack/test/toolchain/LegacyToolchain.java @@ -51,7 +51,7 @@ public class LegacyToolchain extends AndroidToolchain { } @Override - public void srcToExe(@CheckForNull String classpath, @Nonnull File out, + public void srcToExe(@Nonnull File out, boolean zipFile, @Nonnull File... sources) throws Exception { try { @@ -60,7 +60,7 @@ public class LegacyToolchain extends AndroidToolchain { File jarFileJarjar = AbstractTestTools.createTempFile("legacyLibJarjar", ".jar"); File jarFileProguard = AbstractTestTools.createTempFile("legacyLibProguard", ".jar"); - srcToLib(classpath, jarFile, true /* zipFiles = */, sources); + srcToLib(jarFile, true /* zipFiles = */, sources); if (jarjarRules != null) { processWithJarJar(jarjarRules, jarFile, jarFileJarjar); @@ -69,7 +69,7 @@ public class LegacyToolchain extends AndroidToolchain { } if (proguardFlags.size() > 0) { - processWithProguard(classpath, proguardFlags, jarFileJarjar, + processWithProguard(getClasspathAsString(), proguardFlags, jarFileJarjar, jarFileProguard); } else { jarFileProguard = jarFileJarjar; @@ -83,7 +83,7 @@ public class LegacyToolchain extends AndroidToolchain { } @Override - public void srcToLib(@CheckForNull String classpath, @Nonnull File out, + public void srcToLib(@Nonnull File out, boolean zipFiles, @Nonnull File... sources) throws Exception { try { @@ -93,10 +93,11 @@ public class LegacyToolchain extends AndroidToolchain { } else { classesDir = out; } + if (withDebugInfos) { - compileWithEcj(sources, classpath, classesDir); + compileWithEcj(sources, getClasspathAsString(), classesDir); } else { - compileWithExternalRefCompiler(sources, classpath, classesDir); + compileWithExternalRefCompiler(sources, getClasspathAsString(), classesDir); } if (staticLibs.size() > 0) { for (File staticLib : staticLibs) { diff --git a/jack-tests/src/com/android/jack/test/toolchain/Toolchain.java b/jack-tests/src/com/android/jack/test/toolchain/Toolchain.java index 2b26091..68a29f2 100644 --- a/jack-tests/src/com/android/jack/test/toolchain/Toolchain.java +++ b/jack-tests/src/com/android/jack/test/toolchain/Toolchain.java @@ -16,6 +16,8 @@ package com.android.jack.test.toolchain; +import com.google.common.collect.Lists; + import java.io.File; import java.io.OutputStream; import java.io.PrintStream; @@ -34,6 +36,9 @@ public abstract class Toolchain implements IToolchain { protected boolean withDebugInfos = false; + @Nonnull + protected List<File> classpath = new ArrayList<File>(); + @CheckForNull protected Class<? extends Processor> annotationProcessorClass; @@ -68,11 +73,11 @@ public abstract class Toolchain implements IToolchain { Toolchain() {} @Override - public abstract void srcToExe(@CheckForNull String classpath, @Nonnull File out, + public abstract void srcToExe(@Nonnull File out, boolean zipFile, @Nonnull File... sources) throws Exception; @Override - public abstract void srcToLib(@CheckForNull String classpath, @Nonnull File out, + public abstract void srcToLib(@Nonnull File out, boolean zipFiles, @Nonnull File... sources) throws Exception; @Override @@ -100,6 +105,18 @@ public abstract class Toolchain implements IToolchain { @Override @Nonnull + public Toolchain addToClasspath(@Nonnull File... classpath) { + this.classpath.addAll(Lists.newArrayList(classpath)); + return this; + } + + @Nonnull + protected String getClasspathAsString() { + return AbstractTestTools.getClasspathAsString(classpath.toArray(new File[classpath.size()])); + } + + @Override + @Nonnull public Toolchain setWithDebugInfos(boolean withDebugInfos) { this.withDebugInfos = withDebugInfos; return this; diff --git a/jack-tests/tests/com/android/jack/analysis/dfa/reachingdefs/ReachingDefsTests.java b/jack-tests/tests/com/android/jack/analysis/dfa/reachingdefs/ReachingDefsTests.java index 9053198..59e9790 100644 --- a/jack-tests/tests/com/android/jack/analysis/dfa/reachingdefs/ReachingDefsTests.java +++ b/jack-tests/tests/com/android/jack/analysis/dfa/reachingdefs/ReachingDefsTests.java @@ -41,6 +41,7 @@ public class ReachingDefsTests { File dexOutDir = AbstractTestTools.createTempDir(); File testSourceDir = AbstractTestTools.getTestRootDir("com.android.jack.analysis.dfa.reachingdefs.test001"); - toolchain.srcToExe(classpath, dexOutDir, /* zipFile = */ false, testSourceDir); + toolchain.addToClasspath(toolchain.getDefaultBootClasspath()) + .srcToExe(dexOutDir, /* zipFile = */ false, testSourceDir); } } diff --git a/jack-tests/tests/com/android/jack/annotation/AnnotationTests.java b/jack-tests/tests/com/android/jack/annotation/AnnotationTests.java index 9b1aa63..16cfc0e 100644 --- a/jack-tests/tests/com/android/jack/annotation/AnnotationTests.java +++ b/jack-tests/tests/com/android/jack/annotation/AnnotationTests.java @@ -81,8 +81,8 @@ public class AnnotationTests extends RuntimeTest { @Test public void test001_2() throws Exception { IToolchain toolchain = AbstractTestTools.getCandidateToolchain(); - toolchain.srcToExe( - AbstractTestTools.getClasspathAsString(toolchain.getDefaultBootClasspath()), + toolchain.addToClasspath(toolchain.getDefaultBootClasspath()) + .srcToExe( AbstractTestTools.createTempDir(), /* zipFile = */ false, new File[] { @@ -114,11 +114,9 @@ public class AnnotationTests extends RuntimeTest { public void test004() throws Exception { File testFolder = AbstractTestTools.getTestRootDir("com.android.jack.annotation.test004"); IToolchain toolchain = AbstractTestTools.getCandidateToolchain(); - toolchain.srcToExe( - AbstractTestTools.getClasspathAsString(toolchain.getDefaultBootClasspath()), + toolchain.addToClasspath(toolchain.getDefaultBootClasspath()).srcToExe( AbstractTestTools.createTempDir(), - /* zipFile = */ false, - testFolder); + /* zipFile = */false, testFolder); } @Test diff --git a/jack-tests/tests/com/android/jack/bridge/BridgeTests.java b/jack-tests/tests/com/android/jack/bridge/BridgeTests.java index f7e543b..1b68cd2 100644 --- a/jack-tests/tests/com/android/jack/bridge/BridgeTests.java +++ b/jack-tests/tests/com/android/jack/bridge/BridgeTests.java @@ -112,8 +112,8 @@ public class BridgeTests extends RuntimeTest { IToolchain toolchain = AbstractTestTools.getCandidateToolchain(); File srcFolder = AbstractTestTools.getTestRootDir("com.android.jack.bridge.test008.jack"); File jackZipOfGenericPackageProtected = AbstractTestTools.createTempFile("tmpBridge", toolchain.getLibraryExtension()); - toolchain.srcToLib( - AbstractTestTools.getClasspathAsString(toolchain.getDefaultBootClasspath()), + toolchain.addToClasspath(toolchain.getDefaultBootClasspath()) + .srcToLib( jackZipOfGenericPackageProtected, /* zipFiles = */ true, srcFolder); @@ -121,8 +121,8 @@ public class BridgeTests extends RuntimeTest { // Build jack file from PublicExtendsGeneric.java toolchain = AbstractTestTools.getCandidateToolchain(); File jackZipOfPublicExtendsGeneric = AbstractTestTools.createTempFile("tmpBridge", toolchain.getLibraryExtension()); - toolchain.srcToLib( - AbstractTestTools.getClasspathsAsString(toolchain.getDefaultBootClasspath(), new File [] {jackZipOfGenericPackageProtected}), + toolchain.addToClasspath(toolchain.getDefaultBootClasspath()).addToClasspath(jackZipOfGenericPackageProtected) + .srcToLib( jackZipOfPublicExtendsGeneric, /* zipFiles = */ true, new File(srcFolder, "sub/PublicExtendsGeneric.java")); @@ -131,8 +131,8 @@ public class BridgeTests extends RuntimeTest { toolchain = AbstractTestTools.getCandidateToolchain(); toolchain = toolchain.addStaticLibs(jackZipOfPublicExtendsGeneric); File outDexFolder = AbstractTestTools.createTempDir(); - toolchain.srcToExe( - AbstractTestTools.getClasspathAsString(toolchain.getDefaultBootClasspath()), + toolchain.addToClasspath(toolchain.getDefaultBootClasspath()) + .srcToExe( outDexFolder, /* zipFile = */ false, new File(srcFolder, "Caller.java")); @@ -141,8 +141,8 @@ public class BridgeTests extends RuntimeTest { @Test public void test009() throws Exception { IToolchain toolchain = AbstractTestTools.getCandidateToolchain(); - toolchain.srcToExe( - AbstractTestTools.getClasspathAsString(toolchain.getDefaultBootClasspath()), + toolchain.addToClasspath(toolchain.getDefaultBootClasspath()) + .srcToExe( AbstractTestTools.createTempDir(), /* zipFile = */ false, AbstractTestTools.getTestRootDir("com.android.jack.bridge.test009")); diff --git a/jack-tests/tests/com/android/jack/cast/CastTests.java b/jack-tests/tests/com/android/jack/cast/CastTests.java index c0761f7..6bccf9a 100644 --- a/jack-tests/tests/com/android/jack/cast/CastTests.java +++ b/jack-tests/tests/com/android/jack/cast/CastTests.java @@ -120,8 +120,8 @@ public class CastTests extends RuntimeTest { */ private void compileTest(@Nonnull String name) throws Exception { IToolchain toolchain = AbstractTestTools.getCandidateToolchain(); - toolchain.srcToExe(AbstractTestTools.getClasspathAsString(toolchain.getDefaultBootClasspath()), - AbstractTestTools.createTempDir(), + toolchain.addToClasspath(toolchain.getDefaultBootClasspath()) + .srcToExe(AbstractTestTools.createTempDir(), /* zipFile = */false, AbstractTestTools.getTestRootDir("com.android.jack.cast." + name + ".jack")); } diff --git a/jack-tests/tests/com/android/jack/cast/UselessCastRemoverTest.java b/jack-tests/tests/com/android/jack/cast/UselessCastRemoverTest.java index da117bd..87cdf0f 100644 --- a/jack-tests/tests/com/android/jack/cast/UselessCastRemoverTest.java +++ b/jack-tests/tests/com/android/jack/cast/UselessCastRemoverTest.java @@ -78,8 +78,8 @@ public class UselessCastRemoverTest { File out = new File(outFolder, DexFileWriter.DEX_FILENAME); IToolchain toolchain = AbstractTestTools.getCandidateToolchain(); - toolchain.srcToExe(AbstractTestTools.getClasspathAsString(toolchain.getDefaultBootClasspath()), - outFolder, + toolchain.addToClasspath(toolchain.getDefaultBootClasspath()) + .srcToExe(outFolder, /* zipFile = */false, testFolder); DexFile dexFile = new DexFile(out); diff --git a/jack-tests/tests/com/android/jack/classpath/ClasspathTests.java b/jack-tests/tests/com/android/jack/classpath/ClasspathTests.java index 7ec0a20..21a26a2 100644 --- a/jack-tests/tests/com/android/jack/classpath/ClasspathTests.java +++ b/jack-tests/tests/com/android/jack/classpath/ClasspathTests.java @@ -44,13 +44,14 @@ public class ClasspathTests { File libOut = AbstractTestTools.createTempDir(); IToolchain toolchain = AbstractTestTools.getCandidateToolchain(); - toolchain.srcToLib(AbstractTestTools.getClasspathAsString(toolchain.getDefaultBootClasspath()), - libOut, false, + toolchain.addToClasspath(toolchain.getDefaultBootClasspath()) + .srcToLib(libOut, false, new File(AbstractTestTools.getTestRootDir("com.android.jack.classpath.test001"), "lib")); File testOut = AbstractTestTools.createTempDir(); - toolchain.srcToLib(AbstractTestTools.getClasspathAsString(toolchain.getDefaultBootClasspath()) - + File.pathSeparatorChar + libOut.getAbsolutePath(), testOut, false, + toolchain.addToClasspath(toolchain.getDefaultBootClasspath()) + .addToClasspath(libOut) + .srcToLib(testOut, false, new File(AbstractTestTools.getTestRootDir("com.android.jack.classpath.test001"), "jack")); } @@ -58,33 +59,34 @@ public class ClasspathTests { public void test002() throws Exception { IToolchain toolchain = AbstractTestTools.getCandidateToolchain(); - String defaultBootCp = - AbstractTestTools.getClasspathAsString(toolchain.getDefaultBootClasspath()); + File[] defaultBootCp = toolchain.getDefaultBootClasspath(); File testFolder = AbstractTestTools.getTestRootDir("com.android.jack.classpath.test002"); File outFolder = AbstractTestTools.createTempDir(); File lib1Out = AbstractTestTools.createDir(outFolder, "lib1"); - toolchain.srcToLib(defaultBootCp, - lib1Out, + toolchain.addToClasspath(defaultBootCp) + .srcToLib(lib1Out, /* zipFiles = */ false, new File(testFolder, "lib1")); File lib1BisOut = AbstractTestTools.createDir(outFolder, "lib1override"); toolchain = AbstractTestTools.getCandidateToolchain(); - toolchain.srcToLib(defaultBootCp, - lib1BisOut, + toolchain.addToClasspath(defaultBootCp) + .srcToLib(lib1BisOut, /* zipFiles = */ false, new File(testFolder, "lib1override")); File lib2Out = AbstractTestTools.createDir(outFolder, "lib2"); toolchain = AbstractTestTools.getCandidateToolchain(); - toolchain.srcToLib(defaultBootCp - + File.pathSeparatorChar + lib1Out.getAbsolutePath(), lib2Out, + toolchain.addToClasspath(defaultBootCp) + .addToClasspath(lib1Out) + .srcToLib(lib2Out, /* zipFiles = */ false, new File(testFolder, "lib2")); toolchain = AbstractTestTools.getCandidateToolchain(); toolchain.addStaticLibs(lib2Out); - toolchain.srcToExe(defaultBootCp - + File.pathSeparatorChar + lib1BisOut.getAbsolutePath(), outFolder, + toolchain.addToClasspath(defaultBootCp) + .addToClasspath(lib1BisOut) + .srcToExe(outFolder, /* zipFile = */ false, new File(testFolder, "jack")); } @@ -96,17 +98,18 @@ public class ClasspathTests { IToolchain toolchain = AbstractTestTools.getCandidateToolchain(); File libOut = AbstractTestTools.createTempDir(); File libSrc = new File(testDir, "lib"); - String defaultBootClasspath = - AbstractTestTools.getClasspathAsString(toolchain.getDefaultBootClasspath()); - toolchain.srcToLib(defaultBootClasspath, libOut, /* zipFiles = */ false, libSrc); + File[] defaultBootClasspath = toolchain.getDefaultBootClasspath(); + toolchain.addToClasspath(defaultBootClasspath) + .srcToLib(libOut, /* zipFiles = */ false, libSrc); { // reference compilation toolchain = AbstractTestTools.getCandidateToolchain(); File testOut = AbstractTestTools.createTempDir(); File testSrc = new File(testDir, "jack"); - toolchain.srcToLib(defaultBootClasspath + File.pathSeparatorChar + libOut.getAbsolutePath(), - testOut, /* zipFiles = */ false, testSrc); + toolchain.addToClasspath(defaultBootClasspath) + .addToClasspath(libOut) + .srcToLib(testOut, /* zipFiles = */ false, testSrc); } { @@ -119,48 +122,51 @@ public class ClasspathTests { toolchain = AbstractTestTools.getCandidateToolchain(); File testOut = AbstractTestTools.createTempDir(); File testSrc = new File(testDir, "jack"); - toolchain.srcToLib(defaultBootClasspath + File.pathSeparatorChar + libOut.getAbsolutePath(), - testOut, /* zipFiles = */ false, testSrc); + toolchain.addToClasspath(defaultBootClasspath) + .addToClasspath(libOut) + .srcToLib(testOut, /* zipFiles = */ false, testSrc); } } @Test public void libOfLib() throws Exception { IToolchain toolchain = AbstractTestTools.getCandidateToolchain(); - String defaultClasspath = - AbstractTestTools.getClasspathAsString(toolchain.getDefaultBootClasspath()); + File[] defaultClasspath = toolchain.getDefaultBootClasspath(); File libOfLibOut = AbstractTestTools.createTempFile("libOfLibOut", toolchain.getLibraryExtension()); File sourceDir = AbstractTestTools.getTestRootDir("com.android.jack.liboflib.lib2"); - toolchain.srcToLib(defaultClasspath, libOfLibOut, /* zipFiles = */ true, sourceDir); + toolchain.addToClasspath(defaultClasspath) + .srcToLib(libOfLibOut, /* zipFiles = */ true, sourceDir); toolchain = AbstractTestTools.getCandidateToolchain(); File libOut = AbstractTestTools.createTempFile("libOut", toolchain.getLibraryExtension()); sourceDir = AbstractTestTools.getTestRootDir("com.android.jack.liboflib.lib"); - toolchain.srcToLib(defaultClasspath + File.pathSeparatorChar + libOfLibOut.getAbsolutePath(), - libOut, /* zipFiles = */ true, sourceDir); + toolchain.addToClasspath(defaultClasspath) + .addToClasspath(libOfLibOut) + .srcToLib(libOut, /* zipFiles = */ true, sourceDir); toolchain = AbstractTestTools.getCandidateToolchain(); File mainOut = AbstractTestTools.createTempFile("mainOut", toolchain.getLibraryExtension()); sourceDir = AbstractTestTools.getTestRootDir("com.android.jack.liboflib.main"); - toolchain.srcToLib(defaultClasspath + File.pathSeparatorChar + libOut.getAbsolutePath(), - mainOut, /* zipFiles = */ true, sourceDir); + toolchain.addToClasspath(defaultClasspath) + .addToClasspath(libOut) + .srcToLib(mainOut, /* zipFiles = */ true, sourceDir); } @Test public void testMissingClasspathEntry() throws Exception { JackApiToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.class); - String defaultClasspath = - AbstractTestTools.getClasspathAsString(toolchain.getDefaultBootClasspath()); File srcDir = AbstractTestTools.getTestRootDir("com.android.jack.classpath.test004.jack"); - String classpathWithMissingEntry = defaultClasspath + File.pathSeparator + - new File(srcDir, "missing.jack").getAbsolutePath(); File testOut = AbstractTestTools.createTempFile("ClasspathTest", "missing"); - toolchain.srcToLib(classpathWithMissingEntry, testOut, /* zipFiles = */ true, srcDir); + toolchain.addToClasspath(toolchain.getDefaultBootClasspath()) + .addToClasspath(new File(srcDir, "missing.jack")) + .srcToLib(testOut, /* zipFiles = */ true, srcDir); toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.class); toolchain.addProperty(Jack.STRICT_CLASSPATH.getName(), "true"); try { - toolchain.srcToLib(classpathWithMissingEntry, testOut, /* zipFiles = */ true, srcDir); + toolchain.addToClasspath(toolchain.getDefaultBootClasspath()) + .addToClasspath(new File(srcDir, "missing.jack")) + .srcToLib(testOut, /* zipFiles = */ true, srcDir); Assert.fail(); } catch (JackAbortException e) { Assert.assertTrue(e.getCause() instanceof LibraryReadingException); @@ -180,18 +186,19 @@ public class ClasspathTests { Assert.assertTrue(invalidJack.isFile()); JackApiToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.class); - String classpathWithInvalidEntry = - AbstractTestTools.getClasspathAsString(toolchain.getDefaultBootClasspath()) - + File.pathSeparator + invalidJack.getAbsolutePath(); File testOut = AbstractTestTools.createTempFile("ClasspathTest", "invalid"); - toolchain.srcToLib(classpathWithInvalidEntry, testOut, /* zipFiles = */ true, srcDir); + toolchain.addToClasspath(toolchain.getDefaultBootClasspath()) + .addToClasspath(invalidJack) + .srcToLib(testOut, /* zipFiles = */ true, srcDir); toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.class); toolchain.addProperty(Jack.STRICT_CLASSPATH.getName(), "true"); try { - toolchain.srcToLib(classpathWithInvalidEntry, testOut, /* zipFiles = */ true, srcDir); + toolchain.addToClasspath(toolchain.getDefaultBootClasspath()) + .addToClasspath(invalidJack) + .srcToLib(testOut, /* zipFiles = */ true, srcDir); Assert.fail(); } catch (JackAbortException e) { Assert.assertTrue(e.getCause() instanceof LibraryReadingException); diff --git a/jack-tests/tests/com/android/jack/clinit/ClinitTests.java b/jack-tests/tests/com/android/jack/clinit/ClinitTests.java index be461e2..c1aaa54 100644 --- a/jack-tests/tests/com/android/jack/clinit/ClinitTests.java +++ b/jack-tests/tests/com/android/jack/clinit/ClinitTests.java @@ -36,8 +36,8 @@ public class ClinitTests { @Test public void testCompileWithClinit() throws Exception { IToolchain toolchain = AbstractTestTools.getCandidateToolchain(); - toolchain.srcToExe( - AbstractTestTools.getClasspathAsString(toolchain.getDefaultBootClasspath()), + toolchain.addToClasspath(toolchain.getDefaultBootClasspath()) + .srcToExe( AbstractTestTools.createTempDir(), /* zipFile = */ false, AbstractTestTools.getTestRootDir("com.android.jack.clinit.jack")); diff --git a/jack-tests/tests/com/android/jack/compile/androidtree/bouncycastle/BouncycastleCompilationTest.java b/jack-tests/tests/com/android/jack/compile/androidtree/bouncycastle/BouncycastleCompilationTest.java index 3768888..8cf5cc8 100644 --- a/jack-tests/tests/com/android/jack/compile/androidtree/bouncycastle/BouncycastleCompilationTest.java +++ b/jack-tests/tests/com/android/jack/compile/androidtree/bouncycastle/BouncycastleCompilationTest.java @@ -65,8 +65,8 @@ public class BouncycastleCompilationTest { File outDexFolder = AbstractTestTools.createTempDir(); AndroidToolchain toolchain = AbstractTestTools.getCandidateToolchain(AndroidToolchain.class); toolchain.disableDxOptimizations(); - toolchain.srcToExe( - AbstractTestTools.getClasspathAsString(CLASSPATH), + toolchain.addToClasspath(CLASSPATH) + .srcToExe( outDexFolder, /* zipFile = */ false, SOURCELIST); diff --git a/jack-tests/tests/com/android/jack/compile/androidtree/core/CoreCompilationTest.java b/jack-tests/tests/com/android/jack/compile/androidtree/core/CoreCompilationTest.java index 8d3631d..fa55644 100644 --- a/jack-tests/tests/com/android/jack/compile/androidtree/core/CoreCompilationTest.java +++ b/jack-tests/tests/com/android/jack/compile/androidtree/core/CoreCompilationTest.java @@ -56,8 +56,8 @@ public class CoreCompilationTest { File outDexFolder = AbstractTestTools.createTempDir(); JackBasedToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackBasedToolchain.class); toolchain.addProperty(Options.JAVA_SOURCE_VERSION.getName(), JavaVersion.JAVA_7.toString()); - toolchain.srcToExe( - AbstractTestTools.getClasspathAsString(toolchain.getDefaultBootClasspath()), + toolchain.addToClasspath(toolchain.getDefaultBootClasspath()) + .srcToExe( outDexFolder, /* zipFile = */ false, SOURCELIST); @@ -97,7 +97,6 @@ public class CoreCompilationTest { toolchain.setSourceLevel(SourceLevel.JAVA_7); toolchain.srcToExe( - /* classpath = */ null, coreDexFolderFromJava, /* zipFile = */ false, SOURCELIST); diff --git a/jack-tests/tests/com/android/jack/compile/androidtree/dalvik/compilerregressions/CompilerRegressionsTest.java b/jack-tests/tests/com/android/jack/compile/androidtree/dalvik/compilerregressions/CompilerRegressionsTest.java index ab98c40..9840539 100644 --- a/jack-tests/tests/com/android/jack/compile/androidtree/dalvik/compilerregressions/CompilerRegressionsTest.java +++ b/jack-tests/tests/com/android/jack/compile/androidtree/dalvik/compilerregressions/CompilerRegressionsTest.java @@ -41,8 +41,8 @@ public class CompilerRegressionsTest { @Test public void compileRegressions() throws Exception { AndroidToolchain toolchain = AbstractTestTools.getCandidateToolchain(AndroidToolchain.class); - toolchain.srcToExe( - AbstractTestTools.getClasspathAsString(BOOTCLASSPATH), + toolchain.addToClasspath(BOOTCLASSPATH) + .srcToExe( AbstractTestTools.createTempFile("out", ".zip"), /* zipFile = */ true, TestTools.getArtTestFolder("083-compiler-regressions")); diff --git a/jack-tests/tests/com/android/jack/compile/androidtree/dalvik/finalizer/FinalizerTest.java b/jack-tests/tests/com/android/jack/compile/androidtree/dalvik/finalizer/FinalizerTest.java index e5d2f45..5e45e6b 100644 --- a/jack-tests/tests/com/android/jack/compile/androidtree/dalvik/finalizer/FinalizerTest.java +++ b/jack-tests/tests/com/android/jack/compile/androidtree/dalvik/finalizer/FinalizerTest.java @@ -41,8 +41,8 @@ public class FinalizerTest { @Test public void compileFinalizer() throws Exception { AndroidToolchain toolchain = AbstractTestTools.getCandidateToolchain(AndroidToolchain.class); - toolchain.srcToExe( - AbstractTestTools.getClasspathAsString(BOOTCLASSPATH), + toolchain.addToClasspath(BOOTCLASSPATH) + .srcToExe( AbstractTestTools.createTempFile("out", ".zip"), /* zipFile = */ true, TestTools.getArtTestFolder("036-finalizer")); diff --git a/jack-tests/tests/com/android/jack/compile/androidtree/dalvik/omnibus/OmnibusCompilationTest.java b/jack-tests/tests/com/android/jack/compile/androidtree/dalvik/omnibus/OmnibusCompilationTest.java index 6164b2d..ff3572f 100644 --- a/jack-tests/tests/com/android/jack/compile/androidtree/dalvik/omnibus/OmnibusCompilationTest.java +++ b/jack-tests/tests/com/android/jack/compile/androidtree/dalvik/omnibus/OmnibusCompilationTest.java @@ -44,8 +44,8 @@ public class OmnibusCompilationTest { @Category(SlowTests.class) public void compileOmnibus() throws Exception { AndroidToolchain toolchain = AbstractTestTools.getCandidateToolchain(AndroidToolchain.class); - toolchain.srcToExe( - AbstractTestTools.getClasspathAsString(BOOTCLASSPATH), + toolchain.addToClasspath(BOOTCLASSPATH) + .srcToExe( AbstractTestTools.createTempFile("out", ".zip"), /* zipFile = */ true, TestTools.getArtTestFolder("003-omnibus-opcodes")); diff --git a/jack-tests/tests/com/android/jack/compile/androidtree/ext/ExtCompilationTest.java b/jack-tests/tests/com/android/jack/compile/androidtree/ext/ExtCompilationTest.java index 55f1e03..2d44a55 100644 --- a/jack-tests/tests/com/android/jack/compile/androidtree/ext/ExtCompilationTest.java +++ b/jack-tests/tests/com/android/jack/compile/androidtree/ext/ExtCompilationTest.java @@ -58,8 +58,8 @@ public class ExtCompilationTest { @Category(RedundantTests.class) public void compileExt() throws Exception { AndroidToolchain toolchain = AbstractTestTools.getCandidateToolchain(AndroidToolchain.class); - toolchain.srcToExe( - AbstractTestTools.getClasspathAsString(CLASSPATH), + toolchain.addToClasspath(CLASSPATH) + .srcToExe( AbstractTestTools.createTempDir(), /* zipFile = */ false, SOURCELIST); diff --git a/jack-tests/tests/com/android/jack/compile/androidtree/frameworks/FrameworksBaseCompilationTest.java b/jack-tests/tests/com/android/jack/compile/androidtree/frameworks/FrameworksBaseCompilationTest.java index 0ba3671..3e89b5c 100644 --- a/jack-tests/tests/com/android/jack/compile/androidtree/frameworks/FrameworksBaseCompilationTest.java +++ b/jack-tests/tests/com/android/jack/compile/androidtree/frameworks/FrameworksBaseCompilationTest.java @@ -67,8 +67,8 @@ public class FrameworksBaseCompilationTest { JackBasedToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackBasedToolchain.class); toolchain.setSourceLevel(SourceLevel.JAVA_7); toolchain.addProperty(DexFileWriter.DEX_WRITING_POLICY.getName(), "multidex"); - toolchain.srcToExe( - AbstractTestTools.getClasspathsAsString(BOOTCLASSPATH, CLASSPATH), + toolchain.addToClasspath(BOOTCLASSPATH).addToClasspath(CLASSPATH) + .srcToExe( outDexFolder, /* zipFile = */ false, SOURCELIST); diff --git a/jack-tests/tests/com/android/jack/compiletime/CompileTimeTests.java b/jack-tests/tests/com/android/jack/compiletime/CompileTimeTests.java index 878fd40..4806c71 100644 --- a/jack-tests/tests/com/android/jack/compiletime/CompileTimeTests.java +++ b/jack-tests/tests/com/android/jack/compiletime/CompileTimeTests.java @@ -33,8 +33,8 @@ public class CompileTimeTests { @Test public void test001() throws Exception { IToolchain toolchain = AbstractTestTools.getCandidateToolchain(); - toolchain.srcToExe( - AbstractTestTools.getClasspathAsString(toolchain.getDefaultBootClasspath()), + toolchain.addToClasspath(toolchain.getDefaultBootClasspath()) + .srcToExe( AbstractTestTools.createTempDir(), /* zipFile = */ false, AbstractTestTools.getTestRootDir("com.android.jack.compiletime.test001.jack")); @@ -43,8 +43,8 @@ public class CompileTimeTests { @Test public void test002() throws Exception { IToolchain toolchain = AbstractTestTools.getCandidateToolchain(); - toolchain.srcToExe( - AbstractTestTools.getClasspathAsString(toolchain.getDefaultBootClasspath()), + toolchain.addToClasspath(toolchain.getDefaultBootClasspath()) + .srcToExe( AbstractTestTools.createTempDir(), /* zipFile = */ false, AbstractTestTools.getTestRootDir("com.android.jack.compiletime.test002.jack")); diff --git a/jack-tests/tests/com/android/jack/constant/ConstantTests.java b/jack-tests/tests/com/android/jack/constant/ConstantTests.java index d60fb2f..7c80c25 100644 --- a/jack-tests/tests/com/android/jack/constant/ConstantTests.java +++ b/jack-tests/tests/com/android/jack/constant/ConstantTests.java @@ -153,8 +153,8 @@ public class ConstantTests extends RuntimeTest { @Category(RuntimeRegressionTest.class) public void test008() throws Exception { IToolchain toolchain = AbstractTestTools.getCandidateToolchain(); - toolchain.srcToExe( - AbstractTestTools.getClasspathAsString(toolchain.getDefaultBootClasspath()), + toolchain.addToClasspath(toolchain.getDefaultBootClasspath()) + .srcToExe( AbstractTestTools.createTempDir(), /* zipFile = */ false, AbstractTestTools.getTestRootDir("com.android.jack.constant.test008")); diff --git a/jack-tests/tests/com/android/jack/dextag/DexTagTests.java b/jack-tests/tests/com/android/jack/dextag/DexTagTests.java index c3db70a..8a5fae3 100644 --- a/jack-tests/tests/com/android/jack/dextag/DexTagTests.java +++ b/jack-tests/tests/com/android/jack/dextag/DexTagTests.java @@ -37,8 +37,8 @@ public class DexTagTests { JackBasedToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackBasedToolchain.class); - toolchain.srcToExe( - AbstractTestTools.getClasspathAsString(toolchain.getDefaultBootClasspath()), + toolchain.addToClasspath(toolchain.getDefaultBootClasspath()) + .srcToExe( out, /* zipFile = */ false, testFolder); diff --git a/jack-tests/tests/com/android/jack/dx/DxTests.java b/jack-tests/tests/com/android/jack/dx/DxTests.java index 9e5e815..4aaea78 100644 --- a/jack-tests/tests/com/android/jack/dx/DxTests.java +++ b/jack-tests/tests/com/android/jack/dx/DxTests.java @@ -115,8 +115,8 @@ public class DxTests extends RuntimeTest { IToolchain toolchain = AbstractTestTools.getCandidateToolchain(); File dexOutDir = AbstractTestTools.createTempDir(); File outFile = new File(dexOutDir, "classes.dex"); - toolchain.srcToExe( - AbstractTestTools.getClasspathAsString(toolchain.getDefaultBootClasspath()), + toolchain.addToClasspath(toolchain.getDefaultBootClasspath()) + .srcToExe( dexOutDir, /* zipFile = */ false, AbstractTestTools.getTestRootDir("com.android.jack.dx.regallocator.jack")); diff --git a/jack-tests/tests/com/android/jack/error/AnnotationProcessorErrorTest.java b/jack-tests/tests/com/android/jack/error/AnnotationProcessorErrorTest.java index 1867467..b3c4700 100644 --- a/jack-tests/tests/com/android/jack/error/AnnotationProcessorErrorTest.java +++ b/jack-tests/tests/com/android/jack/error/AnnotationProcessorErrorTest.java @@ -73,9 +73,8 @@ public class AnnotationProcessorErrorTest { jackApiToolchain.setAnnotationProcessorClass(ResourceAnnotationProcessor.class); try { - jackApiToolchain.srcToExe( - AbstractTestTools.getClasspathAsString(jackApiToolchain.getDefaultBootClasspath()), - te.getOutputDexFolder(), /* zipFile = */ false, te.getSourceFolder()); + jackApiToolchain.addToClasspath(jackApiToolchain.getDefaultBootClasspath()) + .srcToExe(te.getOutputDexFolder(), /* zipFile = */ false, te.getSourceFolder()); Assert.fail(); } catch (JackUserException e) { // Failure is ok since output for annotation processor is not specify. @@ -109,9 +108,9 @@ public class AnnotationProcessorErrorTest { try { - jackApiToolchain.srcToExe( - AbstractTestTools.getClasspathAsString(jackApiToolchain.getDefaultBootClasspath()) - + File.pathSeparator + te.getJackFolder(), te.getOutputDexFolder(), /* zipFile = */ false, te.getSourceFolder()); + jackApiToolchain.addToClasspath(jackApiToolchain.getDefaultBootClasspath()) + .addToClasspath(te.getJackFolder()) + .srcToExe(te.getOutputDexFolder(), /* zipFile = */ false, te.getSourceFolder()); Assert.fail(); } catch (FrontendCompilationException e) { @@ -145,9 +144,9 @@ public class AnnotationProcessorErrorTest { jackApiToolchain.setErrorStream(errOut); try { - jackApiToolchain.srcToExe( - AbstractTestTools.getClasspathAsString(jackApiToolchain.getDefaultBootClasspath()) - + File.pathSeparator + te.getJackFolder(), te.getOutputDexFolder(), /* zipFile = */ false, te.getSourceFolder()); + jackApiToolchain.addToClasspath(jackApiToolchain.getDefaultBootClasspath()) + .addToClasspath(te.getJackFolder()) + .srcToExe(te.getOutputDexFolder(), /* zipFile = */ false, te.getSourceFolder()); Assert.fail(); } catch (FrontendCompilationException ex) { // Failure is ok since source generated by annotation processor does not compile. @@ -176,9 +175,9 @@ public class AnnotationProcessorErrorTest { jackApiToolchain.setAnnotationProcessorOutDir(te.getTestingFolder()); File dexOutput = te.getOutputDexFolder(); - jackApiToolchain.srcToExe( - AbstractTestTools.getClasspathAsString(jackApiToolchain.getDefaultBootClasspath()) - + File.pathSeparator + te.getJackFolder(), dexOutput, /* zipFile = */ false, te.getSourceFolder()); + jackApiToolchain.addToClasspath(jackApiToolchain.getDefaultBootClasspath()) + .addToClasspath(te.getJackFolder()) + .srcToExe(dexOutput, /* zipFile = */ false, te.getSourceFolder()); DexFile dexFile = new DexFile(new File(dexOutput, jackApiToolchain.getBinaryFileName())); List<String> sourceFileInDex = new ArrayList<String>(); @@ -203,9 +202,9 @@ public class AnnotationProcessorErrorTest { jackApiToolchain.setAnnotationProcessorClass(ResourceAnnotationProcessor.class); jackApiToolchain.setAnnotationProcessorOutDir(te.getTestingFolder()); - jackApiToolchain.srcToExe( - AbstractTestTools.getClasspathAsString(jackApiToolchain.getDefaultBootClasspath()) - + File.pathSeparator + te.getJackFolder(), te.getOutputDexFolder(), /* zipFile = */ false, te.getSourceFolder()); + jackApiToolchain.addToClasspath(jackApiToolchain.getDefaultBootClasspath()) + .addToClasspath(te.getJackFolder()) + .srcToExe(te.getOutputDexFolder(), /* zipFile = */ false, te.getSourceFolder()); File discoverFile = new File(te.getTestingFolder(), ResourceAnnotationProcessor.FILENAME); Assert.assertTrue(discoverFile.exists()); @@ -233,9 +232,8 @@ public class AnnotationProcessorErrorTest { // Compile annotation to a jack file JackApiToolchain jackApiToolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.class); - jackApiToolchain.srcToLib( - AbstractTestTools.getClasspathAsString(jackApiToolchain.getDefaultBootClasspath()), - te.getJackFolder(), false /* zipFiles = */, te.getSourceFolder()); + jackApiToolchain.addToClasspath(jackApiToolchain.getDefaultBootClasspath()) + .srcToLib(te.getJackFolder(), false /* zipFiles = */, te.getSourceFolder()); AbstractTestTools.deleteTempDir(te.getSourceFolder()); } diff --git a/jack-tests/tests/com/android/jack/error/CommandLineErrorTest.java b/jack-tests/tests/com/android/jack/error/CommandLineErrorTest.java index 8334e13..77b74fb 100644 --- a/jack-tests/tests/com/android/jack/error/CommandLineErrorTest.java +++ b/jack-tests/tests/com/android/jack/error/CommandLineErrorTest.java @@ -54,9 +54,9 @@ public class CommandLineErrorTest { jackApiToolchain.setErrorStream(errOut); jackApiToolchain.addEcjArgs("-unsupported"); try { - jackApiToolchain.srcToExe( - AbstractTestTools.getClasspathAsString(jackApiToolchain.getDefaultBootClasspath()) - + File.pathSeparator + ite.getJackFolder(), ite.getOutputDexFolder(), + jackApiToolchain.addToClasspath(jackApiToolchain.getDefaultBootClasspath()) + .addToClasspath(ite.getJackFolder()) + .srcToExe(ite.getOutputDexFolder(), /* zipFile = */ false, ite.getSourceFolder()); Assert.fail(); } catch (IllegalOptionsException e) { @@ -80,9 +80,9 @@ public class CommandLineErrorTest { jackApiToolchain.setOutputStream(out); try { - jackApiToolchain.srcToExe( - AbstractTestTools.getClasspathAsString(jackApiToolchain.getDefaultBootClasspath()) - + File.pathSeparator + ite.getJackFolder(), ite.getOutputDexFolder(), + jackApiToolchain.addToClasspath(jackApiToolchain.getDefaultBootClasspath()) + .addToClasspath(ite.getJackFolder()) + .srcToExe(ite.getOutputDexFolder(), /* zipFile = */ false, ite.getSourceFolder()); Assert.fail(); } catch (NothingToDoException e) { @@ -110,7 +110,7 @@ public class CommandLineErrorTest { jackApiToolchain.setOutputStream(out); try { - jackApiToolchain.srcToExe(null, ite.getOutputDexFolder(), + jackApiToolchain.srcToExe(ite.getOutputDexFolder(), /* zipFile = */ false, ite.getSourceFolder()); Assert.fail(); } catch (FrontendCompilationException e) { diff --git a/jack-tests/tests/com/android/jack/error/ConfigErrorTest.java b/jack-tests/tests/com/android/jack/error/ConfigErrorTest.java index 3e074f5..948f0e7 100644 --- a/jack-tests/tests/com/android/jack/error/ConfigErrorTest.java +++ b/jack-tests/tests/com/android/jack/error/ConfigErrorTest.java @@ -44,8 +44,8 @@ public class ConfigErrorTest { jackApiToolchain.addProperty("unknown", "true"); try { - jackApiToolchain.srcToExe( - AbstractTestTools.getClasspathAsString(jackApiToolchain.getDefaultBootClasspath()), + jackApiToolchain.addToClasspath(jackApiToolchain.getDefaultBootClasspath()) + .srcToExe( ite.getOutputDexFolder(), /* zipFile = */ true, ite.getSourceFolder()); Assert.fail(); } catch (UnknownPropertyNameException e) { diff --git a/jack-tests/tests/com/android/jack/error/ErrorTest.java b/jack-tests/tests/com/android/jack/error/ErrorTest.java index 321780c..91fb962 100644 --- a/jack-tests/tests/com/android/jack/error/ErrorTest.java +++ b/jack-tests/tests/com/android/jack/error/ErrorTest.java @@ -58,8 +58,8 @@ public class ErrorTest { toolchain.setErrorStream(err); try { - toolchain.srcToExe( - AbstractTestTools.getClasspathAsString(toolchain.getDefaultBootClasspath()), + toolchain.addToClasspath(toolchain.getDefaultBootClasspath()) + .srcToExe( AbstractTestTools.createTempDir(), /* zipFile = */ false, AbstractTestTools.getTestRootDir("com.android.jack." + testName + ".jack")); diff --git a/jack-tests/tests/com/android/jack/error/FileAccessErrorTest.java b/jack-tests/tests/com/android/jack/error/FileAccessErrorTest.java index 66b2336..dd81936 100644 --- a/jack-tests/tests/com/android/jack/error/FileAccessErrorTest.java +++ b/jack-tests/tests/com/android/jack/error/FileAccessErrorTest.java @@ -66,9 +66,8 @@ public class FileAccessErrorTest { JackApiToolchain jackApiToolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.class); try { - jackApiToolchain.srcToLib( - AbstractTestTools.getClasspathAsString(jackApiToolchain.getDefaultBootClasspath()), - jackOutputFile, /* zipFiles = */ false, te.getSourceFolder()); + jackApiToolchain.addToClasspath(jackApiToolchain.getDefaultBootClasspath()) + .srcToLib(jackOutputFile, /* zipFiles = */ false, te.getSourceFolder()); Assert.fail(); } catch (PropertyIdException e) { // Failure is ok since jack output folder is not readable @@ -92,9 +91,8 @@ public class FileAccessErrorTest { JackApiToolchain jackApiToolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.class); - jackApiToolchain.srcToLib( - AbstractTestTools.getClasspathAsString(jackApiToolchain.getDefaultBootClasspath()), - helper.getJackFolder(), /* zipFiles = */ false, helper.getSourceFolder()); + jackApiToolchain.addToClasspath(jackApiToolchain.getDefaultBootClasspath()) + .srcToLib(helper.getJackFolder(), /* zipFiles = */ false, helper.getSourceFolder()); AbstractTestTools.deleteFile(srcFile); @@ -112,8 +110,8 @@ public class FileAccessErrorTest { jackApiToolchain.setErrorStream(errOut); jackApiToolchain.addStaticLibs(helper.getJackFolder()); try { - jackApiToolchain.srcToExe( - AbstractTestTools.getClasspathAsString(jackApiToolchain.getDefaultBootClasspath()), + jackApiToolchain.addToClasspath(jackApiToolchain.getDefaultBootClasspath()) + .srcToExe( helper.getOutputDexFolder(), /* zipFile = */ false, helper.getSourceFolder()); Assert.fail(); } catch (JackAbortException e) { @@ -147,9 +145,8 @@ public class FileAccessErrorTest { jackApiToolchain.setErrorStream(errOut); try { - jackApiToolchain.srcToExe( - AbstractTestTools.getClasspathAsString(jackApiToolchain.getDefaultBootClasspath()), - te.getOutputDexFolder(), /* zipFile = */ false, te.getSourceFolder()); + jackApiToolchain.addToClasspath(jackApiToolchain.getDefaultBootClasspath()) + .srcToExe(te.getOutputDexFolder(), /* zipFile = */ false, te.getSourceFolder()); Assert.fail(); } catch (JackUserException e) { // Failure is ok since source file is not readable @@ -174,9 +171,8 @@ public class FileAccessErrorTest { JackApiToolchain jackApiToolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.class); - jackApiToolchain.srcToLib( - AbstractTestTools.getClasspathAsString(jackApiToolchain.getDefaultBootClasspath()), - te.getJackFolder(), false, te.getSourceFolder()); + jackApiToolchain.addToClasspath(jackApiToolchain.getDefaultBootClasspath()) + .srcToLib(te.getJackFolder(), false, te.getSourceFolder()); AbstractTestTools.deleteJavaFile(te.getSourceFolder(), "jack.incremental", "A.java"); @@ -193,10 +189,9 @@ public class FileAccessErrorTest { } jackApiToolchain.setErrorStream(errOut); - jackApiToolchain.srcToExe( - AbstractTestTools.getClasspathAsString(jackApiToolchain.getDefaultBootClasspath()) - + File.pathSeparator + te.getJackFolder().getAbsolutePath(), - AbstractTestTools.createTempDir(), false, te.getSourceFolder()); + jackApiToolchain.addToClasspath(jackApiToolchain.getDefaultBootClasspath()) + .addToClasspath(te.getJackFolder()) + .srcToExe(AbstractTestTools.createTempDir(), false, te.getSourceFolder()); Assert.fail(); } catch (JackAbortException e) { Assert.assertTrue(e.getCause() instanceof LibraryReadingException); @@ -224,9 +219,10 @@ public class FileAccessErrorTest { try { - jackApiToolchain.srcToExe( - AbstractTestTools.getClasspathAsString(jackApiToolchain.getDefaultBootClasspath()), - te.getOutputDexFolder(), /* zipFile = */ false, new File(te.getSourceFolder(), "A.java")); + jackApiToolchain.addToClasspath(jackApiToolchain.getDefaultBootClasspath()) + .srcToExe( + te.getOutputDexFolder(), /* zipFile = */ false, + new File(te.getSourceFolder(), "A.java")); Assert.fail(); } catch (JackUserException e) { diff --git a/jack-tests/tests/com/android/jack/error/JackFormatErrorTest.java b/jack-tests/tests/com/android/jack/error/JackFormatErrorTest.java index 3d72821..5ac5c12 100644 --- a/jack-tests/tests/com/android/jack/error/JackFormatErrorTest.java +++ b/jack-tests/tests/com/android/jack/error/JackFormatErrorTest.java @@ -78,9 +78,9 @@ public class JackFormatErrorTest { toolchain.setErrorStream(errOut); try { - toolchain.srcToExe(AbstractTestTools.getClasspathAsString(toolchain.getDefaultBootClasspath()) - + File.pathSeparatorChar + helper.getJackFolder().getAbsolutePath(), - helper.getOutputDexFolder(), /* zipFile= */ false, helper.getSourceFolder()); + toolchain.addToClasspath(toolchain.getDefaultBootClasspath()) + .addToClasspath(helper.getJackFolder()) + .srcToExe(helper.getOutputDexFolder(), /* zipFile= */ false, helper.getSourceFolder()); Assert.fail(); } catch (JackAbortException e) { // Failure is ok since jack file is corrupted. @@ -124,9 +124,9 @@ public class JackFormatErrorTest { toolchain.setErrorStream(errOut); try { - toolchain.srcToExe(AbstractTestTools.getClasspathAsString(toolchain.getDefaultBootClasspath()) - + File.pathSeparatorChar + helper.getJackFolder().getAbsolutePath(), - helper.getOutputDexFolder(), /* zipFile= */ false, helper.getSourceFolder()); + toolchain.addToClasspath(toolchain.getDefaultBootClasspath()) + .addToClasspath(helper.getJackFolder()) + .srcToExe(helper.getOutputDexFolder(), /* zipFile= */ false, helper.getSourceFolder()); Assert.fail(); } catch (JackAbortException e) { // Failure is ok since jack file header is corrupted. @@ -169,9 +169,9 @@ public class JackFormatErrorTest { toolchain.setErrorStream(errOut); try { - toolchain.srcToExe(AbstractTestTools.getClasspathAsString(toolchain.getDefaultBootClasspath()) - + File.pathSeparatorChar + helper.getJackFolder().getAbsolutePath(), - helper.getOutputDexFolder(), /* zipFile= */ false, helper.getSourceFolder()); + toolchain.addToClasspath(toolchain.getDefaultBootClasspath()) + .addToClasspath(helper.getJackFolder()) + .srcToExe(helper.getOutputDexFolder(), /* zipFile= */ false, helper.getSourceFolder()); Assert.fail(); } catch (JackAbortException e) { // Failure is ok since jack file header is corrupted. diff --git a/jack-tests/tests/com/android/jack/error/SourceErrorTest.java b/jack-tests/tests/com/android/jack/error/SourceErrorTest.java index afee3fe..f9c4b9c 100644 --- a/jack-tests/tests/com/android/jack/error/SourceErrorTest.java +++ b/jack-tests/tests/com/android/jack/error/SourceErrorTest.java @@ -340,8 +340,8 @@ public class SourceErrorTest { private void compile(@Nonnull IToolchain toolchain, @Nonnull ErrorTestHelper helper) throws Exception { - toolchain.srcToExe( - AbstractTestTools.getClasspathAsString(toolchain.getDefaultBootClasspath()), + toolchain.addToClasspath(toolchain.getDefaultBootClasspath()) + .srcToExe( helper.getOutputDexFolder(), /* zipFile = */ false, helper.getSourceFolder()); } diff --git a/jack-tests/tests/com/android/jack/field/FieldTests.java b/jack-tests/tests/com/android/jack/field/FieldTests.java index 587100a..6cd1be0 100644 --- a/jack-tests/tests/com/android/jack/field/FieldTests.java +++ b/jack-tests/tests/com/android/jack/field/FieldTests.java @@ -148,8 +148,8 @@ public class FieldTests extends RuntimeTest { private void compileTest(@Nonnull String test) throws Exception { IToolchain toolchain = AbstractTestTools.getCandidateToolchain(); - toolchain.srcToExe( - AbstractTestTools.getClasspathAsString(toolchain.getDefaultBootClasspath()), + toolchain.addToClasspath(toolchain.getDefaultBootClasspath()) + .srcToExe( AbstractTestTools.createTempDir(), /* zipFile = */ false, AbstractTestTools.getTestRootDir("com.android.jack.field." + test + ".jack")); diff --git a/jack-tests/tests/com/android/jack/fileconflict/FileConflictTests.java b/jack-tests/tests/com/android/jack/fileconflict/FileConflictTests.java index bef3cf7..b067a36 100644 --- a/jack-tests/tests/com/android/jack/fileconflict/FileConflictTests.java +++ b/jack-tests/tests/com/android/jack/fileconflict/FileConflictTests.java @@ -263,8 +263,8 @@ public class FileConflictTests { File tempJackFolder = AbstractTestTools.createTempDir(); IToolchain toolchain = AbstractTestTools.getCandidateToolchain(); - toolchain.srcToLib( - AbstractTestTools.getClasspathAsString(toolchain.getDefaultBootClasspath()), + toolchain.addToClasspath(toolchain.getDefaultBootClasspath()) + .srcToLib( tempJackFolder, /* zipFiles = */ false, testSrcDir); @@ -314,8 +314,8 @@ public class FileConflictTests { File testSrcDir = AbstractTestTools.getTestRootDir("com.android.jack.fileconflict.test003.jack"); File tempJackFolder = AbstractTestTools.createTempDir(); IToolchain toolchain = AbstractTestTools.getCandidateToolchain(); - toolchain.srcToLib( - AbstractTestTools.getClasspathAsString(toolchain.getDefaultBootClasspath()), + toolchain.addToClasspath(toolchain.getDefaultBootClasspath()) + .srcToLib( tempJackFolder, /* zipFiles = */ false, testSrcDir); @@ -363,8 +363,8 @@ public class FileConflictTests { File tempJackFolder = AbstractTestTools.createTempDir(); JackApiToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.class); - toolchain.srcToLib( - AbstractTestTools.getClasspathAsString(toolchain.getDefaultBootClasspath()), + toolchain.addToClasspath(toolchain.getDefaultBootClasspath()) + .srcToLib( tempJackFolder, /* zipFiles = */ false, testSrcDir); @@ -405,8 +405,8 @@ public class FileConflictTests { File tempJackFolder = AbstractTestTools.createTempDir(); JackApiToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.class); - toolchain.srcToLib( - AbstractTestTools.getClasspathAsString(toolchain.getDefaultBootClasspath()), + toolchain.addToClasspath(toolchain.getDefaultBootClasspath()) + .srcToLib( tempJackFolder, /* zipFile = */ false, TEST001_DIR); @@ -458,8 +458,8 @@ public class FileConflictTests { File lib1 = new File(TEST002_DIR, "lib1"); JackBasedToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackBasedToolchain.class); toolchain.addResource(new File(lib1, "rsc")); - toolchain.srcToLib( - AbstractTestTools.getClasspathAsString(toolchain.getDefaultBootClasspath()), + toolchain.addToClasspath(toolchain.getDefaultBootClasspath()) + .srcToLib( jackImport1, /* zipFiles = */ false, lib1); @@ -468,8 +468,8 @@ public class FileConflictTests { File lib2 = new File(TEST002_DIR, "lib2"); toolchain = AbstractTestTools.getCandidateToolchain(JackBasedToolchain.class); toolchain.addResource(new File(lib2, "rsc")); - toolchain.srcToLib( - AbstractTestTools.getClasspathAsString(toolchain.getDefaultBootClasspath()), + toolchain.addToClasspath(toolchain.getDefaultBootClasspath()) + .srcToLib( jackImport2, /* zipFiles = */ false, lib2); diff --git a/jack-tests/tests/com/android/jack/frontend/MissingClassTest.java b/jack-tests/tests/com/android/jack/frontend/MissingClassTest.java index b4c3efd..d6a63b4 100644 --- a/jack-tests/tests/com/android/jack/frontend/MissingClassTest.java +++ b/jack-tests/tests/com/android/jack/frontend/MissingClassTest.java @@ -36,23 +36,21 @@ public class MissingClassTest { IToolchain toolchain = AbstractTestTools.getCandidateToolchain(); - toolchain.srcToLib( - AbstractTestTools.getClasspathAsString(toolchain.getDefaultBootClasspath()), + toolchain.addToClasspath(toolchain.getDefaultBootClasspath()) + .srcToLib( outJackTmpMissing, /* zipFiles= */ false, AbstractTestTools.getTestRootDir("com.android.jack.frontend.test001.jack.missing")); - toolchain.srcToLib( - AbstractTestTools.getClasspathAsString(toolchain.getDefaultBootClasspath()) - + File.pathSeparatorChar + outJackTmpMissing.getPath(), - outJackTmpSuper, + toolchain.addToClasspath(toolchain.getDefaultBootClasspath()) + .addToClasspath(outJackTmpMissing) + .srcToLib(outJackTmpSuper, /* zipFiles= */ false, AbstractTestTools.getTestRootDir("com.android.jack.frontend.test001.jack.sub2")); - toolchain.srcToLib( - AbstractTestTools.getClasspathAsString(toolchain.getDefaultBootClasspath()) - + File.pathSeparatorChar + outJackTmpSuper.getPath(), - outJackTmpTest, + toolchain.addToClasspath(toolchain.getDefaultBootClasspath()) + .addToClasspath(outJackTmpSuper) + .srcToLib(outJackTmpTest, /* zipFiles= */ false, AbstractTestTools.getTestRootDir("com.android.jack.frontend.test001.jack.test")); diff --git a/jack-tests/tests/com/android/jack/generic/basic/GenericTests.java b/jack-tests/tests/com/android/jack/generic/basic/GenericTests.java index d889691..31ae91f 100644 --- a/jack-tests/tests/com/android/jack/generic/basic/GenericTests.java +++ b/jack-tests/tests/com/android/jack/generic/basic/GenericTests.java @@ -38,8 +38,8 @@ public class GenericTests { @Test public void testCompileBasic() throws Exception { IToolchain toolchain = AbstractTestTools.getCandidateToolchain(); - toolchain.srcToExe( - AbstractTestTools.getClasspathAsString(toolchain.getDefaultBootClasspath()), + toolchain.addToClasspath(toolchain.getDefaultBootClasspath()) + .srcToExe( AbstractTestTools.createTempDir(), /* zipFile = */ false, AbstractTestTools.getTestRootDir("com.android.jack.generic.basic.jack")); diff --git a/jack-tests/tests/com/android/jack/imports/ImportTests.java b/jack-tests/tests/com/android/jack/imports/ImportTests.java index 79e9269..f0a3c0c 100644 --- a/jack-tests/tests/com/android/jack/imports/ImportTests.java +++ b/jack-tests/tests/com/android/jack/imports/ImportTests.java @@ -42,16 +42,16 @@ public class ImportTests { public void testCompileNonConflictingSourceAndImport() throws Exception { File jackOut = AbstractTestTools.createTempDir(); IToolchain toolchain = AbstractTestTools.getCandidateToolchain(); - toolchain.srcToLib( - AbstractTestTools.getClasspathAsString(toolchain.getDefaultBootClasspath()), + toolchain.addToClasspath(toolchain.getDefaultBootClasspath()) + .srcToLib( jackOut, /* zipFiles = */ false, AbstractTestTools.getTestRootDir("com.android.jack.fibonacci.test001.jack")); toolchain = AbstractTestTools.getCandidateToolchain(); toolchain.addStaticLibs(jackOut); - toolchain.srcToExe( - AbstractTestTools.getClasspathAsString(toolchain.getDefaultBootClasspath()), + toolchain.addToClasspath(toolchain.getDefaultBootClasspath()) + .srcToExe( AbstractTestTools.createTempDir(), /* zipFile = */ false, AbstractTestTools.getTestRootDir("com.android.jack.threeaddress.test001.jack")); @@ -61,8 +61,8 @@ public class ImportTests { public void testCompileConflictingSourceAndImport() throws Exception { File jackOut = AbstractTestTools.createTempDir(); JackApiToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.class); - toolchain.srcToLib( - AbstractTestTools.getClasspathAsString(toolchain.getDefaultBootClasspath()), + toolchain.addToClasspath(toolchain.getDefaultBootClasspath()) + .srcToLib( jackOut, /* zipFiles = */ false, AbstractTestTools.getTestRootDir("com.android.jack.fibonacci.test001.jack")); @@ -70,8 +70,8 @@ public class ImportTests { toolchain = AbstractTestTools.getCandidateToolchain(); toolchain.addStaticLibs(jackOut); try { - toolchain.srcToExe( - AbstractTestTools.getClasspathAsString(toolchain.getDefaultBootClasspath()), + toolchain.addToClasspath(toolchain.getDefaultBootClasspath()) + .srcToExe( AbstractTestTools.createTempDir(), /* zipFile = */ false, AbstractTestTools.getTestRootDir("com.android.jack.fibonacci.test001.jack")); @@ -87,8 +87,8 @@ public class ImportTests { File lib = AbstractTestTools.createTempDir(); JackBasedToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackBasedToolchain.class); - toolchain.srcToLib( - AbstractTestTools.getClasspathAsString(toolchain.getDefaultBootClasspath()), + toolchain.addToClasspath(toolchain.getDefaultBootClasspath()) + .srcToLib( lib, /* zipFile = */ false, AbstractTestTools.getTestRootDir(testName + ".lib")); @@ -97,8 +97,8 @@ public class ImportTests { toolchain = AbstractTestTools.getCandidateToolchain(JackBasedToolchain.class); toolchain.addStaticLibs(lib); toolchain.addProperty(JayceFileImporter.COLLISION_POLICY.getName(), "keep-first"); - toolchain.srcToExe( - AbstractTestTools.getClasspathAsString(toolchain.getDefaultBootClasspath()), + toolchain.addToClasspath(toolchain.getDefaultBootClasspath()) + .srcToExe( AbstractTestTools.createTempFile("inner15", ".zip"), /* zipFile = */ true, AbstractTestTools.getTestRootDir(testName + ".jack")); @@ -110,8 +110,8 @@ public class ImportTests { File lib = AbstractTestTools.createTempDir(); JackApiToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.class); - toolchain.srcToLib( - AbstractTestTools.getClasspathAsString(toolchain.getDefaultBootClasspath()), + toolchain.addToClasspath(toolchain.getDefaultBootClasspath()) + .srcToLib( lib, /* zipFile = */ false, AbstractTestTools.getTestRootDir(testName + ".lib")); @@ -121,8 +121,8 @@ public class ImportTests { toolchain.addStaticLibs(lib, lib); toolchain.addProperty(JayceFileImporter.COLLISION_POLICY.getName(), "fail"); try { - toolchain.srcToExe( - AbstractTestTools.getClasspathAsString(toolchain.getDefaultBootClasspath()), + toolchain.addToClasspath(toolchain.getDefaultBootClasspath()) + .srcToExe( AbstractTestTools.createTempFile("inner15", ".zip"), /* zipFile = */ true, AbstractTestTools.getTestRootDir(testName + ".jack")); @@ -138,8 +138,8 @@ public class ImportTests { File lib1 = AbstractTestTools.createTempDir(); JackApiToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.class); - toolchain.srcToLib( - AbstractTestTools.getClasspathAsString(toolchain.getDefaultBootClasspath()), + toolchain.addToClasspath(toolchain.getDefaultBootClasspath()) + .srcToLib( lib1, /* zipFile = */ false, AbstractTestTools.getTestRootDir(testName + ".lib")); @@ -147,8 +147,8 @@ public class ImportTests { File lib2 = AbstractTestTools.createTempDir(); toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.class); - toolchain.srcToLib( - AbstractTestTools.getClasspathAsString(toolchain.getDefaultBootClasspath()), + toolchain.addToClasspath(toolchain.getDefaultBootClasspath()) + .srcToLib( lib2, /* zipFile = */ false, AbstractTestTools.getTestRootDir(testName + ".lib")); @@ -159,8 +159,8 @@ public class ImportTests { toolchain.addProperty(JayceFileImporter.COLLISION_POLICY.getName(), "fail"); try { - toolchain.srcToExe( - AbstractTestTools.getClasspathAsString(toolchain.getDefaultBootClasspath()), + toolchain.addToClasspath(toolchain.getDefaultBootClasspath()) + .srcToExe( AbstractTestTools.createTempFile("inner15", ".zip"), /* zipFile = */ true, AbstractTestTools.getTestRootDir(testName + ".jack")); diff --git a/jack-tests/tests/com/android/jack/init/InitTests.java b/jack-tests/tests/com/android/jack/init/InitTests.java index c621599..72b1c63 100644 --- a/jack-tests/tests/com/android/jack/init/InitTests.java +++ b/jack-tests/tests/com/android/jack/init/InitTests.java @@ -41,8 +41,8 @@ public class InitTests extends RuntimeTest { @Test public void test001() throws Exception { IToolchain toolchain = AbstractTestTools.getCandidateToolchain(); - toolchain.srcToExe( - AbstractTestTools.getClasspathAsString(toolchain.getDefaultBootClasspath()), + toolchain.addToClasspath(toolchain.getDefaultBootClasspath()) + .srcToExe( AbstractTestTools.createTempDir(), /* zipFile = */ false, AbstractTestTools.getTestRootDir("com.android.jack.init.test001.jack")); diff --git a/jack-tests/tests/com/android/jack/inner/InnerTests.java b/jack-tests/tests/com/android/jack/inner/InnerTests.java index 35d67e3..336aec1 100644 --- a/jack-tests/tests/com/android/jack/inner/InnerTests.java +++ b/jack-tests/tests/com/android/jack/inner/InnerTests.java @@ -286,8 +286,8 @@ public class InnerTests extends RuntimeTest { @Test public void test025() throws Exception { IToolchain toolchain = AbstractTestTools.getCandidateToolchain(); - toolchain.srcToExe( - AbstractTestTools.getClasspathAsString(toolchain.getDefaultBootClasspath()), + toolchain.addToClasspath(toolchain.getDefaultBootClasspath()) + .srcToExe( AbstractTestTools.createTempDir(), /* zipFile = */ false, AbstractTestTools.getTestRootDir("com.android.jack.inner.test025.jack")); diff --git a/jack-tests/tests/com/android/jack/instance/InstanceTest.java b/jack-tests/tests/com/android/jack/instance/InstanceTest.java index e44111c..345cac4 100644 --- a/jack-tests/tests/com/android/jack/instance/InstanceTest.java +++ b/jack-tests/tests/com/android/jack/instance/InstanceTest.java @@ -34,8 +34,8 @@ public class InstanceTest { @Test public void testReturnThis() throws Exception { IToolchain toolchain = AbstractTestTools.getCandidateToolchain(); - toolchain.srcToExe(AbstractTestTools.getClasspathAsString(toolchain.getDefaultBootClasspath()), - AbstractTestTools.createTempDir(), + toolchain.addToClasspath(toolchain.getDefaultBootClasspath()) + .srcToExe(AbstractTestTools.createTempDir(), /* zipFile = */ false, new File( AbstractTestTools.getTestRootDir("com.android.jack.instance.test001.jack"), "Instance.java")); diff --git a/jack-tests/tests/com/android/jack/jarjar/JarjarTests.java b/jack-tests/tests/com/android/jack/jarjar/JarjarTests.java index bb2f14c..a5cc216 100644 --- a/jack-tests/tests/com/android/jack/jarjar/JarjarTests.java +++ b/jack-tests/tests/com/android/jack/jarjar/JarjarTests.java @@ -69,17 +69,16 @@ public class JarjarTests { IToolchain toolchain = AbstractTestTools.getCandidateToolchain(); toolchain.setJarjarRules(new File(JARJAR003.directory, "jarjar-rules.txt")); File lib = AbstractTestTools.createTempFile("jarjarTest003Jack", toolchain.getLibraryExtension()); - toolchain.srcToLib( - AbstractTestTools.getClasspathAsString(toolchain.getDefaultBootClasspath()), + toolchain.addToClasspath(toolchain.getDefaultBootClasspath()) + .srcToLib( lib, /* zipFiles = */ true, new File(JARJAR003.directory, "jack")); toolchain = AbstractTestTools.getCandidateToolchain(); - toolchain.srcToLib( - AbstractTestTools.getClasspathsAsString(toolchain.getDefaultBootClasspath(), - new File [] {lib}), - AbstractTestTools.createTempFile("jarjarTest003dx", toolchain.getLibraryExtension()), + toolchain.addToClasspath(toolchain.getDefaultBootClasspath()) + .addToClasspath(lib) + .srcToLib(AbstractTestTools.createTempFile("jarjarTest003dx", toolchain.getLibraryExtension()), /* zipFiles = */ true, new File(JARJAR003.directory, "dontcompile/TestWithRelocatedReference.java")); } diff --git a/jack-tests/tests/com/android/jack/java7/BoxingTest.java b/jack-tests/tests/com/android/jack/java7/BoxingTest.java index 75bbbc2..e842be1 100644 --- a/jack-tests/tests/com/android/jack/java7/BoxingTest.java +++ b/jack-tests/tests/com/android/jack/java7/BoxingTest.java @@ -38,8 +38,9 @@ public class BoxingTest { public void java7Boxing001() throws Exception { IToolchain toolchain = AbstractTestTools.getCandidateToolchain(); - toolchain.setSourceLevel(SourceLevel.JAVA_7).srcToExe( - AbstractTestTools.getClasspathAsString(toolchain.getDefaultBootClasspath()), + toolchain.setSourceLevel(SourceLevel.JAVA_7) + .addToClasspath(toolchain.getDefaultBootClasspath()) + .srcToExe( AbstractTestTools.createTempDir(), /* zipFile = */ false, AbstractTestTools.getTestRootDir("com.android.jack.java7.boxing.test001.jack")); diff --git a/jack-tests/tests/com/android/jack/java7/ExceptionsTest.java b/jack-tests/tests/com/android/jack/java7/ExceptionsTest.java index 73d4ff8..ac8dd36 100644 --- a/jack-tests/tests/com/android/jack/java7/ExceptionsTest.java +++ b/jack-tests/tests/com/android/jack/java7/ExceptionsTest.java @@ -66,8 +66,9 @@ public class ExceptionsTest { private void compileJava7Test(@Nonnull String name) throws Exception { JackBasedToolchain jackBasedToolchain = AbstractTestTools.getCandidateToolchain(JackBasedToolchain.class); - jackBasedToolchain.setSourceLevel(SourceLevel.JAVA_7).srcToExe( - AbstractTestTools.getClasspathAsString(jackBasedToolchain.getDefaultBootClasspath()), + jackBasedToolchain.setSourceLevel(SourceLevel.JAVA_7) + .addToClasspath(jackBasedToolchain.getDefaultBootClasspath()) + .srcToExe( AbstractTestTools.createTempDir(), /* zipFile = */ false, new File( AbstractTestTools.getTestRootDir("com.android.jack.java7.exceptions." + name), "jack")); } diff --git a/jack-tests/tests/com/android/jack/java7/SwitchesTest.java b/jack-tests/tests/com/android/jack/java7/SwitchesTest.java index 021652f..9dd9fbc 100644 --- a/jack-tests/tests/com/android/jack/java7/SwitchesTest.java +++ b/jack-tests/tests/com/android/jack/java7/SwitchesTest.java @@ -61,8 +61,9 @@ public class SwitchesTest { File jackZipFile = AbstractTestTools.createTempFile("tmp", toolchain.getLibraryExtension()); - toolchain.setSourceLevel(SourceLevel.JAVA_7).srcToLib( - AbstractTestTools.getClasspathAsString(toolchain.getDefaultBootClasspath()), + toolchain.setSourceLevel(SourceLevel.JAVA_7) + .addToClasspath(toolchain.getDefaultBootClasspath()) + .srcToLib( jackZipFile, /* zipFiles = */ true, AbstractTestTools.getTestRootDir("com.android.jack.java7.switches.test001.jack")); @@ -77,8 +78,9 @@ public class SwitchesTest { private void compileJava7Test(@Nonnull String name) throws Exception { IToolchain toolchain = AbstractTestTools.getCandidateToolchain(); - toolchain.setSourceLevel(SourceLevel.JAVA_7).srcToExe( - AbstractTestTools.getClasspathAsString(toolchain.getDefaultBootClasspath()), + toolchain.setSourceLevel(SourceLevel.JAVA_7) + .addToClasspath(toolchain.getDefaultBootClasspath()) + .srcToExe( AbstractTestTools.createTempDir(), /* zipFile = */ false, AbstractTestTools.getTestRootDir("com.android.jack.java7.switches." + name + ".jack")); } diff --git a/jack-tests/tests/com/android/jack/java7/TryWithResourcesTests.java b/jack-tests/tests/com/android/jack/java7/TryWithResourcesTests.java index 0584b6d..b2f9c0e 100644 --- a/jack-tests/tests/com/android/jack/java7/TryWithResourcesTests.java +++ b/jack-tests/tests/com/android/jack/java7/TryWithResourcesTests.java @@ -41,8 +41,8 @@ public class TryWithResourcesTests { IToolchain toolchain = AbstractTestTools.getCandidateToolchain(); toolchain.setSourceLevel(SourceLevel.JAVA_7) + .addToClasspath(toolchain.getDefaultBootClasspath()) .srcToExe( - AbstractTestTools.getClasspathAsString(toolchain.getDefaultBootClasspath()), AbstractTestTools.createTempDir(), /* zipFile = */ false, AbstractTestTools.getTestRootDir("com.android.jack.java7.trywithresources.test001.jack")); @@ -56,8 +56,8 @@ public class TryWithResourcesTests { IToolchain toolchain = AbstractTestTools.getCandidateToolchain(); toolchain.setSourceLevel(SourceLevel.JAVA_7) + .addToClasspath(toolchain.getDefaultBootClasspath()) .srcToExe( - AbstractTestTools.getClasspathAsString(toolchain.getDefaultBootClasspath()), AbstractTestTools.createTempDir(), /* zipFile = */ false, AbstractTestTools.getTestRootDir("com.android.jack.java7.trywithresources.test002.jack")); diff --git a/jack-tests/tests/com/android/jack/label/LabelTest.java b/jack-tests/tests/com/android/jack/label/LabelTest.java index 945a215..5abd580 100644 --- a/jack-tests/tests/com/android/jack/label/LabelTest.java +++ b/jack-tests/tests/com/android/jack/label/LabelTest.java @@ -34,8 +34,8 @@ public class LabelTest { @Test public void labelMustNotBreakTree() throws Exception { IToolchain toolchain = AbstractTestTools.getCandidateToolchain(); - toolchain.srcToExe( - AbstractTestTools.getClasspathAsString(toolchain.getDefaultBootClasspath()), + toolchain.addToClasspath(toolchain.getDefaultBootClasspath()) + .srcToExe( AbstractTestTools.createTempDir(), /* zipFile = */ false, new File(AbstractTestTools.getTestRootDir("com.android.jack.label.test001.jack"), "Label.java")); diff --git a/jack-tests/tests/com/android/jack/library/LibraryTests.java b/jack-tests/tests/com/android/jack/library/LibraryTests.java index d518a66..5ea1914 100644 --- a/jack-tests/tests/com/android/jack/library/LibraryTests.java +++ b/jack-tests/tests/com/android/jack/library/LibraryTests.java @@ -49,9 +49,9 @@ public class LibraryTests { File emptyLib = createEmptyLibrary(); AndroidToolchain toolchain = AbstractTestTools.getCandidateToolchain(AndroidToolchain.class); - toolchain.srcToExe(AbstractTestTools.getClasspathAsString(toolchain.getDefaultBootClasspath()) - + File.pathSeparator + emptyLib.getPath(), - AbstractTestTools.createTempFile("library001", ".jack"), /* zipFile = */ + toolchain.addToClasspath(toolchain.getDefaultBootClasspath()) + .addToClasspath(emptyLib) + .srcToExe(AbstractTestTools.createTempFile("library001", ".jack"), /* zipFile = */ true, AbstractTestTools.getTestRootDir("com.android.jack.library.test001.jack")); } @@ -60,9 +60,9 @@ public class LibraryTests { File emptyLib = createRscLibrary(); AndroidToolchain toolchain = AbstractTestTools.getCandidateToolchain(AndroidToolchain.class); - toolchain.srcToExe(AbstractTestTools.getClasspathAsString(toolchain.getDefaultBootClasspath()) - + File.pathSeparator + emptyLib.getPath(), - AbstractTestTools.createTempFile("library001", ".jack"), /* zipFile = */ + toolchain.addToClasspath(toolchain.getDefaultBootClasspath()) + .addToClasspath(emptyLib) + .srcToExe(AbstractTestTools.createTempFile("library001", ".jack"), /* zipFile = */ true, AbstractTestTools.getTestRootDir("com.android.jack.library.test001.jack")); } @@ -71,8 +71,8 @@ public class LibraryTests { File lib = createEmptyLibrary(); AndroidToolchain toolchain = AbstractTestTools.getCandidateToolchain(AndroidToolchain.class); toolchain.addStaticLibs(lib); - toolchain.srcToExe(AbstractTestTools.getClasspathAsString(toolchain.getDefaultBootClasspath()), - AbstractTestTools.createTempFile("library001", ".jack"), /* zipFile = */ + toolchain.addToClasspath(toolchain.getDefaultBootClasspath()) + .srcToExe(AbstractTestTools.createTempFile("library001", ".jack"), /* zipFile = */ true, AbstractTestTools.getTestRootDir("com.android.jack.library.test001.jack")); } @@ -83,9 +83,9 @@ public class LibraryTests { AndroidToolchain toolchain = AbstractTestTools.getCandidateToolchain(AndroidToolchain.class); toolchain.addStaticLibs(lib); - toolchain.srcToLib(AbstractTestTools.getClasspathAsString(toolchain.getDefaultBootClasspath()), - out, /* zipFile = */ - true, AbstractTestTools.getTestRootDir("com.android.jack.library.test001.jack")); + toolchain.addToClasspath(toolchain.getDefaultBootClasspath()) + .srcToLib(out, /* zipFile = */ true, + AbstractTestTools.getTestRootDir("com.android.jack.library.test001.jack")); RunnableHooks hooks = new RunnableHooks(); VFS vfs = new ReadZipFS( @@ -103,7 +103,7 @@ public class LibraryTests { File emptyLib = AbstractTestTools.createTempFile("empty", ".jack"); AndroidToolchain toolchain = AbstractTestTools.getCandidateToolchain(AndroidToolchain.class); - toolchain.srcToLib(/* classpath = */ null, emptyLib, /* zipFiles = */ true); + toolchain.srcToLib(emptyLib, /* zipFiles = */ true); return emptyLib; } @@ -115,7 +115,7 @@ public class LibraryTests { JackBasedToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackBasedToolchain.class); toolchain.addResource(AbstractTestTools.getTestRootDir("com.android.jack.library.test001.lib")); - toolchain.srcToLib(/* classpath = */ null, emptyLib, /* zipFiles = */ true); + toolchain.srcToLib(emptyLib, /* zipFiles = */ true); return emptyLib; } diff --git a/jack-tests/tests/com/android/jack/lookup/LookupTests.java b/jack-tests/tests/com/android/jack/lookup/LookupTests.java index 65c15e0..78c0a4e 100644 --- a/jack-tests/tests/com/android/jack/lookup/LookupTests.java +++ b/jack-tests/tests/com/android/jack/lookup/LookupTests.java @@ -29,27 +29,25 @@ public class LookupTests { public void test001() throws Exception { IToolchain toolchain = AbstractTestTools.getCandidateToolchain(); File lib = AbstractTestTools.createTempDir(); - toolchain.srcToLib( - AbstractTestTools.getClasspathAsString(toolchain.getDefaultBootClasspath()), + toolchain.addToClasspath(toolchain.getDefaultBootClasspath()) + .srcToLib( lib, /* zipFiles = */ false, AbstractTestTools.getTestRootDir("com.android.jack.lookup.test001.lib")); File libOverride = AbstractTestTools.createTempDir(); toolchain = AbstractTestTools.getCandidateToolchain(); - toolchain.srcToLib( - AbstractTestTools.getClasspathAsString(toolchain.getDefaultBootClasspath()), + toolchain.addToClasspath(toolchain.getDefaultBootClasspath()) + .srcToLib( libOverride, /* zipFiles = */ false, AbstractTestTools.getTestRootDir("com.android.jack.lookup.test001.liboverride")); File jacks = AbstractTestTools.createTempDir(); toolchain = AbstractTestTools.getCandidateToolchain(); - toolchain.srcToLib( - AbstractTestTools - .getClasspathsAsString(toolchain.getDefaultBootClasspath(), new File [] {lib}), - jacks, - /* zipFiles = */ false, + toolchain.addToClasspath(toolchain.getDefaultBootClasspath()) + .addToClasspath(lib) + .srcToLib(jacks, /* zipFiles = */ false, AbstractTestTools.getTestRootDir("com.android.jack.lookup.test001.jack")); toolchain = AbstractTestTools.getCandidateToolchain(); diff --git a/jack-tests/tests/com/android/jack/multidex/MultiDexOverflowTests.java b/jack-tests/tests/com/android/jack/multidex/MultiDexOverflowTests.java index a7564f0..8349e98 100644 --- a/jack-tests/tests/com/android/jack/multidex/MultiDexOverflowTests.java +++ b/jack-tests/tests/com/android/jack/multidex/MultiDexOverflowTests.java @@ -78,11 +78,9 @@ public class MultiDexOverflowTests { toolchain.setErrorStream(baos); try { - toolchain.srcToExe( - AbstractTestTools.getClasspathsAsString( - toolchain.getDefaultBootClasspath(), - new File[] {annotations}), - outFolder, + toolchain.addToClasspath(toolchain.getDefaultBootClasspath()) + .addToClasspath(annotations) + .srcToExe(outFolder, /* zipFile = */ false, srcFolder); Assert.fail(); @@ -117,13 +115,9 @@ public class MultiDexOverflowTests { toolchain.setErrorStream(baos); try { - toolchain.srcToExe( - AbstractTestTools.getClasspathsAsString( - toolchain.getDefaultBootClasspath(), - new File[] {annotations}), - outFolder, - /* zipFile = */ false, - srcFolder); + toolchain.addToClasspath(toolchain.getDefaultBootClasspath()) + .addToClasspath(annotations) + .srcToExe(outFolder, /* zipFile = */ false, srcFolder); Assert.fail(); } catch (ProcessException e) { Assert.assertTrue(e.getCause() instanceof JackAbortException); diff --git a/jack-tests/tests/com/android/jack/multidex/MultiDexTests.java b/jack-tests/tests/com/android/jack/multidex/MultiDexTests.java index 89bb95f..e0e4fbd 100644 --- a/jack-tests/tests/com/android/jack/multidex/MultiDexTests.java +++ b/jack-tests/tests/com/android/jack/multidex/MultiDexTests.java @@ -174,8 +174,9 @@ public class MultiDexTests { toolchain.addProperty(DexFileWriter.DEX_WRITING_POLICY.getName(), "multidex"); - toolchain.srcToExe(AbstractTestTools.getClasspathAsString(toolchain.getDefaultBootClasspath()) - + File.pathSeparator + frameworks.getPath(), out, /* zipFile = */false, testFolder); + toolchain.addToClasspath(toolchain.getDefaultBootClasspath()) + .addToClasspath(frameworks) + .srcToExe(out, /* zipFile = */false, testFolder); String outList = getListingOfDex(new File(out, "classes.dex")); ListingComparator.compare(new File(testFolder, "ref-list-001.txt"), outList); @@ -191,8 +192,9 @@ public class MultiDexTests { toolchain.addProperty(DexFileWriter.DEX_WRITING_POLICY.getName(), "minimal-multidex"); - toolchain.srcToExe(AbstractTestTools.getClasspathAsString(toolchain.getDefaultBootClasspath()) - + File.pathSeparator + frameworks.getPath(), out, /* zipFile = */false, testFolder); + toolchain.addToClasspath(toolchain.getDefaultBootClasspath()) + .addToClasspath(frameworks) + .srcToExe(out, /* zipFile = */false, testFolder); String outList = getListingOfDex(new File(out, "classes.dex")); ListingComparator.compare(new File(testFolder, "ref-list-002-1.txt"), outList); @@ -211,8 +213,9 @@ public class MultiDexTests { toolchain.addProperty(DexFileWriter.DEX_WRITING_POLICY.getName(), "minimal-multidex"); - toolchain.srcToExe(AbstractTestTools.getClasspathAsString(toolchain.getDefaultBootClasspath()) - + File.pathSeparator + frameworks.getPath(), out, /* zipFile = */false, testFolder); + toolchain.addToClasspath(toolchain.getDefaultBootClasspath()) + .addToClasspath(frameworks) + .srcToExe(out, /* zipFile = */false, testFolder); String outList = getListingOfDex(new File(out, "classes.dex")); ListingComparator.compare(new File(testFolder, "ref-list-003-1.txt"), outList); @@ -252,8 +255,9 @@ public class MultiDexTests { private static File prepareLib(@Nonnull File sources, @Nonnull File... classpath) throws Exception { File outDir = AbstractTestTools.createTempDir(); IToolchain toolchain = AbstractTestTools.getCandidateToolchain(); - toolchain.srcToLib( - AbstractTestTools.getClasspathsAsString(toolchain.getDefaultBootClasspath(), classpath), + toolchain.addToClasspath(toolchain.getDefaultBootClasspath()) + .addToClasspath(classpath) + .srcToLib( outDir, /* zipFiles = */ false, sources); @@ -314,8 +318,11 @@ public class MultiDexTests { addCommonOptionsForMultiDex(toolchain, new File(testFolder, "config-001.jpp")); toolchain.addProperty(DexFileWriter.DEX_WRITING_POLICY.getName(), "multidex"); - toolchain.srcToExe( - AbstractTestTools.getClasspathsAsString(toolchain.getDefaultBootClasspath(), new File [] {annotations, frameworks, library}), + toolchain.addToClasspath(toolchain.getDefaultBootClasspath()) + .addToClasspath(annotations) + .addToClasspath(frameworks) + .addToClasspath(library) + .srcToExe( out, /* zipFile = */ false, testFolder); @@ -342,8 +349,11 @@ public class MultiDexTests { toolchain.addProperty(DexFileWriter.DEX_WRITING_POLICY.getName(), "minimal-multidex"); toolchain.addStaticLibs(library); - toolchain.srcToExe( - AbstractTestTools.getClasspathsAsString(toolchain.getDefaultBootClasspath(), new File [] {annotations, frameworks}), + toolchain.addToClasspath(toolchain.getDefaultBootClasspath()) + .addToClasspath(toolchain.getDefaultBootClasspath()) + .addToClasspath(annotations) + .addToClasspath(frameworks) + .srcToExe( out, /* zipFile = */ false, testFolder); @@ -403,9 +413,10 @@ public class MultiDexTests { toolchain.addProperty(DexFileWriter.DEX_WRITING_POLICY.getName(), "multidex"); - toolchain.srcToExe(AbstractTestTools.getClasspathAsString(toolchain.getDefaultBootClasspath()) - + File.pathSeparator + frameworks.getPath() + File.pathSeparator + library.getPath(), out, - /* zipFile = */ false, testFolder); + toolchain.addToClasspath(toolchain.getDefaultBootClasspath()) + .addToClasspath(frameworks) + .addToClasspath(library) + .srcToExe(out, /* zipFile = */ false, testFolder); File classesDex = new File(out, "classes.dex"); Assert.assertTrue(classesDex.exists()); @@ -429,8 +440,9 @@ public class MultiDexTests { toolchain.addProperty(DexFileWriter.DEX_WRITING_POLICY.getName(), "minimal-multidex"); toolchain.addStaticLibs(library); - toolchain.srcToExe(AbstractTestTools.getClasspathAsString(toolchain.getDefaultBootClasspath()) + File.pathSeparator + frameworks.getPath(), - out, /* zipFile = */ false, testFolder); + toolchain.addToClasspath(toolchain.getDefaultBootClasspath()) + .addToClasspath(frameworks) + .srcToExe(out, /* zipFile = */ false, testFolder); String outList = getListingOfDex(new File(out, "classes.dex")); // The old toolchain is doing a little better than us here it seems to identify when @@ -458,8 +470,9 @@ public class MultiDexTests { toolchain.addProperty(DexFileWriter.DEX_WRITING_POLICY.getName(), "minimal-multidex"); toolchain.addStaticLibs(autoLibrary); - toolchain.srcToExe(AbstractTestTools.getClasspathAsString(toolchain.getDefaultBootClasspath()) - + File.pathSeparator + frameworks.getPath(), out, /* zipFile = */ false, testFolder); + toolchain.addToClasspath(toolchain.getDefaultBootClasspath()) + .addToClasspath(frameworks) + .srcToExe(out, /* zipFile = */ false, testFolder); String outList = getListingOfDex(new File(out, "classes.dex")); // The old toolchain is doing a little better than us here it seems to identify when @@ -483,9 +496,10 @@ public class MultiDexTests { toolchain.addProperty(MultiDexLegacy.MULTIDEX_LEGACY.getName(), "true"); toolchain.addProperty(DexFileWriter.DEX_WRITING_POLICY.getName(), "minimal-multidex"); - toolchain.srcToExe(AbstractTestTools.getClasspathAsString(toolchain.getDefaultBootClasspath()) - + File.pathSeparator + annotations.getPath() + File.pathSeparator + frameworks.getPath(), - /* zipFile = */ out, false, testFolder); + toolchain.addToClasspath(toolchain.getDefaultBootClasspath()) + .addToClasspath(annotations) + .addToClasspath(frameworks) + .srcToExe(out, /* zipFile = */ false, testFolder); String outList = getListingOfDex(new File(out, "classes.dex")); ListingComparator.compare( diff --git a/jack-tests/tests/com/android/jack/noclasspath/NoClasspathTest.java b/jack-tests/tests/com/android/jack/noclasspath/NoClasspathTest.java index ee11ba6..42fb935 100644 --- a/jack-tests/tests/com/android/jack/noclasspath/NoClasspathTest.java +++ b/jack-tests/tests/com/android/jack/noclasspath/NoClasspathTest.java @@ -61,7 +61,7 @@ public class NoClasspathTest { private static File PLAY_SERVICE_JAR; - private static String corePath; + private static File corePath; @BeforeClass public static void setup() throws Exception { @@ -92,15 +92,13 @@ public class NoClasspathTest { // File coreOut = AbstractTestTools.createTempFile("core", ".jack"); - File coreOut = new File("/tmp/ + core.jack"); + File corePath = new File("/tmp/ + core.jack"); AndroidToolchain toolchain = AbstractTestTools.getCandidateToolchain(AndroidToolchain.class); toolchain.setSourceLevel(SourceLevel.JAVA_7); - toolchain.srcToLib( - /* classpath = */ null, - coreOut, + toolchain.srcToLib(corePath, /* zipFile = */ true, CORE_SOURCELIST); - corePath = coreOut.getAbsolutePath(); +// corePath = coreOut.getAbsolutePath(); } @Test @@ -108,7 +106,8 @@ public class NoClasspathTest { File extJack = AbstractTestTools.createTempFile("ext", ".jack"); AndroidToolchain toolchain = AbstractTestTools.getCandidateToolchain(AndroidToolchain.class); - toolchain.srcToLib(corePath, extJack, /* zipFiles = */ true, EXT_SOURCELIST); + toolchain.addToClasspath(corePath) + .srcToLib(extJack, /* zipFiles = */ true, EXT_SOURCELIST); File extFolder = AbstractTestTools.createTempDir(); toolchain = AbstractTestTools.getCandidateToolchain(AndroidToolchain.class); @@ -119,7 +118,8 @@ public class NoClasspathTest { public void frameworkFromJack() throws Exception { File conscryptJack = AbstractTestTools.createTempFile("conscrypt", ".jack"); JackBasedToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackBasedToolchain.class); - toolchain.srcToLib(corePath, conscryptJack, /* zipFiles = */ true, CONSCRYPT_SOURCELIST); + toolchain.addToClasspath(corePath) + .srcToLib(conscryptJack, /* zipFiles = */ true, CONSCRYPT_SOURCELIST); File conscryptRenamedJack = AbstractTestTools.createTempFile("conscryptrenamed", ".jack"); File conscyptRules = @@ -130,8 +130,9 @@ public class NoClasspathTest { File okhttpJack = AbstractTestTools.createTempFile("okkttp", ".jack"); toolchain = AbstractTestTools.getCandidateToolchain(JackBasedToolchain.class); - toolchain.srcToLib(corePath + File.pathSeparatorChar + conscryptRenamedJack.getAbsolutePath(), - okhttpJack, /* zipFiles = */ true, OKHTTP_SOURCELIST); + toolchain.addToClasspath(corePath) + .addToClasspath(conscryptRenamedJack) + .srcToLib(okhttpJack, /* zipFiles = */ true, OKHTTP_SOURCELIST); File okhttpRenamedJack = AbstractTestTools.createTempFile("okhttprenamed", ".jack"); File okhttpRules = @@ -142,15 +143,18 @@ public class NoClasspathTest { File extJack = AbstractTestTools.createTempFile("ext", ".jack"); toolchain = AbstractTestTools.getCandidateToolchain(JackBasedToolchain.class); - toolchain.srcToLib(corePath, extJack, /* zipFiles = */ true, EXT_SOURCELIST); + toolchain.addToClasspath(corePath) + .srcToLib(extJack, /* zipFiles = */ true, EXT_SOURCELIST); File bouncyCastleJack = AbstractTestTools.createTempFile("bouncyjack", ".jack"); toolchain = AbstractTestTools.getCandidateToolchain(JackBasedToolchain.class); - toolchain.srcToLib(corePath, bouncyCastleJack, /* zipFiles = */ true, BOUNCY_SOURCELIST); + toolchain.addToClasspath(corePath) + .srcToLib(bouncyCastleJack, /* zipFiles = */ true, BOUNCY_SOURCELIST); File coreJunitJack = AbstractTestTools.createTempFile("corejunitjack", ".jack"); toolchain = AbstractTestTools.getCandidateToolchain(JackBasedToolchain.class); - toolchain.srcToLib(corePath, coreJunitJack, /* zipFiles = */ true, CORE_JUNIT_SOURCELIST); + toolchain.addToClasspath(corePath) + .srcToLib(coreJunitJack, /* zipFiles = */ true, CORE_JUNIT_SOURCELIST); File bouncyCastleRenamedJack = AbstractTestTools.createTempFile("bouncyjackrenamed", ".jack"); File jarjarRules = @@ -159,16 +163,24 @@ public class NoClasspathTest { toolchain.setJarjarRules(jarjarRules); toolchain.libToLib(bouncyCastleJack, bouncyCastleRenamedJack, /* zipFiles = */ true); - String classpath = corePath + File.pathSeparatorChar + conscryptRenamedJack.getAbsolutePath() - + File.pathSeparatorChar + okhttpRenamedJack.getAbsolutePath() - + File.pathSeparatorChar + extJack.getAbsolutePath() - + File.pathSeparatorChar + bouncyCastleRenamedJack.getAbsolutePath() - + File.pathSeparatorChar + coreJunitJack.getAbsolutePath(); +// String classpath = corePath + File.pathSeparatorChar + conscryptRenamedJack.getAbsolutePath() +// + File.pathSeparatorChar + okhttpRenamedJack.getAbsolutePath() +// + File.pathSeparatorChar + extJack.getAbsolutePath() +// + File.pathSeparatorChar + bouncyCastleRenamedJack.getAbsolutePath() +// + File.pathSeparatorChar + coreJunitJack.getAbsolutePath(); + + File[] classpath = new File[] {corePath, + conscryptRenamedJack, + okhttpRenamedJack, + extJack, + bouncyCastleRenamedJack, + coreJunitJack}; File frameworkJackZip = AbstractTestTools.createTempFile("framework", ".jack"); toolchain = AbstractTestTools.getCandidateToolchain(JackBasedToolchain.class); toolchain.setSourceLevel(SourceLevel.JAVA_7); - toolchain.srcToLib(classpath, frameworkJackZip, /* zipFiles = */ true, FRAMEWORK_SOURCELIST); + toolchain.addToClasspath(classpath) + .srcToLib(frameworkJackZip, /* zipFiles = */ true, FRAMEWORK_SOURCELIST); toolchain = AbstractTestTools.getCandidateToolchain(JackBasedToolchain.class); toolchain.addProperty(DexFileWriter.DEX_WRITING_POLICY.getName(), "multidex"); diff --git a/jack-tests/tests/com/android/jack/nopackage/NoPackageTests.java b/jack-tests/tests/com/android/jack/nopackage/NoPackageTests.java index 54c5978..db2cd23 100644 --- a/jack-tests/tests/com/android/jack/nopackage/NoPackageTests.java +++ b/jack-tests/tests/com/android/jack/nopackage/NoPackageTests.java @@ -34,8 +34,8 @@ public class NoPackageTests { @Test public void test001() throws Exception { IToolchain toolchain = AbstractTestTools.getCandidateToolchain(); - toolchain.srcToExe( - AbstractTestTools.getClasspathAsString(toolchain.getDefaultBootClasspath()), + toolchain.addToClasspath(toolchain.getDefaultBootClasspath()) + .srcToExe( AbstractTestTools.createTempDir(), /* zipFile = */ false, AbstractTestTools.getTestRootDir("com.android.jack.nopackage.test001.jack")); @@ -45,8 +45,8 @@ public class NoPackageTests { public void test001_throughJayce() throws Exception { File tmpDir = AbstractTestTools.createTempDir(); IToolchain toolchain = AbstractTestTools.getCandidateToolchain(); - toolchain.srcToLib( - AbstractTestTools.getClasspathAsString(toolchain.getDefaultBootClasspath()), + toolchain.addToClasspath(toolchain.getDefaultBootClasspath()) + .srcToLib( tmpDir, /* zipFiles = */ false, AbstractTestTools.getTestRootDir("com.android.jack.nopackage.test001.jack")); diff --git a/jack-tests/tests/com/android/jack/optimizations/uselesscopy/UselessVariableCopyTest.java b/jack-tests/tests/com/android/jack/optimizations/uselesscopy/UselessVariableCopyTest.java index eaae6ae..a65038a 100644 --- a/jack-tests/tests/com/android/jack/optimizations/uselesscopy/UselessVariableCopyTest.java +++ b/jack-tests/tests/com/android/jack/optimizations/uselesscopy/UselessVariableCopyTest.java @@ -46,10 +46,8 @@ public class UselessVariableCopyTest { File outDex = new File(out, "classes.dex"); JackBasedToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackBasedToolchain.class); toolchain.disableDxOptimizations(); - toolchain.srcToExe( - AbstractTestTools.getClasspathAsString(toolchain.getDefaultBootClasspath()), - out, - /* zipFile = */ false, + toolchain.addToClasspath(toolchain.getDefaultBootClasspath()) + .srcToExe(out, /* zipFile = */ false, AbstractTestTools.getTestRootDir("com.android.jack.optimizations.uselesscopy.test001.jack")); DexFile dexFile = new DexFile(outDex); diff --git a/jack-tests/tests/com/android/jack/preprocessor/PreProcessorTests.java b/jack-tests/tests/com/android/jack/preprocessor/PreProcessorTests.java index 9ffb2fe..3ab5c00 100644 --- a/jack-tests/tests/com/android/jack/preprocessor/PreProcessorTests.java +++ b/jack-tests/tests/com/android/jack/preprocessor/PreProcessorTests.java @@ -52,9 +52,8 @@ public class PreProcessorTests { toolchain.addProperty(PreProcessor.ENABLE.getName(), "true"); toolchain.addProperty(PreProcessor.FILE.getName(), new File(testDir, "config.jpp").getAbsolutePath()); - toolchain.srcToExe( - AbstractTestTools.getClasspathAsString(toolchain.getDefaultBootClasspath()), - AbstractTestTools.createTempFile("annotationAdderTest", ".out.zip"), + toolchain.addToClasspath(toolchain.getDefaultBootClasspath()) + .srcToExe(AbstractTestTools.createTempFile("annotationAdderTest", ".out.zip"), /* zipFile = */ true, testDir); } @@ -64,9 +63,8 @@ public class PreProcessorTests { File testDir = AbstractTestTools.getTestRootDir("com.android.jack.preprocessor.test001.jack"); File tempDir = AbstractTestTools.createTempDir(); JackBasedToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackBasedToolchain.class); - toolchain.srcToLib( - AbstractTestTools.getClasspathAsString(toolchain.getDefaultBootClasspath()), - tempDir, + toolchain.addToClasspath(toolchain.getDefaultBootClasspath()) + .srcToLib(tempDir, /* zipFiles = */ false, testDir); diff --git a/jack-tests/tests/com/android/jack/resource/ResourceTests.java b/jack-tests/tests/com/android/jack/resource/ResourceTests.java index fa31289..a5d46ff 100644 --- a/jack-tests/tests/com/android/jack/resource/ResourceTests.java +++ b/jack-tests/tests/com/android/jack/resource/ResourceTests.java @@ -114,8 +114,8 @@ public class ResourceTests { File jackFolder = AbstractTestTools.createTempDir(); JackBasedToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackBasedToolchain.class); toolchain.addResource(new File(FILE, "rsc")); - toolchain.srcToLib( - AbstractTestTools.getClasspathAsString(toolchain.getDefaultBootClasspath()), + toolchain.addToClasspath(toolchain.getDefaultBootClasspath()) + .srcToLib( jackFolder, /* zipFiles = */ false, FILE); @@ -159,8 +159,8 @@ public class ResourceTests { File jackFolder = AbstractTestTools.createTempDir(); JackBasedToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackBasedToolchain.class); toolchain.addResource(new File(FILE, "rsc")); - toolchain.srcToLib( - AbstractTestTools.getClasspathAsString(toolchain.getDefaultBootClasspath()), + toolchain.addToClasspath(toolchain.getDefaultBootClasspath()) + .srcToLib( jackFolder, /* zipFiles = */ false, FILE); @@ -205,8 +205,8 @@ public class ResourceTests { File jackFolder = AbstractTestTools.createTempDir(); JackBasedToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackBasedToolchain.class); toolchain.addResource(new File(FILE, "rsc")); - toolchain.srcToLib( - AbstractTestTools.getClasspathAsString(toolchain.getDefaultBootClasspath()), + toolchain.addToClasspath(toolchain.getDefaultBootClasspath()) + .srcToLib( jackFolder, /* zipFiles = */ false, FILE); @@ -230,8 +230,8 @@ public class ResourceTests { File jackFolder = AbstractTestTools.createTempDir(); JackBasedToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackBasedToolchain.class); toolchain.addResource(new File(FILE, "rsc")); - toolchain.srcToLib( - AbstractTestTools.getClasspathAsString(toolchain.getDefaultBootClasspath()), + toolchain.addToClasspath(toolchain.getDefaultBootClasspath()) + .srcToLib( jackFolder, /* zipFiles = */ false, FILE); @@ -254,8 +254,8 @@ public class ResourceTests { File jackFolder = AbstractTestTools.createTempDir(); JackBasedToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackBasedToolchain.class); toolchain.addResource(new File(FILE, "rsc")); - toolchain.srcToLib( - AbstractTestTools.getClasspathAsString(toolchain.getDefaultBootClasspath()), + toolchain.addToClasspath(toolchain.getDefaultBootClasspath()) + .srcToLib( jackFolder, /* zipFiles = */ false, FILE); @@ -281,8 +281,8 @@ public class ResourceTests { File testFolder = AbstractTestTools.getTestRootDir("com.android.jack.resource.test003"); File jackTestFolder = AbstractTestTools.getTestRootDir("com.android.jack.resource.test003.jack"); JackBasedToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackBasedToolchain.class); - toolchain.srcToLib( - AbstractTestTools.getClasspathAsString(toolchain.getDefaultBootClasspath()), + toolchain.addToClasspath(toolchain.getDefaultBootClasspath()) + .srcToLib( jackOutputFolder, /* zipFiles = */ false, testFolder); @@ -314,8 +314,8 @@ public class ResourceTests { JackBasedToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackBasedToolchain.class); File jackAr = AbstractTestTools.createTempFile("resourcetestjack", toolchain.getLibraryExtension()); toolchain.addResource(new File(FILE, "rsc")); - toolchain.srcToLib( - AbstractTestTools.getClasspathAsString(toolchain.getDefaultBootClasspath()), + toolchain.addToClasspath(toolchain.getDefaultBootClasspath()) + .srcToLib( jackAr, /* zipFiles = */ true, FILE); diff --git a/jack-tests/tests/com/android/jack/returnstatement/ReturnstatementTests.java b/jack-tests/tests/com/android/jack/returnstatement/ReturnstatementTests.java index 1af46dc..66c8792 100644 --- a/jack-tests/tests/com/android/jack/returnstatement/ReturnstatementTests.java +++ b/jack-tests/tests/com/android/jack/returnstatement/ReturnstatementTests.java @@ -59,11 +59,11 @@ public class ReturnstatementTests extends RuntimeTest { public void ropBuildMethodWithSameReturnReg() throws Exception { IToolchain toolchain = AbstractTestTools.getCandidateToolchain(); - String classpath = AbstractTestTools.getClasspathAsString(toolchain.getDefaultBootClasspath()); File dexOutDir = AbstractTestTools.createTempDir(); File testSourceDir = AbstractTestTools.getTestRootDir("com.android.jack.analysis.dfa.reachingdefs.test001"); - toolchain.srcToExe(classpath, dexOutDir, /* zipFile = */ false, testSourceDir); + toolchain.addToClasspath(toolchain.getDefaultBootClasspath()) + .srcToExe(dexOutDir, /* zipFile = */ false, testSourceDir); } diff --git a/jack-tests/tests/com/android/jack/shrob/ShrinkTests.java b/jack-tests/tests/com/android/jack/shrob/ShrinkTests.java index acde55f..3127719 100644 --- a/jack-tests/tests/com/android/jack/shrob/ShrinkTests.java +++ b/jack-tests/tests/com/android/jack/shrob/ShrinkTests.java @@ -93,18 +93,17 @@ public class ShrinkTests extends AbstractTest { try { JackApiToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.class); - toolchain.srcToLib( - AbstractTestTools.getClasspathAsString(toolchain.getDefaultBootClasspath()), + toolchain.addToClasspath(toolchain.getDefaultBootClasspath()) + .srcToLib( libOut, /* zipFiles = */ false, new File(shrobTestsDir, "test020/lib")); toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.class); testOut = AbstractTestTools.createTempDir(); - toolchain.srcToLib( - AbstractTestTools.getClasspathsAsString( - toolchain.getDefaultBootClasspath(), new File[] {libOut}), - testOut, + toolchain.addToClasspath(toolchain.getDefaultBootClasspath()) + .addToClasspath(libOut) + .srcToLib(testOut, /* zipFiles = */ false, new File(shrobTestsDir, "test020/jack")); @@ -142,8 +141,8 @@ public class ShrinkTests extends AbstractTest { try { JackApiToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.class); - toolchain.srcToLib( - AbstractTestTools.getClasspathAsString(toolchain.getDefaultBootClasspath()), + toolchain.addToClasspath(toolchain.getDefaultBootClasspath()) + .srcToLib( jackOut, /* zipFiles = */ false, new File(shrobTestsDir, "test021/jack")); @@ -192,9 +191,8 @@ public class ShrinkTests extends AbstractTest { shrinkedjackar = AbstractTestTools.createTempFile("shrinkedjackar", toolchain.getLibraryExtension()); ProguardFlags flags = new ProguardFlags(testFolder, "proguard.flags001"); - String classpath = AbstractTestTools.getClasspathAsString(toolchain.getDefaultBootClasspath()); - toolchain.srcToLib( - classpath, + toolchain.addToClasspath(toolchain.getDefaultBootClasspath()) + .srcToLib( jackar, /* zipFiles = */ true, testFolder); diff --git a/jack-tests/tests/com/android/jack/string/StringTests.java b/jack-tests/tests/com/android/jack/string/StringTests.java index 9268536..ed919d6 100644 --- a/jack-tests/tests/com/android/jack/string/StringTests.java +++ b/jack-tests/tests/com/android/jack/string/StringTests.java @@ -51,8 +51,8 @@ public class StringTests extends RuntimeTest { @Test public void testCompileNewString() throws Exception { IToolchain toolchain = AbstractTestTools.getCandidateToolchain(); - toolchain.srcToExe( - AbstractTestTools.getClasspathAsString(toolchain.getDefaultBootClasspath()), + toolchain.addToClasspath(toolchain.getDefaultBootClasspath()) + .srcToExe( AbstractTestTools.createTempDir(), /* zipFile = */ false, AbstractTestTools.getTestRootDir("com.android.jack.string.test001.jack")); diff --git a/jack-tests/tests/com/android/jack/switchstatement/SwitchstatementTests.java b/jack-tests/tests/com/android/jack/switchstatement/SwitchstatementTests.java index 53f7e69..f3c37a0 100644 --- a/jack-tests/tests/com/android/jack/switchstatement/SwitchstatementTests.java +++ b/jack-tests/tests/com/android/jack/switchstatement/SwitchstatementTests.java @@ -100,8 +100,8 @@ public class SwitchstatementTests extends RuntimeTest { // build as jack JackBasedToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackBasedToolchain.class); - toolchain.srcToLib( - AbstractTestTools.getClasspathAsString(toolchain.getDefaultBootClasspath()), outJackTmp, + toolchain.addToClasspath(toolchain.getDefaultBootClasspath()) + .srcToLib(outJackTmp, /* zipFiles = */false, AbstractTestTools.getTestRootDir("com.android.jack.switchstatement.test002.jack")); } @@ -159,8 +159,8 @@ public class SwitchstatementTests extends RuntimeTest { File out = new File(outFolder, DexFileWriter.DEX_FILENAME); IToolchain toolchain = AbstractTestTools.getCandidateToolchain(); - toolchain.srcToExe( - AbstractTestTools.getClasspathAsString(toolchain.getDefaultBootClasspath()), + toolchain.addToClasspath(toolchain.getDefaultBootClasspath()) + .srcToExe( outFolder, /* zipFile = */ false, AbstractTestTools.getTestRootDir("com.android.jack.switchstatement.test009.jack")); diff --git a/jack-tests/tests/com/android/jack/toolchain/ToolchainTest.java b/jack-tests/tests/com/android/jack/toolchain/ToolchainTest.java index 6f13e90..a53af3c 100644 --- a/jack-tests/tests/com/android/jack/toolchain/ToolchainTest.java +++ b/jack-tests/tests/com/android/jack/toolchain/ToolchainTest.java @@ -54,11 +54,10 @@ public class ToolchainTest { TestTools.getTargetLibSourcelist("bouncycastle"); JUNIT_SOURCELIST = TestTools.getHostLibSourcelist("junit4-hostdex-jack"); - File coreOut = AbstractTestTools.createTempFile("core", ".jack"); + corePath = AbstractTestTools.createTempFile("core", ".jack"); AndroidToolchain toolchain = AbstractTestTools.getCandidateToolchain(AndroidToolchain.class); toolchain.setSourceLevel(SourceLevel.JAVA_7); - toolchain.srcToLib(/* classpath = */ null, coreOut, /* zipFiles = */ true, CORE_SOURCELIST); - corePath = coreOut; + toolchain.srcToLib(corePath, /* zipFiles = */ true, CORE_SOURCELIST); } @Test @@ -66,9 +65,9 @@ public class ToolchainTest { File shrobTestJackOut = AbstractTestTools.createTempDir(); File testFolder = AbstractTestTools.getTestRootDir("com.android.jack.shrob.test001"); File sourceDir = new File(testFolder, "jack"); - String classpath = corePath.getAbsolutePath(); AndroidToolchain toolchain = AbstractTestTools.getCandidateToolchain(AndroidToolchain.class); - toolchain.srcToLib(classpath, shrobTestJackOut, /* zipFiles = */ false, sourceDir); + toolchain.addToClasspath(corePath) + .srcToLib(shrobTestJackOut, /* zipFiles = */ false, sourceDir); File shrobTestShrunkOut = AbstractTestTools.createTempDir(); List<ProguardFlags> flagFiles = new ArrayList<ProguardFlags>(); @@ -87,10 +86,10 @@ public class ToolchainTest { File shrobTestJackOut = AbstractTestTools.createTempFile("shrobtest", ".jack"); File testFolder = AbstractTestTools.getTestRootDir("com.android.jack.shrob.test001"); File sourceDir = new File(testFolder, "jack"); - String classpath = corePath.getAbsolutePath(); AndroidToolchain toolchain = AbstractTestTools.getCandidateToolchain(AndroidToolchain.class); - toolchain.srcToLib(classpath, shrobTestJackOut, /* zipFiles = */ true, sourceDir); + toolchain.addToClasspath(corePath) + .srcToLib(shrobTestJackOut, /* zipFiles = */ true, sourceDir); File shrobTestShrunkOut = AbstractTestTools.createTempFile("shrunk", ".jack"); List<ProguardFlags> flagFiles = new ArrayList<ProguardFlags>(); @@ -108,8 +107,8 @@ public class ToolchainTest { public void bouncyCastle() throws Exception { File bouncyCastleJack = AbstractTestTools.createTempFile("bouncyjack", ".jack"); AndroidToolchain toolchain = AbstractTestTools.getCandidateToolchain(AndroidToolchain.class); - toolchain.srcToLib(corePath.getAbsolutePath(), bouncyCastleJack, /* zipFiles = */ true, - BOUNCY_SOURCELIST); + toolchain.addToClasspath(corePath) + .srcToLib(bouncyCastleJack, /* zipFiles = */ true, BOUNCY_SOURCELIST); File bouncyCastleOutFolder = AbstractTestTools.createTempDir(); toolchain = AbstractTestTools.getCandidateToolchain(AndroidToolchain.class); @@ -127,10 +126,10 @@ public class ToolchainTest { public void junit() throws Exception { File junitJack = AbstractTestTools.createTempFile("junit", ".zip"); AndroidToolchain toolchain = AbstractTestTools.getCandidateToolchain(AndroidToolchain.class); - toolchain.srcToLib(corePath.getAbsolutePath() - + File.pathSeparator + TestTools.getFromAndroidTree( - "out/host/common/obj/JAVA_LIBRARIES/hamcrest-core-hostdex-jack_intermediates/classes.jack"), - junitJack, /* zipFiles = */ true, JUNIT_SOURCELIST); + toolchain.addToClasspath(corePath) + .addToClasspath(TestTools.getFromAndroidTree( + "out/host/common/obj/JAVA_LIBRARIES/hamcrest-core-hostdex-jack_intermediates/classes.jack")) + .srcToLib(junitJack, /* zipFiles = */ true, JUNIT_SOURCELIST); File junitOutFolder = AbstractTestTools.createTempDir(); toolchain = AbstractTestTools.getCandidateToolchain(AndroidToolchain.class); @@ -142,14 +141,15 @@ public class ToolchainTest { File jarjarTestJackOut = AbstractTestTools.createTempFile("jarjartest", ".jack"); File testFolder = AbstractTestTools.getTestRootDir("com.android.jack.jarjar.test003"); File sourceDir = new File(testFolder, "jack"); - String classpath = corePath.getAbsolutePath(); AndroidToolchain toolchain = AbstractTestTools.getCandidateToolchain(AndroidToolchain.class); - toolchain.srcToLib(classpath, jarjarTestJackOut, /* zipFiles = */ true, sourceDir); + toolchain.addToClasspath(corePath) + .srcToLib(jarjarTestJackOut, /* zipFiles = */ true, sourceDir); File dalvikAnnotations = TestTools.getFromAndroidTree("libcore/dalvik/src/main/java/"); File dalvikAnnotationsJackOut = AbstractTestTools.createTempFile("dalvikannotations", ".jack"); toolchain = AbstractTestTools.getCandidateToolchain(AndroidToolchain.class); - toolchain.srcToLib(classpath, dalvikAnnotationsJackOut, /* zipFiles = */ true, dalvikAnnotations); + toolchain.addToClasspath(corePath) + .srcToLib(dalvikAnnotationsJackOut, /* zipFiles = */ true, dalvikAnnotations); File jarjarTestRenamedOut = AbstractTestTools.createTempFile("jarjartestrenamed", ".jack"); File jarjarRules = new File(testFolder, "jarjar-rules.txt"); diff --git a/jack-tests/tests/com/android/jack/tools/merger/MergerTestTools.java b/jack-tests/tests/com/android/jack/tools/merger/MergerTestTools.java index b47a2d1..777951e 100644 --- a/jack-tests/tests/com/android/jack/tools/merger/MergerTestTools.java +++ b/jack-tests/tests/com/android/jack/tools/merger/MergerTestTools.java @@ -36,7 +36,6 @@ public class MergerTestTools { boolean withDebug, @CheckForNull OutputStream out, @CheckForNull OutputStream err) throws Exception { JackApiToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.class); - String classpath = AbstractTestTools.getClasspathAsString(toolchain.getDefaultBootClasspath()); try { File multiDexFolder = AbstractTestTools.createTempDir(); File multiDex = new File(multiDexFolder, DexFileWriter.DEX_FILENAME); @@ -55,7 +54,8 @@ public class MergerTestTools { toolchain.setErrorStream(err); } - toolchain.srcToExe(classpath, multiDexFolder, /* zipFile = */ false, sourceFolder); + toolchain.addToClasspath(toolchain.getDefaultBootClasspath()) + .srcToExe(multiDexFolder, /* zipFile = */ false, sourceFolder); return multiDex; diff --git a/jack-tests/tests/com/android/jack/trycatch/TrycatchTests.java b/jack-tests/tests/com/android/jack/trycatch/TrycatchTests.java index 1f8be89..86750f3 100644 --- a/jack-tests/tests/com/android/jack/trycatch/TrycatchTests.java +++ b/jack-tests/tests/com/android/jack/trycatch/TrycatchTests.java @@ -94,8 +94,8 @@ public class TrycatchTests extends RuntimeTest { File out = AbstractTestTools.createTempFile("uselessMovInstructions", ".dex"); IToolchain toolchain = AbstractTestTools.getCandidateToolchain(); - toolchain.srcToExe( - AbstractTestTools.getClasspathAsString(toolchain.getDefaultBootClasspath()), + toolchain.addToClasspath(toolchain.getDefaultBootClasspath()) + .srcToExe( out, /* zipFile = */ false, AbstractTestTools.getTestRootDir("com.android.jack.trycatch.test004")); diff --git a/jack-tests/tests/com/android/jack/withphantom/WithPhantomTests.java b/jack-tests/tests/com/android/jack/withphantom/WithPhantomTests.java index fbf946c..a32b0ff 100644 --- a/jack-tests/tests/com/android/jack/withphantom/WithPhantomTests.java +++ b/jack-tests/tests/com/android/jack/withphantom/WithPhantomTests.java @@ -56,8 +56,8 @@ public class WithPhantomTests { File tempJackFolder = AbstractTestTools.createTempDir(); JackBasedToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackBasedToolchain.class); - toolchain.srcToLib( - AbstractTestTools.getClasspathAsString(toolchain.getDefaultBootClasspath()), + toolchain.addToClasspath(toolchain.getDefaultBootClasspath()) + .srcToLib( tempJackFolder, /* zipFiles = */ false, AbstractTestTools.getTestRootDir(TEST001_JACK)); @@ -99,8 +99,8 @@ public class WithPhantomTests { File tempJackFolder = AbstractTestTools.createTempDir(); JackBasedToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackBasedToolchain.class); - toolchain.srcToLib( - AbstractTestTools.getClasspathAsString(toolchain.getDefaultBootClasspath()), + toolchain.addToClasspath(toolchain.getDefaultBootClasspath()) + .srcToLib( tempJackFolder, /* zipFiles = */ false, AbstractTestTools.getTestRootDir(TEST001_JACK)); @@ -147,8 +147,8 @@ public class WithPhantomTests { File tempJackFolder = AbstractTestTools.createTempDir(); JackBasedToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackBasedToolchain.class); - toolchain.srcToLib( - AbstractTestTools.getClasspathAsString(toolchain.getDefaultBootClasspath()), + toolchain.addToClasspath(toolchain.getDefaultBootClasspath()) + .srcToLib( tempJackFolder, /* zipFiles = */ false, AbstractTestTools.getTestRootDir(TEST002_JACK)); @@ -182,8 +182,8 @@ public class WithPhantomTests { File tempJackFolder = AbstractTestTools.createTempDir(); JackBasedToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackBasedToolchain.class); - toolchain.srcToLib( - AbstractTestTools.getClasspathAsString(toolchain.getDefaultBootClasspath()), + toolchain.addToClasspath(toolchain.getDefaultBootClasspath()) + .srcToLib( tempJackFolder, /* zipFiles = */ false, AbstractTestTools.getTestRootDir(TEST002_JACK)); diff --git a/jack-tests/tests/com/android/sched/SchedTest.java b/jack-tests/tests/com/android/sched/SchedTest.java index f5700e2..5a84e0e 100644 --- a/jack-tests/tests/com/android/sched/SchedTest.java +++ b/jack-tests/tests/com/android/sched/SchedTest.java @@ -43,6 +43,7 @@ public class SchedTest { @Test public void testCompile() throws Exception { JackBasedToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackBasedToolchain.class); - toolchain.srcToExe(AbstractTestTools.getClasspathAsString(toolchain.getDefaultBootClasspath()), AbstractTestTools.createTempDir(), /* zipFile = */ false, SOURCE); + toolchain.addToClasspath(toolchain.getDefaultBootClasspath()) + .srcToExe(AbstractTestTools.createTempDir(), /* zipFile = */ false, SOURCE); } } |