From b9018e88887bf5d2b1540cb329ffae7ce71402b5 Mon Sep 17 00:00:00 2001
From: "sebastian.sellmair" <sebastian.sellmair@jetbrains.com>
Date: Tue, 18 May 2021 09:10:36 +0200
Subject: [PATCH] [Gradle] :kotlin-gradle-plugin-integration-tests: Add
 'includeTestsWithPattern' util function

^KT-45302
---
 .../build.gradle.kts                          | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

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 0d940e5e3fb..4669ded0e4e 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts
@@ -70,24 +70,21 @@ val cleanTestKitCacheTask = tasks.register<Delete>("cleanTestKitCache") {
     delete(project.file(".testKitDir"))
 }
 
-fun Test.includeMppAndAndroid(include: Boolean) {
-    if (isTeamcityBuild) {
-        val mppAndAndroidTestPatterns = listOf("*Multiplatform*", "*Mpp*", "*Android*")
-        val filter = if (include)
-            filter.includePatterns
-        else
-            filter.excludePatterns
-        filter.addAll(mppAndAndroidTestPatterns)
-    }
+fun Test.includeMppAndAndroid(include: Boolean) = includeTestsWithPattern(include) {
+    addAll(listOf("*Multiplatform*", "*Mpp*", "*Android*"))
 }
 
-fun Test.includeNative(include: Boolean) {
+fun Test.includeNative(include: Boolean) = includeTestsWithPattern(include) {
+    add("org.jetbrains.kotlin.gradle.native.*")
+}
+
+fun Test.includeTestsWithPattern(include: Boolean, patterns: (MutableSet<String>).() -> Unit) {
     if (isTeamcityBuild) {
         val filter = if (include)
             filter.includePatterns
         else
             filter.excludePatterns
-        filter.add("org.jetbrains.kotlin.gradle.native.*")
+        filter.patterns()
     }
 }