From 201b6dfa601c24e3b5bd6d14fb697f395e0c9e05 Mon Sep 17 00:00:00 2001 From: Yahor Berdnikau Date: Mon, 26 Apr 2021 10:47:28 +0200 Subject: [PATCH] Print path to java executable Kotlin daemon was started with. Useful for tests to validate toolchain correct behaviour. ^KT-45611 In Progress --- .../jetbrains/kotlin/daemon/client/KotlinCompilerClient.kt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/compiler/daemon/daemon-client/src/org/jetbrains/kotlin/daemon/client/KotlinCompilerClient.kt b/compiler/daemon/daemon-client/src/org/jetbrains/kotlin/daemon/client/KotlinCompilerClient.kt index 23ab923b825..78738278a9b 100644 --- a/compiler/daemon/daemon-client/src/org/jetbrains/kotlin/daemon/client/KotlinCompilerClient.kt +++ b/compiler/daemon/daemon-client/src/org/jetbrains/kotlin/daemon/client/KotlinCompilerClient.kt @@ -101,7 +101,11 @@ object KotlinCompilerClient { fun CompileService.leaseImpl(): CompileServiceSession? { // the newJVMOptions could be checked here for additional parameters, if needed registerClient(clientAliveFlagFile.absolutePath) - reportingTargets.report(DaemonReportCategory.DEBUG, "connected to the daemon") + val javaExecutablePath = compilerId.javaExecutable?.absolutePath ?: "'user jvm'" + reportingTargets.report( + DaemonReportCategory.DEBUG, + "connected to the daemon. Daemon is using following 'java' executable to run itself: $javaExecutablePath" + ) if (!leaseSession) return CompileServiceSession(this, CompileService.NO_SESSION)