diff options
| author | Jean-Marie Henaff <jmhenaff@google.com> | 2015-01-16 17:37:51 +0100 |
|---|---|---|
| committer | Jean-Marie Henaff <jmhenaff@google.com> | 2015-02-18 11:40:13 +0100 |
| commit | 00ed782574b3de6f2926ebaf540778be7c3008f2 (patch) | |
| tree | 6c51d92346502f313e6338214714b4c5b797ed29 /jack-tests/tests/com/android/jack/fileconflict/FileConflictTests.java | |
| parent | b9298649de45a68fbd449cdf7e13968bdaea0e30 (diff) | |
| download | toolchain_jack-00ed782574b3de6f2926ebaf540778be7c3008f2.tar.gz toolchain_jack-00ed782574b3de6f2926ebaf540778be7c3008f2.tar.bz2 toolchain_jack-00ed782574b3de6f2926ebaf540778be7c3008f2.zip | |
Fix LegacyJillToolchain in jack-tests
Change-Id: Ib9d9f88e1edc231be58125bca9ac71b7af88990f
Diffstat (limited to 'jack-tests/tests/com/android/jack/fileconflict/FileConflictTests.java')
| -rw-r--r-- | jack-tests/tests/com/android/jack/fileconflict/FileConflictTests.java | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/jack-tests/tests/com/android/jack/fileconflict/FileConflictTests.java b/jack-tests/tests/com/android/jack/fileconflict/FileConflictTests.java index 2a7d8701..20ef80ee 100644 --- a/jack-tests/tests/com/android/jack/fileconflict/FileConflictTests.java +++ b/jack-tests/tests/com/android/jack/fileconflict/FileConflictTests.java @@ -16,6 +16,7 @@ package com.android.jack.fileconflict; + import com.android.jack.backend.jayce.ImportConflictException; import com.android.jack.backend.jayce.JayceFileImporter; import com.android.jack.library.FileType; @@ -264,7 +265,10 @@ public class FileConflictTests { File testSrcDir = AbstractTestTools.getTestRootDir("com.android.jack.fileconflict.test003"); File tempJackFolder = AbstractTestTools.createTempDir(); - JackBasedToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackBasedToolchain.class); + List<Class<? extends IToolchain>> exclude = new ArrayList<Class<? extends IToolchain>>(); + exclude.add(LegacyJillToolchain.class); + JackBasedToolchain toolchain = + AbstractTestTools.getCandidateToolchain(JackBasedToolchain.class, exclude); toolchain.addToClasspath(toolchain.getDefaultBootClasspath()) .srcToLib( tempJackFolder, @@ -297,7 +301,7 @@ public class FileConflictTests { copyFileToDir(myClass1, jackFilePath, jackOutput); copyFileToDir(myClass1Dex, dexFilePath, jackOutput); - toolchain = AbstractTestTools.getCandidateToolchain(JackBasedToolchain.class); + toolchain = AbstractTestTools.getCandidateToolchain(JackBasedToolchain.class, exclude); toolchain.addProguardFlags(new File(testSrcDir, "proguard.flags")); toolchain.libToLib(jackImport1, jackOutput, false); } @@ -315,7 +319,8 @@ public class FileConflictTests { // compile source files to a Jack dir File testSrcDir = AbstractTestTools.getTestRootDir("com.android.jack.fileconflict.test003.jack"); File tempJackFolder = AbstractTestTools.createTempDir(); - JackBasedToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackBasedToolchain.class); + JackBasedToolchain toolchain = + AbstractTestTools.getCandidateToolchain(JackBasedToolchain.class); toolchain.addToClasspath(toolchain.getDefaultBootClasspath()) .srcToLib( tempJackFolder, |