Fix xmx setting for the daemon in tests

This commit is contained in:
Ilya Chernikov
2017-07-19 11:03:48 +02:00
parent 17a189a24b
commit e38aaf3e07
@@ -85,7 +85,7 @@ class CompilerDaemonTest : KotlinIntegrationTestBase() {
verbose = 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>()
if (logFile != null) {
additionalArgs.add("D$COMPILE_DAEMON_LOG_PATH_PROPERTY=\"${logFile.loggerCompatiblePath}\"")
@@ -94,7 +94,7 @@ class CompilerDaemonTest : KotlinIntegrationTestBase() {
return configureDaemonJVMOptions(
baseOpts,
*additionalArgs.toTypedArray(),
inheritMemoryLimits = xmx > 0,
inheritMemoryLimits = xmx <= 0,
inheritAdditionalProperties = false,
inheritOtherJvmOptions = false)
}