From 573e7f2eee923eb072f6bb4521027daa26f826f5 Mon Sep 17 00:00:00 2001
From: Ivan Gavrilovic <gavra@google.com>
Date: Fri, 20 Sep 2019 15:26:28 +0100
Subject: [PATCH] Run JDK11 tests for KAPT only if JDK11 is available

Otherwise, just skip running them.
---
 .../tests/org/jetbrains/kotlin/test/KotlinTestUtils.java      | 4 ++--
 .../test/org/jetbrains/kotlin/kapt3/test/java9TestUtils.kt    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java b/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java
index 203468b2f18..e795560119c 100644
--- a/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java
+++ b/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java
@@ -605,11 +605,11 @@ public class KotlinTestUtils {
         return new File(jdk9);
     }
 
-    @NotNull
+    @Nullable
     public static File getJdk11Home() {
         String jdk11 = System.getenv("JDK_11");
         if (jdk11 == null) {
-            throw new AssertionError("Environment variable JDK_11 is not set!");
+            return null;
         }
         return new File(jdk11);
     }
diff --git a/plugins/kapt3/kapt3-compiler/test/org/jetbrains/kotlin/kapt3/test/java9TestUtils.kt b/plugins/kapt3/kapt3-compiler/test/org/jetbrains/kotlin/kapt3/test/java9TestUtils.kt
index 9b4909f59de..8f1e45e1913 100644
--- a/plugins/kapt3/kapt3-compiler/test/org/jetbrains/kotlin/kapt3/test/java9TestUtils.kt
+++ b/plugins/kapt3/kapt3-compiler/test/org/jetbrains/kotlin/kapt3/test/java9TestUtils.kt
@@ -36,7 +36,7 @@ interface CustomJdkTestLauncher {
 
     fun doTestWithJdk11(mainClass: Class<*>, arg: String) {
         if (isJava9OrLater()) return
-        doTestCustomJdk(mainClass, arg, KotlinTestUtils.getJdk11Home())
+        KotlinTestUtils.getJdk11Home()?.let { doTestCustomJdk(mainClass, arg, it) }
     }
 
     private fun doTestCustomJdk(mainClass: Class<*>, arg: String, javaHome: File) {