Don't check for jdk9 tests when running on jdk8 (#30626)
This commit is contained in:
parent
7b440dd15b
commit
0bd7d98d09
1 changed files with 11 additions and 4 deletions
|
|
@ -8,7 +8,7 @@ import sbt.Keys._
|
||||||
import sbt._
|
import sbt._
|
||||||
|
|
||||||
object TestExtras {
|
object TestExtras {
|
||||||
|
import JdkOptions.isJdk8
|
||||||
object Filter {
|
object Filter {
|
||||||
object Keys {
|
object Keys {
|
||||||
val excludeTestNames = settingKey[Set[String]](
|
val excludeTestNames = settingKey[Set[String]](
|
||||||
|
|
@ -54,11 +54,18 @@ object TestExtras {
|
||||||
def shouldExist(description: String, filename: String): Unit =
|
def shouldExist(description: String, filename: String): Unit =
|
||||||
require(file(filename).exists, s"$description should be run as part of the build")
|
require(file(filename).exists, s"$description should be run as part of the build")
|
||||||
|
|
||||||
|
val baseList =
|
||||||
List(
|
List(
|
||||||
"The java JavaExtension.java" -> "akka-actor-tests/target/test-reports/TEST-akka.actor.JavaExtension.xml",
|
"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 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")
|
"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)
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue