From 029e823b06c658202043d73d9eda34376a8ed388 Mon Sep 17 00:00:00 2001 From: Ilya Chernikov Date: Tue, 13 Oct 2015 18:35:58 +0200 Subject: [PATCH] Placing temp files to appropriate location in DaemonExecutionViaIntermediateProcess test --- .../tests/org/jetbrains/kotlin/daemon/CompilerDaemonTest.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/compiler/tests/org/jetbrains/kotlin/daemon/CompilerDaemonTest.kt b/compiler/tests/org/jetbrains/kotlin/daemon/CompilerDaemonTest.kt index 8d4583f6d60..05b05a59eb8 100644 --- a/compiler/tests/org/jetbrains/kotlin/daemon/CompilerDaemonTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/daemon/CompilerDaemonTest.kt @@ -200,6 +200,7 @@ public class CompilerDaemonTest : KotlinIntegrationTestBase() { val clientAliveFile = createTempFile("kotlin-daemon-transitive-run-test", ".run") val runFilesPath = File(tmpdir, getTestName(true)).absolutePath val daemonOptions = DaemonOptions(runFilesPath = runFilesPath, clientAliveFlagPath = clientAliveFile.absolutePath) + val jar = tmpdir.absolutePath + File.separator + "hello.jar" val args = listOf( File(File(System.getProperty("java.home"), "bin"), "java").absolutePath, "-D$COMPILE_DAEMON_VERBOSE_REPORT_PROPERTY", @@ -208,7 +209,8 @@ public class CompilerDaemonTest : KotlinIntegrationTestBase() { KotlinCompilerClient::class.qualifiedName!!) + daemonOptions.mappers.flatMap { it.toArgs(COMPILE_DAEMON_CMDLINE_OPTIONS_PREFIX) } + compilerId.mappers.flatMap { it.toArgs(COMPILE_DAEMON_CMDLINE_OPTIONS_PREFIX) } + - File(getHelloAppBaseDir(), "hello.kt").absolutePath + File(getHelloAppBaseDir(), "hello.kt").absolutePath + + "-d" + jar try { KotlinCompilerClient.shutdownCompileService(compilerId, daemonOptions) var resOutput: String? = null