From f76c0568ea2ae305d576e689b3bf61f6e30d4ac5 Mon Sep 17 00:00:00 2001
From: Ilya Gorbunov <ilya.gorbunov@jetbrains.com>
Date: Wed, 14 Nov 2018 20:48:29 +0300
Subject: [PATCH] Additionally run kotlin-stdlib-jdk8 tests on jdk9 and
 jdk10/11 if available

---
 libraries/stdlib/jdk8/build.gradle | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/libraries/stdlib/jdk8/build.gradle b/libraries/stdlib/jdk8/build.gradle
index a875a8ce3cf..549c9069145 100644
--- a/libraries/stdlib/jdk8/build.gradle
+++ b/libraries/stdlib/jdk8/build.gradle
@@ -93,8 +93,9 @@ test {
     executable = "$JDK_18/bin/java"
 }
 
-task testJdk6Tests(type: Test) {
+task testJdk6Tests(type: Test) { thisTask ->
     dependsOn(':kotlin-stdlib:testClasses')
+    check.dependsOn(thisTask)
     group = "verification"
 
     executable = "$JDK_18/bin/java"
@@ -108,4 +109,13 @@ task testJdk6Tests(type: Test) {
     }
 }
 
-check.dependsOn testJdk6Tests
+
+[9, 10, 11].forEach { v ->
+    task(type: Test, "jdk${v}Test") { thisTask ->
+        check.dependsOn(thisTask)
+        group = "verification"
+        executable = "${project.property("JDK_$v")}/bin/java"
+        if (v > 9)
+            enabled(file(executable).parentFile.isDirectory())
+    }
+}