Update KGP test-suite plugin setup
This ensures compatibility with changes in test-suite plugin new versions.
This commit is contained in:
committed by
Space Team
parent
6f8422eab3
commit
4de3a62680
@@ -213,7 +213,52 @@ if (!kotlinBuildProperties.isInJpsBuildIdeaSync) {
|
||||
|
||||
testing {
|
||||
suites {
|
||||
val functionalTest by registering(JvmTestSuite::class) {
|
||||
val functionalTest by registering(JvmTestSuite::class)
|
||||
|
||||
val functionalRegressionTest by registering(JvmTestSuite::class) {
|
||||
sources {
|
||||
java {
|
||||
setSrcDirs(listOf("src/functionalTest/kotlin"))
|
||||
}
|
||||
}
|
||||
|
||||
targets.all {
|
||||
testTask.configure {
|
||||
include("**/org/jetbrains/kotlin/gradle/regressionTests/**")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
val functionalDependencyResolutionTest by registering(JvmTestSuite::class) {
|
||||
sources {
|
||||
java {
|
||||
setSrcDirs(listOf("src/functionalTest/kotlin"))
|
||||
}
|
||||
}
|
||||
|
||||
targets.all {
|
||||
testTask.configure {
|
||||
include("**/org/jetbrains/kotlin/gradle/dependencyResolutionTests/**")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
val functionalUnitTest by registering(JvmTestSuite::class) {
|
||||
sources {
|
||||
java {
|
||||
setSrcDirs(listOf("src/functionalTest/kotlin"))
|
||||
}
|
||||
}
|
||||
|
||||
targets.all {
|
||||
testTask.configure {
|
||||
include("**/org/jetbrains/kotlin/gradle/unitTests/**")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
withType<JvmTestSuite>().configureEach {
|
||||
if (name == "test") return@configureEach
|
||||
useJUnit()
|
||||
|
||||
dependencies {
|
||||
@@ -242,24 +287,6 @@ if (!kotlinBuildProperties.isInJpsBuildIdeaSync) {
|
||||
extendsFrom(configurations.getByName(testSourceSet.runtimeOnlyConfigurationName))
|
||||
}
|
||||
|
||||
targets.create("functionalRegressionTest") {
|
||||
testTask.configure {
|
||||
include("**/org/jetbrains/kotlin/gradle/regressionTests/**")
|
||||
}
|
||||
}
|
||||
|
||||
targets.create("functionalDependencyResolutionTest") {
|
||||
testTask.configure {
|
||||
include("**/org/jetbrains/kotlin/gradle/dependencyResolutionTests/**")
|
||||
}
|
||||
}
|
||||
|
||||
targets.create("functionalUnitTest") {
|
||||
testTask.configure {
|
||||
include("**/org/jetbrains/kotlin/gradle/unitTests/**")
|
||||
}
|
||||
}
|
||||
|
||||
targets.all {
|
||||
testTask.configure {
|
||||
dependsOnKotlinGradlePluginInstall()
|
||||
|
||||
Reference in New Issue
Block a user