From 64fb36deef8d6a319e163eeb7af0427b25a750a0 Mon Sep 17 00:00:00 2001
From: "Alexander.Likhachev" <Alexander.Likhachev@jetbrains.com>
Date: Thu, 7 Sep 2023 00:11:07 +0200
Subject: [PATCH] [Gradle] Move konan.data.dir for tests into <repo>/build and
 normalize the path

This should solve the problem on Windows CI with too long paths in Kotlin/Native integration tests
---
 .../kotlin/org/jetbrains/kotlin/gradle/testbase/BuildOptions.kt | 2 +-
 .../test/kotlin/org/jetbrains/kotlin/gradle/testbase/testDsl.kt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/BuildOptions.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/BuildOptions.kt
index f1e0c7703ed..0c4a8d4c49e 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/BuildOptions.kt
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/BuildOptions.kt
@@ -214,7 +214,7 @@ data class BuildOptions(
         }
 
         konanDataDir?.let {
-            arguments.add("-Pkonan.data.dir=${konanDataDir.absolutePathString()}")
+            arguments.add("-Pkonan.data.dir=${konanDataDir.toAbsolutePath().normalize()}")
         }
 
         arguments.addAll(freeArgs)
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 1103fad518e..735f8944850 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
@@ -447,7 +447,7 @@ private fun TestProject.withBuildSummary(
     }
 }
 
-val konanDir get() = Paths.get(".").resolve("build").resolve(".konan")
+val konanDir get() = Paths.get(".").resolve("../../../build").resolve("konan-for-gradle-tests")
 
 /**
  * On changing test kit dir location update related location in 'cleanTestKitCache' task.