From 35a020340ceee57531df2dba0bbd690258b84b88 Mon Sep 17 00:00:00 2001
From: Yahor Berdnikau <yahor.berdnikau@jetbrains.com>
Date: Wed, 7 Apr 2021 11:10:25 +0200
Subject: [PATCH] Don't share temp directory between tests.

Apparently this causes problems on Windows CI runners.

^KT-45744 In Progress
---
 .../org/jetbrains/kotlin/gradle/testbase/KGPBaseTest.kt    | 7 ++-----
 .../kotlin/org/jetbrains/kotlin/gradle/testbase/testDsl.kt | 3 ++-
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/KGPBaseTest.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/KGPBaseTest.kt
index 04fdd6a8eba..0e74c21253d 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/KGPBaseTest.kt
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/KGPBaseTest.kt
@@ -29,11 +29,8 @@ import kotlin.streams.asStream
 abstract class KGPBaseTest {
     open val defaultBuildOptions = BuildOptions()
 
-    companion object {
-        @TempDir
-        @JvmStatic
-        lateinit var workingDir: Path
-    }
+    @TempDir
+    lateinit var workingDir: Path
 
     data class BuildOptions(
         val logLevel: LogLevel = LogLevel.INFO,
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 83cb1ba0da9..6522bd990dc 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
@@ -30,7 +30,7 @@ fun KGPBaseTest.project(
     val projectPath = setupProjectFromTestResources(
         projectName,
         gradleVersion,
-        KGPBaseTest.workingDir
+        workingDir
     )
     projectPath.addDefaultBuildFiles()
 
@@ -96,6 +96,7 @@ private fun TestProject.commonBuildSetup(
     println("<=== Test build: ${this.projectName} ===>")
     println("<=== Using Gradle version: ${gradleVersion.version} ===>")
     println("<=== Run arguments: ${allBuildArguments.joinToString()} ===>")
+    println("<=== Project path:  ${projectPath.toAbsolutePath()} ===>")
 
     return allBuildArguments
 }