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

Add diagnostic tests against Java 9

Browse Source 
These tests currently won't run if you don't have environment variable
JDK_9 set up
This commit is contained in:
Alexander Udalov
2017-04-20 17:37:11 +03:00
parent 7f5d87ea17
commit a519ab681a
7 changed files with 133 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests-common/org/jetbrains/kotlin/test/KotlinTestUtils.java
+15 -7
View File
@@ -459,7 +459,18 @@ public class KotlinTestUtils {
JvmContentRootsKt.addJvmClasspathRoot(configuration, findAndroidApiJar());
}
else if (jdkKind == TestJdkKind.FULL_JDK_6) {
JvmContentRootsKt.addJvmClasspathRoots(configuration, PathUtil.getJdkClassesRootsFromJre(getJre6Home()));
String jdk6 = System.getenv("JDK_16");
assert jdk6 != null : "Environment variable JDK_16 is not set";
JvmContentRootsKt.addJvmClasspathRoots(configuration, PathUtil.getJdkClassesRootsFromJre(getJreHome(jdk6)));
}
else if (jdkKind == TestJdkKind.FULL_JDK_9) {
String jdk9 = System.getenv("JDK_9");
if (jdk9 != null) {
JvmContentRootsKt.addJvmClasspathRoots(configuration, PathUtil.getJdkClassesRootsFromJre(getJreHome(jdk9)));
}
else {
System.err.println("Environment variable JDK_9 is not set, the test will be skipped");
}
}
else {
JvmContentRootsKt.addJvmClasspathRoots(configuration, PathUtil.getJdkClassesRootsFromCurrentJre());
@@ -484,12 +495,9 @@ public class KotlinTestUtils {
}
@NotNull
private static String getJre6Home() {
String home = System.getenv("JDK_16");
if (home == null) throw new AssertionError("Environment variable JDK_16 is not set");
File jre = new File(home, "jre");
return jre.isDirectory() ? jre.getPath() : home;
private static String getJreHome(@NotNull String jdkHome) {
File jre = new File(jdkHome, "jre");
return jre.isDirectory() ? jre.getPath() : jdkHome;
}
public static void resolveAllKotlinFiles(KotlinCoreEnvironment environment) throws IOException {
compiler/tests-common/org/jetbrains/kotlin/test/TestJdkKind.java
+2
View File
@@ -23,6 +23,8 @@ public enum TestJdkKind {
MODIFIED_MOCK_JDK,
// JDK found at $JDK_16
FULL_JDK_6,
// JDK found at $JDK_9
FULL_JDK_9,
// JDK found at java.home
FULL_JDK,
ANDROID_API,