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

7 files changed, 14 insertions, 15 deletions

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 3768888d..8cf5cc8d 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 8d3631de..fa556440 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 ab98c40f..9840539a 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 e5d2f456..5e45e6b1 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 6164b2db..ff3572f0 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 55f1e03c..2d44a55d 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 0ba36714..3e89b5c5 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);