diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/TestExecutable.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/TestExecutable.kt index 11deb7f0409..7d9ebf55287 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/TestExecutable.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/TestExecutable.kt @@ -10,13 +10,13 @@ import java.io.File internal class TestExecutable( val executableFile: File, - val origin: TestOrigin.SingleTestDataFile, val loggedCompilerCall: LoggedData.CompilerCall ) internal class TestRun( val executable: TestExecutable, - val runParameters: List + val runParameters: List, + val origin: TestOrigin.SingleTestDataFile ) internal sealed interface TestRunParameter { diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/TestRunProvider.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/TestRunProvider.kt index 90f72aa261f..a59fde3acb7 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/TestRunProvider.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/TestRunProvider.kt @@ -51,7 +51,7 @@ internal class TestRunProvider( } val (executableFile, loggedCompilerCall) = testCompilation.result.assertSuccess() // <-- Compilation happens here. - val executable = TestExecutable(executableFile, testCase.origin, loggedCompilerCall) + val executable = TestExecutable(executableFile, loggedCompilerCall) val runParameters = when (testCase.kind) { TestKind.STANDALONE_NO_TR -> listOfNotNull( @@ -69,7 +69,7 @@ internal class TestRunProvider( ) } - return TestRun(executable, runParameters) + return TestRun(executable, runParameters, testCase.origin) } override fun close() { diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/TestRunner.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/TestRunner.kt index 4f7877e253d..24d3882fac5 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/TestRunner.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/TestRunner.kt @@ -12,7 +12,7 @@ internal fun TestRun.runAndVerify() { val programArgs = mutableListOf(executable.executableFile.path) runParameters.forEach { it.applyTo(programArgs) } - val loggedParameters = LoggedData.TestRunParameters(executable.loggedCompilerCall, executable.origin, programArgs, runParameters) + val loggedParameters = LoggedData.TestRunParameters(executable.loggedCompilerCall, origin, programArgs, runParameters) val startTimeMillis = System.currentTimeMillis() val process = ProcessBuilder(programArgs).directory(executable.executableFile.parentFile).start()