From 37ff2c338e90fbe2c7fee5958d16ea41563047b6 Mon Sep 17 00:00:00 2001 From: Pavel Punegov Date: Wed, 11 Nov 2020 14:19:51 +0300 Subject: [PATCH] Filter out __cxa_demangle definition linker options in tests --- .../main/kotlin/org/jetbrains/kotlin/KotlinNativeTest.kt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/KotlinNativeTest.kt b/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/KotlinNativeTest.kt index ee611106db7..3e06ca43962 100644 --- a/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/KotlinNativeTest.kt +++ b/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/KotlinNativeTest.kt @@ -14,6 +14,7 @@ import org.gradle.api.tasks.Input import org.gradle.api.tasks.Optional import org.gradle.api.tasks.TaskAction import org.gradle.language.base.plugins.LifecycleBasePlugin +import org.jetbrains.kotlin.konan.exec.Command import java.io.File import java.io.ByteArrayOutputStream @@ -476,7 +477,10 @@ open class KonanDynamicTest : KonanStandaloneTest() { needsProfileLibrary = false, mimallocEnabled = false ) - commands.forEach { + commands.map { cmd -> + // Filter out linker option that defines __cxa_demangle because Konan_cxa_demangle is not defined in tests. + Command(cmd.argsWithExecutable.filterNot { it.contains("--defsym") || it.contains("Konan_cxa_demangle") }) + }.forEach { it.logWith { message -> project.file("$executable.compilation.log").appendText(message()) } it.execute() }