summaryrefslogtreecommitdiffstats
path: root/jack-tests
diff options
context:
space:
mode:
authorJean-Philippe Lesot <jplesot@google.com>2015-04-09 08:47:51 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2015-04-09 08:47:52 +0000
commit0606fc100cbbb528f9be74365c3a31a7db3a31cf (patch)
treeb64c595bbd7907cd303c8a4d43d1c4f86801c54e /jack-tests
parent89aebb8ad5f81b7c6b500e09a22da53b0bfd70d8 (diff)
parentabd83e25ba3ec9155bd208710e3f974fb1480187 (diff)
downloadtoolchain_jack-0606fc100cbbb528f9be74365c3a31a7db3a31cf.zip
toolchain_jack-0606fc100cbbb528f9be74365c3a31a7db3a31cf.tar.gz
toolchain_jack-0606fc100cbbb528f9be74365c3a31a7db3a31cf.tar.bz2
Merge "Avoid ClassCastException when toolchain jack-cli is used" into ub-jack
Diffstat (limited to 'jack-tests')
-rw-r--r--jack-tests/tests/com/android/jack/classpath/ClasspathTests.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/jack-tests/tests/com/android/jack/classpath/ClasspathTests.java b/jack-tests/tests/com/android/jack/classpath/ClasspathTests.java
index 9eec59e..37d1127 100644
--- a/jack-tests/tests/com/android/jack/classpath/ClasspathTests.java
+++ b/jack-tests/tests/com/android/jack/classpath/ClasspathTests.java
@@ -162,7 +162,7 @@ public class ClasspathTests {
@Test
public void testMissingClasspathEntry() throws Exception {
- JackApiToolchainBase toolchain = AbstractTestTools.getCandidateToolchain();
+ IToolchain toolchain = AbstractTestTools.getCandidateToolchain();
File srcDir = AbstractTestTools.getTestRootDir("com.android.jack.classpath.test004.jack");
File testOut = AbstractTestTools.createTempFile("ClasspathTest", "missing");
ByteArrayOutputStream errOut = new ByteArrayOutputStream();