From f399f013dd7338f56ef6fedd897b37eaaba4795f Mon Sep 17 00:00:00 2001 From: "Denis.Zharkov" Date: Fri, 4 Dec 2020 19:47:21 +0300 Subject: [PATCH] Temporary add another env variable JDK_15_0 that is set on TC agents --- .../tests/org/jetbrains/kotlin/test/KotlinTestUtils.java | 5 +++++ 1 file changed, 5 insertions(+) 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 56267d438cc..5d99a01c596 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java @@ -414,6 +414,11 @@ public class KotlinTestUtils { @NotNull public static File getJdk15Home() { String jdk15 = System.getenv("JDK_15"); + + if (jdk15 == null) { + jdk15 = System.getenv("JDK_15_0"); + } + if (jdk15 == null) { throw new AssertionError("Environment variable JDK_15 is not set!"); }