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

Fix codegen tests on JDK 9 with jdkKind = FULL_JDK

Browse Source
This commit is contained in:
Alexander Udalov
2017-06-28 20:22:30 +03:00
parent 4bd9866975
commit 0f4684da67
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests-common/org/jetbrains/kotlin/test/KotlinTestUtils.java
+3
View File
@@ -506,6 +506,9 @@ public class KotlinTestUtils {
configuration.put(JVMConfigurationKeys.JDK_HOME, home); configuration.put(JVMConfigurationKeys.JDK_HOME, home);
} }
} }
else if (SystemInfo.IS_AT_LEAST_JAVA9) {
configuration.put(JVMConfigurationKeys.JDK_HOME, new File(System.getProperty("java.home")));
}
else { else {
JvmContentRootsKt.addJvmClasspathRoots(configuration, PathUtil.getJdkClassesRootsFromCurrentJre()); JvmContentRootsKt.addJvmClasspathRoots(configuration, PathUtil.getJdkClassesRootsFromCurrentJre());
} }