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

Run JDK11 tests for KAPT only if JDK11 is available

Browse Source 
Otherwise, just skip running them.
This commit is contained in:
Ivan Gavrilovic
2019-09-20 15:26:28 +01:00
committed by Yan Zhulanow
parent 6e7f046471
commit 573e7f2eee
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java
+2 -2
View File
@@ -605,11 +605,11 @@ public class KotlinTestUtils {
return new File(jdk9); return new File(jdk9);
} }
@NotNull @Nullable
public static File getJdk11Home() { public static File getJdk11Home() {
String jdk11 = System.getenv("JDK_11"); String jdk11 = System.getenv("JDK_11");
if (jdk11 == null) { if (jdk11 == null) {
throw new AssertionError("Environment variable JDK_11 is not set!"); return null;
} }
return new File(jdk11); return new File(jdk11);
} }
plugins/kapt3/kapt3-compiler/test/org/jetbrains/kotlin/kapt3/test/java9TestUtils.kt
+1 -1
View File
@@ -36,7 +36,7 @@ interface CustomJdkTestLauncher {
fun doTestWithJdk11(mainClass: Class<*>, arg: String) { fun doTestWithJdk11(mainClass: Class<*>, arg: String) {
if (isJava9OrLater()) return if (isJava9OrLater()) return
doTestCustomJdk(mainClass, arg, KotlinTestUtils.getJdk11Home()) KotlinTestUtils.getJdk11Home()?.let { doTestCustomJdk(mainClass, arg, it) }
} }
private fun doTestCustomJdk(mainClass: Class<*>, arg: String, javaHome: File) { private fun doTestCustomJdk(mainClass: Class<*>, arg: String, javaHome: File) {