From 0bd7d98d092ebaed86096dae86488b2e02b67e14 Mon Sep 17 00:00:00 2001
From: Renato Cavalcanti <renato@cavalcanti.be>
Date: Fri, 3 Sep 2021 13:13:13 +0200
Subject: [PATCH] Don't check for jdk9 tests when running on jdk8 (#30626)

---
 project/TestExtras.scala | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/project/TestExtras.scala b/project/TestExtras.scala
index a18ba4f745..fa1c645c9a 100644
--- a/project/TestExtras.scala
+++ b/project/TestExtras.scala
@@ -8,7 +8,7 @@ import sbt.Keys._
 import sbt._
 
 object TestExtras {
-
+  import JdkOptions.isJdk8
   object Filter {
     object Keys {
       val excludeTestNames = settingKey[Set[String]](
@@ -54,11 +54,18 @@ object TestExtras {
           def shouldExist(description: String, filename: String): Unit =
             require(file(filename).exists, s"$description should be run as part of the build")
 
-          List(
-            "The java JavaExtension.java" -> "akka-actor-tests/target/test-reports/TEST-akka.actor.JavaExtension.xml",
+          val baseList =
+            List(
+              "The java JavaExtension.java" -> "akka-actor-tests/target/test-reports/TEST-akka.actor.JavaExtension.xml")
+          val jdk9Only = List(
             "The jdk9-only FlowPublisherSinkSpec.scala" -> "akka-stream-tests/target/test-reports/TEST-akka.stream.scaladsl.FlowPublisherSinkSpec.xml",
             "The jdk9-only JavaFlowSupportCompileTest.java" -> "akka-stream-tests/target/test-reports/TEST-akka.stream.javadsl.JavaFlowSupportCompileTest.xml")
-            .foreach((shouldExist _).tupled)
+
+          val testsToCheck =
+            if (isJdk8) baseList
+            else baseList ::: jdk9Only
+
+          testsToCheck.foreach((shouldExist _).tupled)
         })
     }