From ba217ad68837815a701aad66c736052793ec9263 Mon Sep 17 00:00:00 2001 From: Vladimir Sukharev Date: Mon, 19 Feb 2024 14:04:39 +0100 Subject: [PATCH] [K/N][Tests] Fix passing of -Xbinary options under MinGW ^KT-61259 --- .../test/blackbox/support/compilation/TestCompilation.kt | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/compilation/TestCompilation.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/compilation/TestCompilation.kt index 8e0610f877d..5db5f8c388e 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/compilation/TestCompilation.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/blackbox/support/compilation/TestCompilation.kt @@ -8,6 +8,7 @@ package org.jetbrains.kotlin.konan.test.blackbox.support.compilation import org.jetbrains.kotlin.cli.common.ExitCode import org.jetbrains.kotlin.konan.properties.resolvablePropertyList import org.jetbrains.kotlin.konan.target.AppleConfigurables +import org.jetbrains.kotlin.konan.target.HostManager import org.jetbrains.kotlin.konan.target.withOSVersion import org.jetbrains.kotlin.konan.test.blackbox.support.* import org.jetbrains.kotlin.konan.test.blackbox.support.TestCase.* @@ -73,7 +74,12 @@ internal abstract class BasicCompilation( // We use dev distribution for tests as it provides a full set of testing utilities, // which might not be available in user distribution. add("-Xllvm-variant=dev") - addFlattened(binaryOptions.entries) { (name, value) -> listOf("-Xbinary=$name=$value") } + addFlattened(binaryOptions.entries) { (name, value) -> + if (HostManager.hostIsMingw) + listOf("-Xbinary=\"$name=$value\"") + else + listOf("-Xbinary=$name=$value") + } } protected abstract fun applySpecificArgs(argsBuilder: ArgsBuilder)