From ff85d54c93c55cc061fa56af9313bc3b127353e3 Mon Sep 17 00:00:00 2001
From: Svyatoslav Scherbina <svyatoslav.scherbina@jetbrains.com>
Date: Wed, 9 Feb 2022 11:31:14 +0300
Subject: [PATCH] [Native][tests] Add full path to CLI compiler to the log

So the log now has a command to be run in terminal as is.
---
 .../jetbrains/kotlin/konan/blackboxtest/support/LoggedData.kt | 4 +++-
 .../konan/blackboxtest/support/compilation/TestCompilation.kt | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/LoggedData.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/LoggedData.kt
index a31c66359a5..4a8488bbde9 100644
--- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/LoggedData.kt
+++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/LoggedData.kt
@@ -9,6 +9,7 @@ import org.jetbrains.kotlin.cli.common.ExitCode
 import org.jetbrains.kotlin.konan.blackboxtest.support.runner.RunResult
 import org.jetbrains.kotlin.konan.blackboxtest.support.runner.TestRunParameter
 import org.jetbrains.kotlin.konan.blackboxtest.support.runner.get
+import org.jetbrains.kotlin.konan.blackboxtest.support.settings.KotlinNativeHome
 import org.jetbrains.kotlin.konan.blackboxtest.support.util.SafeEnvVars
 import org.jetbrains.kotlin.konan.blackboxtest.support.util.SafeProperties
 import org.jetbrains.kotlin.utils.addToStdlib.safeAs
@@ -50,6 +51,7 @@ internal abstract class LoggedData {
     }
 
     class CompilerParameters(
+        private val home: KotlinNativeHome,
         private val compilerArgs: Array<String>,
         private val sourceModules: Collection<TestModule>,
         private val environment: JVMEnvironment = JVMEnvironment() // Capture environment.
@@ -64,7 +66,7 @@ internal abstract class LoggedData {
             }
 
         override fun computeText() = buildString {
-            appendArguments("COMPILER ARGUMENTS:", listOf("\$\$kotlinc-native\$\$") + compilerArgs)
+            appendArguments("COMPILER ARGUMENTS:", listOf(home.dir.resolve("bin/kotlinc-native").path) + compilerArgs)
             appendLine()
             appendLine(environment)
 
diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/compilation/TestCompilation.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/compilation/TestCompilation.kt
index 4b2492aeb07..690b755f869 100644
--- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/compilation/TestCompilation.kt
+++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/compilation/TestCompilation.kt
@@ -74,7 +74,7 @@ internal abstract class BasicCompilation<A : TestCompilationArtifact>(
             applySources()
         }
 
-        val loggedCompilerParameters = LoggedData.CompilerParameters(compilerArgs, sourceModules)
+        val loggedCompilerParameters = LoggedData.CompilerParameters(home, compilerArgs, sourceModules)
 
         val (loggedCompilerCall: LoggedData, result: TestCompilationResult.ImmediateResult<out A>) = try {
             val (exitCode, compilerOutput, compilerOutputHasErrors, duration) = callCompiler(