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

Limit initial heap of gradle daemon in import tests

Browse Source
This commit is contained in:
Andrey Uskov
2019-11-07 15:31:21 +03:00
parent 1f2767ae21
commit a51e2ca4d6
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleImportingTestCase.kt
+7 -3
View File
@@ -101,7 +101,7 @@ abstract class GradleImportingTestCase : ExternalSystemImportingTestCase() {
"-Xmx256m -XX:MaxPermSize=64m" "-Xmx256m -XX:MaxPermSize=64m"
else -> else ->
// 128M should be enough for gradle 5.0+ (leak is fixed), and <4.0 (amount of tests is less) // 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() { override fun setUp() {
@@ -233,7 +233,7 @@ abstract class GradleImportingTestCase : ExternalSystemImportingTestCase() {
return File(baseDir, getTestName(true).substringBefore("_")) return File(baseDir, getTestName(true).substringBefore("_"))
} }
protected open fun configureByFiles(): List<VirtualFile> { protected open fun configureByFiles(properties: Map<String, String>? = null): List<VirtualFile> {
val rootDir = testDataDirectory() val rootDir = testDataDirectory()
assert(rootDir.exists()) { "Directory ${rootDir.path} doesn't exist" } assert(rootDir.exists()) { "Directory ${rootDir.path} doesn't exist" }
@@ -241,7 +241,11 @@ abstract class GradleImportingTestCase : ExternalSystemImportingTestCase() {
when { when {
it.isDirectory -> null it.isDirectory -> null
!it.name.endsWith(SUFFIX) -> { !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 else -> null
} }