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

Add JDK 17 test configuration

Browse Source
This commit is contained in:
Mikhael Bogdanov
2021-08-23 13:03:42 +02:00
parent 27ac7dbf9a
commit 92e94a4068
2 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests-different-jdk/build.gradle.kts
+10 -1
View File
@@ -85,7 +85,7 @@ codegenTest(target = 8, jdk = JdkMajorVersion.JDK_11)
codegenTest(target = 11, jdk = JdkMajorVersion.JDK_11)
//JDK 15
//JDK 15 (TODO: remove)
codegenTest(target = 6, jdk = JdkMajorVersion.JDK_15)
codegenTest(target = 8, jdk = JdkMajorVersion.JDK_15)
@@ -94,6 +94,15 @@ codegenTest(target = 15, jdk = JdkMajorVersion.JDK_15) {
systemProperty("kotlin.test.box.d8.disable", true)
}
//JDK 17
codegenTest(target = 6, jdk = JdkMajorVersion.JDK_17)
codegenTest(target = 8, jdk = JdkMajorVersion.JDK_17)
codegenTest(target = 17, jdk = JdkMajorVersion.JDK_17) {
systemProperty("kotlin.test.box.d8.disable", true)
}
//..also add this two tasks to build after adding fresh jdks to build agents
val mostRecentJdk = JdkMajorVersion.values().last()
compiler/tests-different-jdk/tests/org/jetbrains/kotlin/codegen/jdk/CustomJvmTargetOnJvmBaseTest.kt
+10
View File
@@ -66,6 +66,16 @@ class JvmTarget8OnJvm15 : CustomJvmTargetOnJvmBaseTest()
@RunWith(JUnitPlatform::class)
class JvmTarget15OnJvm15 : CustomJvmTargetOnJvmBaseTest()
@RunWith(JUnitPlatform::class)
class JvmTarget6OnJvm17 : CustomJvmTargetOnJvmBaseTest()
@RunWith(JUnitPlatform::class)
class JvmTarget8OnJvm17 : CustomJvmTargetOnJvmBaseTest()
@RunWith(JUnitPlatform::class)
class JvmTarget17OnJvm17 : CustomJvmTargetOnJvmBaseTest()
// LAST JDK from JdkMajorVersion available on machine
@RunWith(JUnitPlatform::class)
class JvmTarget6OnJvmLast : CustomJvmTargetOnJvmBaseTest()