diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts index d10b44980e6..9f53e1ffad4 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts @@ -246,9 +246,21 @@ val otherPluginsTestTask = tasks.register("kgpOtherTests") { if (isTeamcityBuild) finalizedBy(cleanTestKitCacheTask) } +val mppTestsTask = tasks.register("kgpMppTests") { + group = KGP_TEST_TASKS_GROUP + description = "Run Multiplatform Kotlin Gradle plugin tests" + maxParallelForks = maxParallelTestForks + useJUnitPlatform { + includeTags("MppKGP") + includeEngines("junit-jupiter") + } + + if (isTeamcityBuild) finalizedBy(cleanTestKitCacheTask) +} + tasks.named("check") { dependsOn("testAdvanceGradleVersion") - dependsOn(simpleTestsTask, jvmTestsTask, jsTestsTask, daemonsTestsTask, otherPluginsTestTask) + dependsOn(simpleTestsTask, jvmTestsTask, jsTestsTask, daemonsTestsTask, otherPluginsTestTask, mppTestsTask) if (isTeamcityBuild) { dependsOn("testAdvanceGradleVersionMppAndAndroid") dependsOn("testMppAndAndroid") @@ -301,7 +313,8 @@ tasks.withType { jvmTestsTask.name, jsTestsTask.name, daemonsTestsTask.name, - otherPluginsTestTask.name + otherPluginsTestTask.name, + mppTestsTask.name ) if (shouldApplyJunitPlatform) { maxHeapSize = "512m" diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/testTags.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/testTags.kt index f382368a42d..bd3420295eb 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/testTags.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/testTags.kt @@ -39,6 +39,14 @@ annotation class JvmGradlePluginTests @Tag("JsKGP") annotation class JsGradlePluginTests +/** + * Add it to tests covering Kotlin Multiplatform Gradle plugin. + */ +@Target(AnnotationTarget.CLASS, AnnotationTarget.ANNOTATION_CLASS, AnnotationTarget.FUNCTION) +@Retention(AnnotationRetention.RUNTIME) +@Tag("MppKGP") +annotation class MppGradlePluginTests + @Target(AnnotationTarget.CLASS, AnnotationTarget.ANNOTATION_CLASS, AnnotationTarget.FUNCTION) @Retention(AnnotationRetention.RUNTIME) @Tag("OtherKGP")