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/annotation/AnnotationTests.java | |
| 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/annotation/AnnotationTests.java')
| -rw-r--r-- | jack-tests/tests/com/android/jack/annotation/AnnotationTests.java | 10 |
1 files changed, 4 insertions, 6 deletions
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 |