From 3c3407b3804f3355c0ac59bfd8aa96336b0a0076 Mon Sep 17 00:00:00 2001
From: Sergey Bogolepov <sergey.bogolepov@jetbrains.com>
Date: Mon, 14 Dec 2020 16:33:28 +0700
Subject: [PATCH] Fix running tests on remote Raspberry Pi.

---
 .../main/kotlin/org/jetbrains/kotlin/ExecutorService.kt  | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/ExecutorService.kt b/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/ExecutorService.kt
index 871d6c6c2e2..75252ea60cc 100644
--- a/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/ExecutorService.kt
+++ b/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/ExecutorService.kt
@@ -54,7 +54,9 @@ fun create(project: Project): ExecutorService {
     val platform = platformManager.platform(testTarget)
     val absoluteTargetToolchain = platform.absoluteTargetToolchain
 
-    return when (testTarget) {
+    return if (project.hasProperty("remote")) {
+        sshExecutor(project)
+    } else when (testTarget) {
         KonanTarget.WASM32 -> object : ExecutorService {
             override fun execute(action: Action<in ExecSpec>): ExecResult? = project.exec { execSpec ->
                 action.execute(execSpec)
@@ -81,10 +83,7 @@ fun create(project: Project): ExecutorService {
         KonanTarget.IOS_ARM32,
         KonanTarget.IOS_ARM64 -> deviceLauncher(project)
 
-        else -> {
-            if (project.hasProperty("remote")) sshExecutor(project)
-            else localExecutorService(project)
-        }
+        else -> localExecutorService(project)
     }
 }