Skip to content

Commit bb66776

Browse files
committed
Additional fix to the previous one: Disabling parallel builds without daemon again and undoing apprpriate fix to broken tests problem, since it effectively cancelled fix for parallel building itself and was causing exceptions on heavy builds
1 parent 0610452 commit bb66776

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,9 @@ public object KotlinCompilerRunner {
112112
val stream = ByteArrayOutputStream()
113113
val out = PrintStream(stream)
114114

115-
if (System.getProperty(KOTLIN_COMPILER_ENVIRONMENT_KEEPALIVE_PROPERTY) == null)
116-
System.setProperty(KOTLIN_COMPILER_ENVIRONMENT_KEEPALIVE_PROPERTY, "")
115+
// Uncomment after resolving problems with parallel compilation and tests
116+
// if (System.getProperty(KOTLIN_COMPILER_ENVIRONMENT_KEEPALIVE_PROPERTY) == null)
117+
// System.setProperty(KOTLIN_COMPILER_ENVIRONMENT_KEEPALIVE_PROPERTY, "")
117118

118119
val rc = CompilerRunnerUtil.invokeExecMethod(compilerClassName, argsArray, environment, messageCollector, out)
119120

0 commit comments

Comments
 (0)