azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[K/N] Make hostRuntimeTests for arm64 macOS also run x64-tsan

Browse Source
This commit is contained in:
Alexander Shabalin
2023-08-23 13:27:33 +02:00
committed by Space Team
parent 3e12693f94
commit aac53b699e
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/bitcode/CompileToBitcodePlugin.kt
+8
View File
@@ -25,6 +25,7 @@ import org.gradle.kotlin.dsl.*
import org.gradle.language.base.plugins.LifecycleBasePlugin import org.gradle.language.base.plugins.LifecycleBasePlugin
import org.jetbrains.kotlin.ExecClang import org.jetbrains.kotlin.ExecClang
import org.jetbrains.kotlin.cpp.* 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.SanitizerKind
import org.jetbrains.kotlin.konan.target.TargetDomainObjectContainer import org.jetbrains.kotlin.konan.target.TargetDomainObjectContainer
import org.jetbrains.kotlin.konan.target.TargetWithSanitizer import org.jetbrains.kotlin.konan.target.TargetWithSanitizer
@@ -618,6 +619,13 @@ open class CompileToBitcodeExtension @Inject constructor(val project: Project) :
owner.allTestsTasks[target.name]!!.configure { owner.allTestsTasks[target.name]!!.configure {
dependsOn(runTask) 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)
}
}
} }
} }