summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Philippe Lesot <jplesot@google.com>2015-06-18 18:48:34 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2015-06-18 18:48:34 +0000
commit78b4084303943d7577cdba13e169fa853dcfe8b1 (patch)
tree720fd4bf9cc6badefb5ab2876a0c3128e540ddc8
parentc800defbffa7c5c0db769839c8e74e4485935b48 (diff)
parent8358e133b7519fc77f514fc2ebdb9533b41a6d3e (diff)
downloadtoolchain_jack-78b4084303943d7577cdba13e169fa853dcfe8b1.tar.gz
toolchain_jack-78b4084303943d7577cdba13e169fa853dcfe8b1.tar.bz2
toolchain_jack-78b4084303943d7577cdba13e169fa853dcfe8b1.zip
Merge "Exclude a Phantom test from Jill toolchain" into ub-jack-brest
-rw-r--r--jack-tests/tests/com/android/jack/withphantom/WithPhantomTests.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/jack-tests/tests/com/android/jack/withphantom/WithPhantomTests.java b/jack-tests/tests/com/android/jack/withphantom/WithPhantomTests.java
index 368e2abc..554d7860 100644
--- a/jack-tests/tests/com/android/jack/withphantom/WithPhantomTests.java
+++ b/jack-tests/tests/com/android/jack/withphantom/WithPhantomTests.java
@@ -157,8 +157,10 @@ public class WithPhantomTests {
@Test
public void testPhantomLocal() throws Exception {
File tempJackFolder = AbstractTestTools.createTempDir();
+ List<Class<? extends IToolchain>> exclude = new ArrayList<Class<? extends IToolchain>>();
+ exclude.add(LegacyJillToolchain.class);
JackBasedToolchain toolchain =
- AbstractTestTools.getCandidateToolchain(JackBasedToolchain.class);
+ AbstractTestTools.getCandidateToolchain(JackBasedToolchain.class, exclude);
toolchain.addToClasspath(toolchain.getDefaultBootClasspath())
.srcToLib(
tempJackFolder,