[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
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 f1e0c77..0c4a8d4 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 @@ } 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 1103fad..735f894 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 @@ } } -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.