azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Android codegen tests: use full JDK only when needed

Browse Source 
This was accidentally broken in 8a00cabce6
This commit is contained in:
Alexander Udalov
2016-05-24 17:44:41 +03:00
parent 85200e1f8a
commit 7fd2a016e7
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidGenerator.java
+3 -3
View File
@@ -155,9 +155,9 @@ public class CodegenTestsOnAndroidGenerator extends UsefulTestCase {
private KotlinCoreEnvironment createEnvironment(boolean isFullJdkAndRuntime) { private KotlinCoreEnvironment createEnvironment(boolean isFullJdkAndRuntime) {
ConfigurationKind configurationKind = isFullJdkAndRuntime ? ConfigurationKind.ALL : ConfigurationKind.JDK_ONLY; ConfigurationKind configurationKind = isFullJdkAndRuntime ? ConfigurationKind.ALL : ConfigurationKind.JDK_ONLY;
CompilerConfiguration configuration = KotlinTestUtils.compilerConfigurationForTests( TestJdkKind testJdkKind = isFullJdkAndRuntime ? TestJdkKind.FULL_JDK : TestJdkKind.MOCK_JDK;
configurationKind, TestJdkKind.FULL_JDK, KotlinTestUtils.getAnnotationsJar() CompilerConfiguration configuration =
); KotlinTestUtils.compilerConfigurationForTests(configurationKind, testJdkKind, KotlinTestUtils.getAnnotationsJar());
configuration.put(JVMConfigurationKeys.MODULE_NAME, "android-module-" + MODULE_INDEX++); configuration.put(JVMConfigurationKeys.MODULE_NAME, "android-module-" + MODULE_INDEX++);
if (inheritMultifileParts) { if (inheritMultifileParts) {
configuration.put(JVMConfigurationKeys.INHERIT_MULTIFILE_PARTS, true); configuration.put(JVMConfigurationKeys.INHERIT_MULTIFILE_PARTS, true);