From a51e2ca4d6318f8688966d410f09ab473a4950cc Mon Sep 17 00:00:00 2001 From: Andrey Uskov Date: Thu, 7 Nov 2019 15:31:21 +0300 Subject: [PATCH] Limit initial heap of gradle daemon in import tests --- .../idea/codeInsight/gradle/GradleImportingTestCase.kt | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleImportingTestCase.kt b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleImportingTestCase.kt index 9fe0397e863..f62f302dc0f 100644 --- a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleImportingTestCase.kt +++ b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleImportingTestCase.kt @@ -101,7 +101,7 @@ abstract class GradleImportingTestCase : ExternalSystemImportingTestCase() { "-Xmx256m -XX:MaxPermSize=64m" else -> // 128M should be enough for gradle 5.0+ (leak is fixed), and <4.0 (amount of tests is less) - "-Xmx128m -XX:MaxPermSize=64m" + "-Xms128M -Xmx128m -XX:MaxPermSize=64m" } override fun setUp() { @@ -233,7 +233,7 @@ abstract class GradleImportingTestCase : ExternalSystemImportingTestCase() { return File(baseDir, getTestName(true).substringBefore("_")) } - protected open fun configureByFiles(): List { + protected open fun configureByFiles(properties: Map? = null): List { val rootDir = testDataDirectory() assert(rootDir.exists()) { "Directory ${rootDir.path} doesn't exist" } @@ -241,7 +241,11 @@ abstract class GradleImportingTestCase : ExternalSystemImportingTestCase() { when { it.isDirectory -> null !it.name.endsWith(SUFFIX) -> { - createProjectSubFile(it.path.substringAfter(rootDir.path + File.separator), it.readText()) + var text = it.readText() + properties?.forEach { key, value -> + text = text.replace("{{${key}}}", value) + } + createProjectSubFile(it.path.substringAfter(rootDir.path + File.separator), text) } else -> null }