From c25d243111a1692a5031f1e78f162e5a06937c6c Mon Sep 17 00:00:00 2001
From: Yahor Berdnikau <yahor.berdnikau@jetbrains.com>
Date: Fri, 29 Oct 2021 17:29:22 +0200
Subject: [PATCH] Add 'kgpOtherTests' task.

This will run tests for all support plugins, such kapt, allopen, etc...

^KT-45745 In Progress
---
 .../Readme.md                                     |  1 +
 .../build.gradle.kts                              | 15 +++++++++++++--
 .../jetbrains/kotlin/gradle/testbase/testTags.kt  |  7 ++++++-
 3 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/Readme.md b/libraries/tools/kotlin-gradle-plugin-integration-tests/Readme.md
index 0d37b1de147..cc8009f4547 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/Readme.md
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/Readme.md
@@ -11,6 +11,7 @@ More fine-grained test tasks exist covering different parts of Gradle plugins:
 - `kgpJvmTests` - runs all tests for Kotlin Gradle Plugin/Jvm platform (parallel execution)
 - `kgpJsTests` - runs all tests for Kotlin Gradle Plugin/Js platform (parallel execution)
 - `kgpDaemonTests` - runs all tests for Gradle and Kotlin daemons (sequential execution)
+- `kgpOtherTests` - run all tests for support Gradle plugins, such as kapt, allopen, etc (parallel execution)
 - `kgpAllParallelTests` - run all tests for all platforms except daemons tests (parallel execution)
 
 Also, few deprecated tasks still exist until all tests will be migrated to the new setup:
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 98e3f9ca22f..cd722365c30 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts
@@ -223,9 +223,19 @@ val daemonsTestsTask = tasks.register<Test>("kgpDaemonTests") {
     }
 }
 
+val otherPluginsTestTask = tasks.register<Test>("kgpOtherTests") {
+    group = KGP_TEST_TASKS_GROUP
+    description = "Run tests for all support plugins, such as kapt, allopen, etc"
+    maxParallelForks = maxParallelTestForks
+    useJUnitPlatform {
+        includeTags("OtherKGP")
+        includeEngines("junit-jupiter")
+    }
+}
+
 tasks.named<Task>("check") {
     dependsOn("testAdvanceGradleVersion")
-    dependsOn(simpleTestsTask, jvmTestsTask, jsTestsTask, daemonsTestsTask)
+    dependsOn(simpleTestsTask, jvmTestsTask, jsTestsTask, daemonsTestsTask, otherPluginsTestTask)
     if (isTeamcityBuild) {
         dependsOn("testAdvanceGradleVersionMppAndAndroid")
         dependsOn("testMppAndAndroid")
@@ -274,7 +284,8 @@ tasks.withType<Test> {
         simpleTestsTask.name,
         jvmTestsTask.name,
         jsTestsTask.name,
-        daemonsTestsTask.name
+        daemonsTestsTask.name,
+        otherPluginsTestTask.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 82dd995c6ef..f382368a42d 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
@@ -37,4 +37,9 @@ annotation class JvmGradlePluginTests
 @Target(AnnotationTarget.CLASS, AnnotationTarget.ANNOTATION_CLASS, AnnotationTarget.FUNCTION)
 @Retention(AnnotationRetention.RUNTIME)
 @Tag("JsKGP")
-annotation class JsGradlePluginTests
\ No newline at end of file
+annotation class JsGradlePluginTests
+
+@Target(AnnotationTarget.CLASS, AnnotationTarget.ANNOTATION_CLASS, AnnotationTarget.FUNCTION)
+@Retention(AnnotationRetention.RUNTIME)
+@Tag("OtherKGP")
+annotation class OtherGradlePluginTests