From e457ff34e60f5126b2c349b75394e4cf123141fc Mon Sep 17 00:00:00 2001 From: Jean-Marie Henaff Date: Mon, 26 Jan 2015 17:16:52 +0100 Subject: 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 --- .../com/android/jack/withphantom/WithPhantomTests.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'jack-tests/tests/com/android/jack/withphantom/WithPhantomTests.java') diff --git a/jack-tests/tests/com/android/jack/withphantom/WithPhantomTests.java b/jack-tests/tests/com/android/jack/withphantom/WithPhantomTests.java index fbf946c2..a32b0ffe 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)); -- cgit v1.2.3