From c7a242231464507784f1ab8a39887056c73b82d3 Mon Sep 17 00:00:00 2001 From: Ilya Chernikov Date: Fri, 17 Feb 2017 09:51:33 +0300 Subject: [PATCH] minor: Make parallel daemong start test less demanding --- .../org/jetbrains/kotlin/daemon/CompilerDaemonTest.kt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/compiler/tests/org/jetbrains/kotlin/daemon/CompilerDaemonTest.kt b/compiler/tests/org/jetbrains/kotlin/daemon/CompilerDaemonTest.kt index f6ddafdebec..dc42682b5ea 100644 --- a/compiler/tests/org/jetbrains/kotlin/daemon/CompilerDaemonTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/daemon/CompilerDaemonTest.kt @@ -401,7 +401,7 @@ class CompilerDaemonTest : KotlinIntegrationTestBase() { fun testParallelDaemonStart() { - val PARALLEL_THREADS_TO_START = 10 + val PARALLEL_THREADS_TO_START = 8 val doneLatch = CountDownLatch(PARALLEL_THREADS_TO_START) @@ -412,10 +412,11 @@ class CompilerDaemonTest : KotlinIntegrationTestBase() { fun connectThread(threadNo: Int) = thread(name = "daemonConnect$threadNo") { try { withFlagFile(getTestName(true), ".alive") { flagFile -> - val daemonOptions = DaemonOptions(shutdownDelayMilliseconds = 1000, runFilesPath = File(tmpdir, getTestName(true)).absolutePath, verbose = true) + val daemonOptions = DaemonOptions(shutdownDelayMilliseconds = 10000, runFilesPath = File(tmpdir, getTestName(true)).absolutePath, verbose = true) val logFile = createTempFile("kotlin-daemon-test", ".log") val daemonJVMOptions = - configureDaemonJVMOptions("D$COMPILE_DAEMON_LOG_PATH_PROPERTY=\"${logFile.loggerCompatiblePath}\"", + configureDaemonJVMOptions(DaemonJVMOptions(maxMemory = "2048m"), + "D$COMPILE_DAEMON_LOG_PATH_PROPERTY=\"${logFile.loggerCompatiblePath}\"", inheritMemoryLimits = false, inheritAdditionalProperties = false) val daemon = KotlinCompilerClient.connectToCompileService(compilerId, flagFile, daemonJVMOptions, daemonOptions, DaemonReportingTargets(out = System.err), autostart = true) assertNotNull("failed to connect daemon", daemon)