From 202347865dccabf04d2233772d14119fa19ff3f6 Mon Sep 17 00:00:00 2001
From: Vyacheslav Gerasimov <vyacheslav.gerasimov@jetbrains.com>
Date: Tue, 5 Apr 2022 20:39:44 +0300
Subject: [PATCH] Move gradle testKit cache to the build directory

---
 .../kotlin-gradle-plugin-integration-tests/build.gradle.kts  | 5 ++---
 .../kotlin/org/jetbrains/kotlin/gradle/testbase/testDsl.kt   | 2 +-
 2 files changed, 3 insertions(+), 4 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 c03f535f595..14d560d4ab5 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts
@@ -95,7 +95,7 @@ val cleanTestKitCacheTask = tasks.register<Delete>("cleanTestKitCache") {
     group = "Build"
     description = "Deletes temporary Gradle TestKit cache"
 
-    delete(project.file(".testKitDir"))
+    delete(project.buildDir.resolve("testKitCache"))
 }
 
 fun Test.includeMppAndAndroid(include: Boolean) = includeTestsWithPattern(include) {
@@ -273,8 +273,7 @@ val daemonsTestsTask = tasks.register<Test>("kgpDaemonTests") {
         includeEngines("junit-jupiter")
     }
 
-    // Disabled cause jna dependency FD is leaking on windows agents
-    //if (isTeamcityBuild) finalizedBy(cleanTestKitCacheTask)
+    if (isTeamcityBuild) finalizedBy(cleanTestKitCacheTask)
 }
 
 val otherPluginsTestTask = tasks.register<Test>("kgpOtherTests") {
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/testDsl.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/testDsl.kt
index 39d5c201c8e..43d5a301dcd 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/testDsl.kt
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/testDsl.kt
@@ -358,7 +358,7 @@ private fun TestProject.withBuildSummary(
 /**
  * On changing test kit dir location update related location in 'cleanTestKitCache' task.
  */
-private val testKitDir get() = Paths.get(".").resolve(".testKitDir")
+private val testKitDir get() = Paths.get(".").resolve("build").resolve("testKitCache")
 
 private val hashAlphabet: List<Char> = ('a'..'z') + ('A'..'Z') + ('0'..'9')
 private fun randomHash(length: Int = 15): String {