summaryrefslogtreecommitdiffstats
path: root/jack-tests/tests
diff options
context:
space:
mode:
authormikaelpeltier <mikaelpeltier@google.com>2015-04-09 11:04:21 +0200
committermikaelpeltier <mikaelpeltier@google.com>2015-04-09 11:16:19 +0200
commitd8f5bfa183fc99a9106923ece3c900c74c9eca7d (patch)
treeefc4669b406415138136e10928768d12ea595425 /jack-tests/tests
parent0606fc100cbbb528f9be74365c3a31a7db3a31cf (diff)
downloadtoolchain_jack-d8f5bfa183fc99a9106923ece3c900c74c9eca7d.zip
toolchain_jack-d8f5bfa183fc99a9106923ece3c900c74c9eca7d.tar.gz
toolchain_jack-d8f5bfa183fc99a9106923ece3c900c74c9eca7d.tar.bz2
Modify AbstractTestTools api to detect error at compile time
Change-Id: Id88be0584579d551e40d95704320dcf0ede87610
Diffstat (limited to 'jack-tests/tests')
-rw-r--r--jack-tests/tests/com/android/jack/classpath/ClasspathTests.java4
-rw-r--r--jack-tests/tests/com/android/jack/imports/ImportTests.java2
2 files changed, 3 insertions, 3 deletions
diff --git a/jack-tests/tests/com/android/jack/classpath/ClasspathTests.java b/jack-tests/tests/com/android/jack/classpath/ClasspathTests.java
index 37d1127..ba62abc 100644
--- a/jack-tests/tests/com/android/jack/classpath/ClasspathTests.java
+++ b/jack-tests/tests/com/android/jack/classpath/ClasspathTests.java
@@ -113,7 +113,7 @@ public class ClasspathTests {
{
// reference compilation
- toolchain = AbstractTestTools.getCandidateToolchain(JackBasedToolchain.class);
+ toolchain = AbstractTestTools.getCandidateToolchain(JackBasedToolchain.class, excludeList);
File testOut = AbstractTestTools.createTempDir();
File testSrc = new File(testDir, "jack");
toolchain.addToClasspath(defaultBootClasspath)
@@ -127,7 +127,7 @@ public class ClasspathTests {
+ "/com/android/jack/classpath/test003/lib/HasInnersClasses$InnerToDelete"
+ toolchain.getLibraryElementsExtension()).delete();
Assert.assertTrue(deleted);
- toolchain = AbstractTestTools.getCandidateToolchain();
+ toolchain = AbstractTestTools.getCandidateToolchain(JackBasedToolchain.class, excludeList);
File testOut = AbstractTestTools.createTempDir();
File testSrc = new File(testDir, "jack");
toolchain.addToClasspath(defaultBootClasspath)
diff --git a/jack-tests/tests/com/android/jack/imports/ImportTests.java b/jack-tests/tests/com/android/jack/imports/ImportTests.java
index fbcbd61..f7ced7e 100644
--- a/jack-tests/tests/com/android/jack/imports/ImportTests.java
+++ b/jack-tests/tests/com/android/jack/imports/ImportTests.java
@@ -70,7 +70,7 @@ public class ImportTests {
/* zipFiles = */ false,
AbstractTestTools.getTestRootDir("com.android.jack.fibonacci.test001.jack"));
- toolchain = AbstractTestTools.getCandidateToolchain();
+ toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
toolchain.addStaticLibs(jackOut);
ByteArrayOutputStream errOut = new ByteArrayOutputStream();