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/bridge | |
| 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/bridge')
| -rw-r--r-- | jack-tests/tests/com/android/jack/bridge/BridgeTests.java | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/jack-tests/tests/com/android/jack/bridge/BridgeTests.java b/jack-tests/tests/com/android/jack/bridge/BridgeTests.java index f7e543b..1b68cd2 100644 --- a/jack-tests/tests/com/android/jack/bridge/BridgeTests.java +++ b/jack-tests/tests/com/android/jack/bridge/BridgeTests.java @@ -112,8 +112,8 @@ public class BridgeTests extends RuntimeTest { IToolchain toolchain = AbstractTestTools.getCandidateToolchain(); File srcFolder = AbstractTestTools.getTestRootDir("com.android.jack.bridge.test008.jack"); File jackZipOfGenericPackageProtected = AbstractTestTools.createTempFile("tmpBridge", toolchain.getLibraryExtension()); - toolchain.srcToLib( - AbstractTestTools.getClasspathAsString(toolchain.getDefaultBootClasspath()), + toolchain.addToClasspath(toolchain.getDefaultBootClasspath()) + .srcToLib( jackZipOfGenericPackageProtected, /* zipFiles = */ true, srcFolder); @@ -121,8 +121,8 @@ public class BridgeTests extends RuntimeTest { // Build jack file from PublicExtendsGeneric.java toolchain = AbstractTestTools.getCandidateToolchain(); File jackZipOfPublicExtendsGeneric = AbstractTestTools.createTempFile("tmpBridge", toolchain.getLibraryExtension()); - toolchain.srcToLib( - AbstractTestTools.getClasspathsAsString(toolchain.getDefaultBootClasspath(), new File [] {jackZipOfGenericPackageProtected}), + toolchain.addToClasspath(toolchain.getDefaultBootClasspath()).addToClasspath(jackZipOfGenericPackageProtected) + .srcToLib( jackZipOfPublicExtendsGeneric, /* zipFiles = */ true, new File(srcFolder, "sub/PublicExtendsGeneric.java")); @@ -131,8 +131,8 @@ public class BridgeTests extends RuntimeTest { toolchain = AbstractTestTools.getCandidateToolchain(); toolchain = toolchain.addStaticLibs(jackZipOfPublicExtendsGeneric); File outDexFolder = AbstractTestTools.createTempDir(); - toolchain.srcToExe( - AbstractTestTools.getClasspathAsString(toolchain.getDefaultBootClasspath()), + toolchain.addToClasspath(toolchain.getDefaultBootClasspath()) + .srcToExe( outDexFolder, /* zipFile = */ false, new File(srcFolder, "Caller.java")); @@ -141,8 +141,8 @@ public class BridgeTests extends RuntimeTest { @Test public void test009() throws Exception { IToolchain toolchain = AbstractTestTools.getCandidateToolchain(); - toolchain.srcToExe( - AbstractTestTools.getClasspathAsString(toolchain.getDefaultBootClasspath()), + toolchain.addToClasspath(toolchain.getDefaultBootClasspath()) + .srcToExe( AbstractTestTools.createTempDir(), /* zipFile = */ false, AbstractTestTools.getTestRootDir("com.android.jack.bridge.test009")); |