From c448def95fcc885921655f6971c8753c3aff54ec Mon Sep 17 00:00:00 2001
From: Mikhael Bogdanov <mikhael.bogdanov@jetbrains.com>
Date: Wed, 15 May 2019 10:01:17 +0200
Subject: [PATCH] Add custom JDK tests on recent JDK avaliable in project

---
 compiler/tests-different-jdk/build.gradle.kts | 24 ++++++++++++-------
 .../jdk/CustomJvmTargetOnJvmBaseTest.kt       |  8 ++++++-
 2 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/compiler/tests-different-jdk/build.gradle.kts b/compiler/tests-different-jdk/build.gradle.kts
index 431cf3f0c20..8cd5aeea125 100644
--- a/compiler/tests-different-jdk/build.gradle.kts
+++ b/compiler/tests-different-jdk/build.gradle.kts
@@ -22,9 +22,18 @@ sourceSets {
     "test" { projectDefault() }
 }
 
-fun Project.codegenTest(target: Int, jvm: Int,
-                        jdk: String = "JDK_${if (jvm <= 8) "1" else ""}$jvm",
-                        body: Test.() -> Unit): Test = projectTest("codegenTarget${target}Jvm${jvm}Test") {
+fun Project.codegenTest(
+    target: Int, jvm: Int,
+    jdk: String = "JDK_${if (jvm <= 8) "1" else ""}$jvm",
+    body: Test.() -> Unit
+) {
+    codegenTest(target, jvm.toString(), jdk, body = body)
+}
+
+fun Project.codegenTest(
+    target: Int, jvm: String, jdk: String,
+    body: Test.() -> Unit
+): Test = projectTest("codegenTarget${target}Jvm${jvm}Test") {
     dependsOn(":dist")
     workingDir = rootDir
 
@@ -67,15 +76,14 @@ codegenTest(target = 9, jvm = 9) {
     systemProperty("kotlin.test.substitute.bytecode.1.8.to.1.9", "true")
 }
 
-codegenTest(target = 10, jvm = 10) {
-    systemProperty("kotlin.test.default.jvm.target", "1.8")
-    systemProperty("kotlin.test.substitute.bytecode.1.8.to.10", "true")
+codegenTest(target = 6, jvm = "Last", jdk = JdkMajorVersion.values().last().name) {
+    systemProperty("kotlin.test.default.jvm.target", "1.6")
+    jvmArgs!!.add( "-XX:-FailOverToOldVerifier")
 }
 
-codegenTest(target = 8, jvm = 11) {
+codegenTest(target = 8, jvm = "Last", jdk = JdkMajorVersion.values().last().name) {
     systemProperty("kotlin.test.default.jvm.target", "1.8")
     jvmArgs!!.add( "-XX:-FailOverToOldVerifier")
 }
 
-
 testsJar()
diff --git a/compiler/tests-different-jdk/tests/org/jetbrains/kotlin/codegen/jdk/CustomJvmTargetOnJvmBaseTest.kt b/compiler/tests-different-jdk/tests/org/jetbrains/kotlin/codegen/jdk/CustomJvmTargetOnJvmBaseTest.kt
index 49c5dd629e4..004ef7ab050 100644
--- a/compiler/tests-different-jdk/tests/org/jetbrains/kotlin/codegen/jdk/CustomJvmTargetOnJvmBaseTest.kt
+++ b/compiler/tests-different-jdk/tests/org/jetbrains/kotlin/codegen/jdk/CustomJvmTargetOnJvmBaseTest.kt
@@ -88,4 +88,10 @@ class JvmTarget6OnJvm9 : CustomJvmTargetOnJvmBaseTest()
 class JvmTarget8OnJvm9 : CustomJvmTargetOnJvmBaseTest()
 
 @RunWith(SuiteRunnerForCustomJdk::class)
-class JvmTarget9OnJvm9 : CustomJvmTargetOnJvmBaseTest()
\ No newline at end of file
+class JvmTarget9OnJvm9 : CustomJvmTargetOnJvmBaseTest()
+
+@RunWith(SuiteRunnerForCustomJdk::class)
+class JvmTarget6OnJvmLast : CustomJvmTargetOnJvmBaseTest()
+
+@RunWith(SuiteRunnerForCustomJdk::class)
+class JvmTarget8OnJvmLast : CustomJvmTargetOnJvmBaseTest()
\ No newline at end of file