From aac53b699eca52ab170348ef5cda5e7d3bb1d042 Mon Sep 17 00:00:00 2001 From: Alexander Shabalin Date: Wed, 23 Aug 2023 13:27:33 +0200 Subject: [PATCH] [K/N] Make hostRuntimeTests for arm64 macOS also run x64-tsan --- .../jetbrains/kotlin/bitcode/CompileToBitcodePlugin.kt | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/bitcode/CompileToBitcodePlugin.kt b/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/bitcode/CompileToBitcodePlugin.kt index 9f02e9229e5..dd02bb002ae 100644 --- a/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/bitcode/CompileToBitcodePlugin.kt +++ b/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/bitcode/CompileToBitcodePlugin.kt @@ -25,6 +25,7 @@ import org.gradle.kotlin.dsl.* import org.gradle.language.base.plugins.LifecycleBasePlugin import org.jetbrains.kotlin.ExecClang import org.jetbrains.kotlin.cpp.* +import org.jetbrains.kotlin.konan.target.KonanTarget import org.jetbrains.kotlin.konan.target.SanitizerKind import org.jetbrains.kotlin.konan.target.TargetDomainObjectContainer import org.jetbrains.kotlin.konan.target.TargetWithSanitizer @@ -618,6 +619,13 @@ open class CompileToBitcodeExtension @Inject constructor(val project: Project) : owner.allTestsTasks[target.name]!!.configure { dependsOn(runTask) } + + // TODO: Support tsan natively on macOS arm64. + if (target == KonanTarget.MACOS_X64 && sanitizer == SanitizerKind.THREAD) { + owner.allTestsTasks[KonanTarget.MACOS_ARM64.name]!!.configure { + dependsOn(runTask) + } + } } }