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

Fix xmx setting for the daemon in tests

Browse Source
This commit is contained in:
Ilya Chernikov
2017-07-19 11:03:48 +02:00
parent 17a189a24b
commit e38aaf3e07
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/kotlin/daemon/CompilerDaemonTest.kt
+2 -2
View File
@@ -85,7 +85,7 @@ class CompilerDaemonTest : KotlinIntegrationTestBase() {
verbose = true, verbose = true,
reportPerf = true) reportPerf = true)
fun makeTestDaemonJvmOptions(logFile: File? = null, xmx: Int = 256): DaemonJVMOptions { fun makeTestDaemonJvmOptions(logFile: File? = null, xmx: Int = 384): DaemonJVMOptions {
val additionalArgs = arrayListOf<String>() val additionalArgs = arrayListOf<String>()
if (logFile != null) { if (logFile != null) {
additionalArgs.add("D$COMPILE_DAEMON_LOG_PATH_PROPERTY=\"${logFile.loggerCompatiblePath}\"") additionalArgs.add("D$COMPILE_DAEMON_LOG_PATH_PROPERTY=\"${logFile.loggerCompatiblePath}\"")
@@ -94,7 +94,7 @@ class CompilerDaemonTest : KotlinIntegrationTestBase() {
return configureDaemonJVMOptions( return configureDaemonJVMOptions(
baseOpts, baseOpts,
*additionalArgs.toTypedArray(), *additionalArgs.toTypedArray(),
inheritMemoryLimits = xmx > 0, inheritMemoryLimits = xmx <= 0,
inheritAdditionalProperties = false, inheritAdditionalProperties = false,
inheritOtherJvmOptions = false) inheritOtherJvmOptions = false)
} }