Skip to content

Commit 9bf9cb4

Browse files
antohabySpace Team
authored andcommitted
[Gradle] Re-use existing nativeDistribution dir
Having a dedicated konan data dir is not working well on Windows machine. Since invocation of kotlin compiler would make JVM to load native-specific dlls and it would not be possible to clean them up until they are unloaded. ^KT-61359 Verification Pending
1 parent 99c45ca commit 9bf9cb4

File tree

1 file changed

+6
-5
lines changed
  • libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle

1 file changed

+6
-5
lines changed

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/ConfigurationCacheIT.kt

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -86,21 +86,22 @@ class ConfigurationCacheIT : AbstractConfigurationCacheIT() {
8686
additionalVersions = [TestVersions.Gradle.G_7_6],
8787
)
8888
@GradleTest
89-
fun testCommonizer(gradleVersion: GradleVersion, @TempDir konanHome: Path) {
89+
fun testCommonizer(gradleVersion: GradleVersion) {
9090
project("native-configuration-cache", gradleVersion) {
91-
val buildOptions = defaultBuildOptions.copy(konanDataDir = konanHome)
92-
build(":lib:compileCommonMainKotlinMetadata", buildOptions = buildOptions) {
91+
build(":cleanNativeDistributionCommonization")
92+
93+
build(":lib:compileCommonMainKotlinMetadata") {
9394
assertTasksExecuted(":commonizeNativeDistribution")
9495
assertTasksExecuted(":lib:compileCommonMainKotlinMetadata")
9596
assertConfigurationCacheStored()
9697
}
9798

98-
build("clean", ":cleanNativeDistributionCommonization", buildOptions = buildOptions) {
99+
build("clean", ":cleanNativeDistributionCommonization") {
99100
assertTasksExecuted(":cleanNativeDistributionCommonization")
100101
assertConfigurationCacheStored()
101102
}
102103

103-
build(":lib:compileCommonMainKotlinMetadata", buildOptions = buildOptions) {
104+
build(":lib:compileCommonMainKotlinMetadata") {
104105
assertTasksExecuted(":commonizeNativeDistribution")
105106
assertTasksExecuted(":lib:compileCommonMainKotlinMetadata")
106107
assertConfigurationCacheReused()

0 commit comments

Comments
 (0)