From 121caa0d4e888e3bbe61b3886114ba954125846e Mon Sep 17 00:00:00 2001 From: Ilya Chernikov Date: Tue, 3 Nov 2015 21:56:31 +0100 Subject: [PATCH] Adding possibility to skip params inheritance on daemon jvm options creation, refactoring appropriate api, using it to fix tests Original commit: b71fec985f79eeeebc27f05adde92c3bf12cbe1f --- .../org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt index 314e780b65b..7d50bdb5527 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt @@ -139,7 +139,7 @@ public object KotlinCompilerRunner { val libPath = CompilerRunnerUtil.getLibPath(environment.kotlinPaths, messageCollector) val compilerId = CompilerId.makeCompilerId(File(libPath, "kotlin-compiler.jar")) val daemonOptions = configureDaemonOptions() - val daemonJVMOptions = configureDaemonJVMOptions(true) + val daemonJVMOptions = configureDaemonJVMOptions(inheritMemoryLimits = true, inheritAdditionalProperties = true) // the property should be set by default for daemon builds to avoid parallel building problems // but it cannot be currently set by default globally, because it seems breaks many tests // TODO: find out how to get rid of the property and make it the default behavior