From db12a96e540d5f5c30a0479a49b5ef9726b0b13d Mon Sep 17 00:00:00 2001 From: Sergey Bogolepov Date: Thu, 12 Aug 2021 13:49:35 +0700 Subject: [PATCH] Fix test that was broken by e159392d by disabling native caches. --- .../kotlin/gradle/NewMultiplatformIT.kt | 6 +++-- .../kotlin/gradle/native/CommonNativeIT.kt | 4 +++- .../kotlin/gradle/native/GeneralNativeIT.kt | 22 ++++++++++++------- .../gradle/native/NativePlatformLibsIT.kt | 8 +++++-- 4 files changed, 27 insertions(+), 13 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/NewMultiplatformIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/NewMultiplatformIT.kt index 90842fc9341..b7e00f2f8c2 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/NewMultiplatformIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/NewMultiplatformIT.kt @@ -9,8 +9,8 @@ import org.jetbrains.kotlin.gradle.native.GeneralNativeIT.Companion.checkNativeC import org.jetbrains.kotlin.gradle.native.GeneralNativeIT.Companion.containsSequentially import org.gradle.api.logging.configuration.WarningMode import org.gradle.util.GradleVersion +import org.jetbrains.kotlin.gradle.native.* import org.jetbrains.kotlin.gradle.native.MPPNativeTargets -import org.jetbrains.kotlin.gradle.native.configureMemoryInGradleProperties import org.jetbrains.kotlin.gradle.native.transformNativeTestProject import org.jetbrains.kotlin.gradle.native.transformNativeTestProjectWithPluginDsl import org.jetbrains.kotlin.gradle.plugin.KotlinJsCompilerType @@ -459,7 +459,9 @@ class NewMultiplatformIT : BaseGradleIT() { private fun doTestJvmWithJava(testJavaSupportInJvmTargets: Boolean) = with(Project("sample-lib", directoryPrefix = "new-mpp-lib-and-app")) { embedProject(Project("sample-lib-gradle-kotlin-dsl", directoryPrefix = "new-mpp-lib-and-app")) - configureMemoryInGradleProperties() + gradleProperties().apply { + configureJvmMemory() + } lateinit var classesWithoutJava: Set diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/CommonNativeIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/CommonNativeIT.kt index d44d4260491..f0f65be3868 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/CommonNativeIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/CommonNativeIT.kt @@ -23,7 +23,9 @@ class CommonNativeIT : BaseGradleIT() { libTargets: List, appTargets: List ) = with(transformProjectWithPluginsDsl(projectName, directoryPrefix = "native-apple-devices-common")) { - configureMemoryInGradleProperties() + gradleProperties().apply { + configureJvmMemory() + } val libCompileTasks = libTargets.map { ":lib:compileKotlin${it.capitalize()}" } val appCompileTasks = appTargets.map { ":app:compileKotlin${it.capitalize()}" } diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/GeneralNativeIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/GeneralNativeIT.kt index 1a47053dd29..15ab43c66c1 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/GeneralNativeIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/GeneralNativeIT.kt @@ -54,23 +54,29 @@ internal fun BaseGradleIT.transformNativeTestProject(projectName: String, wrappe val project = Project(projectName, wrapperVersion, directoryPrefix = directoryPrefix) project.setupWorkingDir() project.configureSingleNativeTarget() - project.configureMemoryInGradleProperties() + project.gradleProperties().apply { + configureJvmMemory() + disableKotlinNativeCaches() + } return project } internal fun BaseGradleIT.transformNativeTestProjectWithPluginDsl(projectName: String, wrapperVersion: GradleVersionRequired = defaultGradleVersion, directoryPrefix: String? = null): BaseGradleIT.Project { val project = transformProjectWithPluginsDsl(projectName, wrapperVersion, directoryPrefix = directoryPrefix) project.configureSingleNativeTarget() - project.configureMemoryInGradleProperties() + project.gradleProperties().apply { + configureJvmMemory() + disableKotlinNativeCaches() + } return project } -internal fun BaseGradleIT.Project.configureMemoryInGradleProperties() { - val file = projectDir.resolve("gradle.properties") - if (file.exists()) { - file.createNewFile() - } - file.appendText("\norg.gradle.jvmargs=-Xmx1g\n") +internal fun File.configureJvmMemory() { + appendText("\norg.gradle.jvmargs=-Xmx1g\n") +} + +internal fun File.disableKotlinNativeCaches() { + appendText("\nkotlin.native.cacheKind=none\n") } private const val SINGLE_NATIVE_TARGET_PLACEHOLDER = "" diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/NativePlatformLibsIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/NativePlatformLibsIT.kt index f63412b8c1e..4068f2195cb 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/NativePlatformLibsIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/NativePlatformLibsIT.kt @@ -49,7 +49,9 @@ class NativePlatformLibsIT : BaseGradleIT() { "kotlin.$it()" } ) - configureMemoryInGradleProperties() + gradleProperties().apply { + configureJvmMemory() + } } private fun CompilerVersion.isAtLeast(compilerVersion: CompilerVersion): Boolean { @@ -116,7 +118,9 @@ class NativePlatformLibsIT : BaseGradleIT() { val rootProject = Project("native-platform-libraries").apply { embedProject(Project("native-platform-libraries"), renameTo = "subproject") - configureMemoryInGradleProperties() + gradleProperties().apply { + configureJvmMemory() + } gradleBuildScript().modify(::transformBuildScriptWithPluginsDsl) gradleBuildScript().appendText("\nkotlin.linuxX64()\n")