azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Gradle] Move konan.data.dir for tests into <repo>/build and normalize the path

Browse Source 
This should solve the problem on Windows CI with too long paths in Kotlin/Native integration tests
This commit is contained in:
Alexander.Likhachev
2023-09-07 00:11:07 +02:00
committed by Space Cloud
parent c33f7a4161
commit 64fb36deef
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/BuildOptions.kt
+1 -1
View File
@@ -214,7 +214,7 @@ data class BuildOptions(
} }
konanDataDir?.let { konanDataDir?.let {
arguments.add("-Pkonan.data.dir=${konanDataDir.absolutePathString()}") arguments.add("-Pkonan.data.dir=${konanDataDir.toAbsolutePath().normalize()}")
} }
arguments.addAll(freeArgs) arguments.addAll(freeArgs)
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/testDsl.kt
+1 -1
View File
@@ -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. * On changing test kit dir location update related location in 'cleanTestKitCache' task.