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

Migrate all JDK 15 related tests to JDK 17

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2021-09-22 17:07:59 +03:00
committed by TeamCityServer
parent 452dfd6edd
commit ce3562f0e8
68 changed files with 477 additions and 553 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/test-infrastructure-utils/tests/org/jetbrains/kotlin/test/TestJdkKind.kt
+2 -5
View File
@@ -29,13 +29,10 @@ enum class TestJdkKind(val requiresSeparateProcess: Boolean = false) {
// JDK found at $JDK_9
FULL_JDK_9(requiresSeparateProcess = true),
// JDK found at $JDK_15
// JDK found at $JDK_11
FULL_JDK_11(requiresSeparateProcess = true),
// JDK found at $JDK_15
FULL_JDK_15(requiresSeparateProcess = true),
// JDK found at $JDK_15
// JDK found at $JDK_17
FULL_JDK_17(requiresSeparateProcess = true),
// JDK found at java.home
compiler/test-infrastructure-utils/tests/org/jetbrains/kotlin/test/util/KtTestUtil.java
-5
View File
@@ -150,11 +150,6 @@ public class KtTestUtil {
return getJdkHome("JDK_11");
}
@NotNull
public static File getJdk15Home() {
return getJdkHome("JDK_15", "JDK_15_0");
}
@NotNull
public static File getJdk17Home() {
return getJdkHome("JDK_17_0", "JDK_17");