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

Minor. Updated used JDKs in test for different JDKs

Browse Source
This commit is contained in:
Mikhail Bogdanov
2020-04-07 09:04:16 +02:00
parent 4d219d1eed
commit f966ce2431
2 changed files with 25 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests-different-jdk/build.gradle.kts
+11 -2
View File
@@ -63,14 +63,23 @@ codegenTest(target = 6, jvm = 6, jdk = "JDK_18") {
} }
} }
codegenTest(target = 6, jvm = 9) {}
codegenTest(target = 8, jvm = 8) {} codegenTest(target = 8, jvm = 8) {}
// Switch TC builds to...
codegenTest(target = 6, jvm = 11) {}
codegenTest(target = 8, jvm = 11) {}
codegenTest(target = 11, jvm = 11) {}
//...and delete old tasks..
codegenTest(target = 6, jvm = 9) {}
codegenTest(target = 8, jvm = 9) {} codegenTest(target = 8, jvm = 9) {}
codegenTest(target = 9, jvm = 9) {} codegenTest(target = 9, jvm = 9) {}
//..also add this two tasks to build after adding fresh jdks to build agents
val mostRecentJdk = JdkMajorVersion.values().last().name val mostRecentJdk = JdkMajorVersion.values().last().name
codegenTest(target = 6, jvm = "Last", jdk = mostRecentJdk) { codegenTest(target = 6, jvm = "Last", jdk = mostRecentJdk) {
compiler/tests-different-jdk/tests/org/jetbrains/kotlin/codegen/jdk/CustomJvmTargetOnJvmBaseTest.kt
+14 -3
View File
@@ -81,13 +81,13 @@ class JvmTarget6OnJvm6 : CustomJvmTargetOnJvmBaseTest() {
class JvmTarget8OnJvm8 : CustomJvmTargetOnJvmBaseTest() class JvmTarget8OnJvm8 : CustomJvmTargetOnJvmBaseTest()
@RunWith(SuiteRunnerForCustomJdk::class) @RunWith(SuiteRunnerForCustomJdk::class)
class JvmTarget6OnJvm9 : CustomJvmTargetOnJvmBaseTest() class JvmTarget6OnJvm11 : CustomJvmTargetOnJvmBaseTest()
@RunWith(SuiteRunnerForCustomJdk::class) @RunWith(SuiteRunnerForCustomJdk::class)
class JvmTarget8OnJvm9 : CustomJvmTargetOnJvmBaseTest() class JvmTarget8OnJvm11 : CustomJvmTargetOnJvmBaseTest()
@RunWith(SuiteRunnerForCustomJdk::class) @RunWith(SuiteRunnerForCustomJdk::class)
class JvmTarget9OnJvm9 : CustomJvmTargetOnJvmBaseTest() class JvmTarget11OnJvm11 : CustomJvmTargetOnJvmBaseTest()
@RunWith(SuiteRunnerForCustomJdk::class) @RunWith(SuiteRunnerForCustomJdk::class)
class JvmTarget6OnJvmLast : CustomJvmTargetOnJvmBaseTest() class JvmTarget6OnJvmLast : CustomJvmTargetOnJvmBaseTest()
@@ -97,3 +97,14 @@ class JvmTarget8OnJvmLast : CustomJvmTargetOnJvmBaseTest()
@RunWith(SuiteRunnerForCustomJdk::class) @RunWith(SuiteRunnerForCustomJdk::class)
class JvmTargetLastOnJvmLast : CustomJvmTargetOnJvmBaseTest() class JvmTargetLastOnJvmLast : CustomJvmTargetOnJvmBaseTest()
//TODO: delete old tasks
@RunWith(SuiteRunnerForCustomJdk::class)
class JvmTarget6OnJvm9 : CustomJvmTargetOnJvmBaseTest()
@RunWith(SuiteRunnerForCustomJdk::class)
class JvmTarget8OnJvm9 : CustomJvmTargetOnJvmBaseTest()
@RunWith(SuiteRunnerForCustomJdk::class)
class JvmTarget9OnJvm9 : CustomJvmTargetOnJvmBaseTest()