Skip to content

Commit f89e5db

Browse files
committed
[K/N] Disable TSAN in runtime tests
When upgrading to 26.4, runtime tests started with tsan started to crash on start. This commit temporarily removes tsan tests. ^KT-85457 (cherry picked from commit 7d53cb5)
1 parent 45d6c85 commit f89e5db

1 file changed

Lines changed: 8 additions & 2 deletions

File tree

kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/konan/target/TargetWithSanitizer.kt

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,18 @@ class TargetWithSanitizer(
4848
*/
4949
fun KonanTarget.withSanitizer(sanitizer: SanitizerKind? = null) = TargetWithSanitizer(this, sanitizer)
5050

51+
private val KonanTarget.supportedSanitizers
52+
get() = when (this) {
53+
is KonanTarget.MACOS_ARM64 -> emptyList() // TODO(KT-85457): TSAN is broken in runtime tests with the newer macOS
54+
else -> supportedSanitizers()
55+
}
56+
5157
/**
5258
* All known targets with their sanitizers.
5359
*/
5460
val PlatformManager.allTargetsWithSanitizers
5561
get() = enabledTargets(this).flatMap { target ->
56-
listOf(target.withSanitizer()) + target.supportedSanitizers().map {
62+
listOf(target.withSanitizer()) + target.supportedSanitizers.map {
5763
target.withSanitizer(it)
5864
}
5965
}
@@ -77,4 +83,4 @@ fun AttributesSchema.registerTargetWithSanitizerAttribute() {
7783
attribute(TargetWithSanitizer.TARGET_ATTRIBUTE) {
7884
disambiguationRules.add(TargetDisambiguationRule::class.java)
7985
}
80-
}
86+
}

0 commit comments

Comments
 (0)