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/lookup | |
| 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
Diffstat (limited to 'jack-tests/tests/com/android/jack/lookup')
| -rw-r--r-- | jack-tests/tests/com/android/jack/lookup/LookupTests.java | 16 |
1 files changed, 7 insertions, 9 deletions
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(); |