jlengrand/kotlin
1
0
Fork 0
mirror of https://github.com/jlengrand/kotlin.git synced 2026-03-10 08:31:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix test that was broken by e159392d by disabling native caches.

Browse Source
This commit is contained in:
Sergey Bogolepov
2021-08-12 13:49:35 +07:00
committed by TeamCityServer
parent 39c6be86cb
commit db12a96e54
4 changed files with 27 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/NewMultiplatformIT.kt
View File

@@ -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<String>

4
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/CommonNativeIT.kt
View File

@@ -23,7 +23,9 @@ class CommonNativeIT : BaseGradleIT() {
libTargets: List<String>,
appTargets: List<String>
) = 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()}" }

22
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/GeneralNativeIT.kt
View File

@@ -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 = "<SingleNativeTarget>"

8
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/NativePlatformLibsIT.kt
View File

@@ -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")