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 /jack-tests/tests/com/android/jack/withphantom/WithPhantomTests.java | |
| parent | 891e26ba9d55d1cbc6b0bd37289dd9e7db70b5ed (diff) | |
| download | toolchain_jack-e457ff34e60f5126b2c349b75394e4cf123141fc.tar.gz toolchain_jack-e457ff34e60f5126b2c349b75394e4cf123141fc.tar.bz2 toolchain_jack-e457ff34e60f5126b2c349b75394e4cf123141fc.zip | |
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
Diffstat (limited to 'jack-tests/tests/com/android/jack/withphantom/WithPhantomTests.java')
| -rw-r--r-- | jack-tests/tests/com/android/jack/withphantom/WithPhantomTests.java | 16 |
1 files changed, 8 insertions, 8 deletions
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)); |