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

[K/N] Add RosettaExecutor

Browse Source 
Merge-request: KT-MR-9986
Merged-by: Alexander Shabalin <Alexander.Shabalin@jetbrains.com>
This commit is contained in:
Alexander Shabalin
2023-05-06 13:44:25 +00:00
committed by Space Team
parent 917f64c893
commit 142e2b4b2a
6 changed files with 68 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/ExecutorService.kt
+2 -1
View File
@@ -53,7 +53,7 @@ private fun Executor.service(project: Project) = object: ExecutorService {
val execSpec = project.objects.newInstance<DefaultExecSpec>().apply {
action.execute(this)
}
val request = executeRequest(
val request = ExecuteRequest(
executableAbsolutePath = execSpec.executable,
args = execSpec.args,
).apply {
@@ -105,6 +105,7 @@ fun create(project: Project): ExecutorService {
}
}.service(project)
supportsRunningTestsOnDevice(testTarget) -> deviceLauncher(project)
configurables is AppleConfigurables && RosettaExecutor.availableFor(configurables) -> RosettaExecutor(configurables).service(project)
else -> HostExecutor().service(project)
}
}
kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/cpp/RunGTest.kt
+2 -1
View File
@@ -40,6 +40,7 @@ private abstract class RunGTestJob : WorkAction<RunGTestJob.Parameters> {
when {
target == hostTarget -> HostExecutor()
configurables is AppleConfigurables && configurables.targetTriple.isSimulator -> XcodeSimulatorExecutor(configurables)
configurables is AppleConfigurables && RosettaExecutor.availableFor(configurables) -> RosettaExecutor(configurables)
else -> error("Cannot run for target $target")
}
}
@@ -50,7 +51,7 @@ private abstract class RunGTestJob : WorkAction<RunGTestJob.Parameters> {
with(parameters) {
reportFileUnprocessed.asFile.get().parentFile.mkdirs()
executor.execute(executeRequest(this@with.executable.asFile.get().absolutePath).apply {
executor.execute(ExecuteRequest(this@with.executable.asFile.get().absolutePath).apply {
this.args.add("--gtest_output=xml:${reportFileUnprocessed.asFile.get().absolutePath}")
filter.orNull?.also {
this.args.add("--gtest_filter=${it}")