From 3169e3c8573c75eaef4849c70c793ea6b39363d1 Mon Sep 17 00:00:00 2001
From: Pavel Punegov <pavel.punegov@jetbrains.com>
Date: Mon, 13 Jul 2020 19:02:36 +0300
Subject: [PATCH] Kill idb on an exception. Otherwise in case of idb failure,
 it may not be able to run and install next application.

---
 .../org/jetbrains/kotlin/ExecutorService.kt   | 84 ++++++++++---------
 1 file changed, 45 insertions(+), 39 deletions(-)

diff --git a/build-tools/src/main/kotlin/org/jetbrains/kotlin/ExecutorService.kt b/build-tools/src/main/kotlin/org/jetbrains/kotlin/ExecutorService.kt
index d3d7e838692..a52a54e4a17 100644
--- a/build-tools/src/main/kotlin/org/jetbrains/kotlin/ExecutorService.kt
+++ b/build-tools/src/main/kotlin/org/jetbrains/kotlin/ExecutorService.kt
@@ -328,50 +328,56 @@ private fun deviceLauncher(project: Project) = object : ExecutorService {
     private val deviceName = project.findProperty("device_name") as? String
 
     override fun execute(action: Action<in ExecSpec>): ExecResult? {
-        val udid = targetUDID()
-        println("Found device UDID: $udid")
-        install(udid, xcProject.resolve("build/KonanTestLauncher.ipa").toString())
-        val bundleId = "org.jetbrains.kotlin.KonanTestLauncher"
-        val commands = startDebugServer(udid, bundleId)
-                .split("\n")
-                .filter { it.isNotBlank() }
-                .flatMap { listOf("-o", it) }
+        var result: ExecResult? = null
+        try {
+            val udid = targetUDID()
+            println("Found device UDID: $udid")
+            install(udid, xcProject.resolve("build/KonanTestLauncher.ipa").toString())
+            val bundleId = "org.jetbrains.kotlin.KonanTestLauncher"
+            val commands = startDebugServer(udid, bundleId)
+                    .split("\n")
+                    .filter { it.isNotBlank() }
+                    .flatMap { listOf("-o", it) }
 
-        var savedOut: OutputStream? = null
-        val out = ByteArrayOutputStream()
-        val result = project.exec { execSpec: ExecSpec ->
-            action.execute(execSpec)
-            execSpec.executable = "lldb"
-            execSpec.args = commands + "-b" + "-o" + "command script import ${pythonScript()}" +
-                    "-o" + ("process launch" +
+            var savedOut: OutputStream? = null
+            val out = ByteArrayOutputStream()
+            result = project.exec { execSpec: ExecSpec ->
+                action.execute(execSpec)
+                execSpec.executable = "lldb"
+                execSpec.args = commands + "-b" + "-o" + "command script import ${pythonScript()}" +
+                        "-o" + ("process launch" +
                         (execSpec.args.takeUnless { it.isEmpty() }
                                 ?.let { " -- ${it.joinToString(" ")}" }
                                 ?: "")) +
-                    "-o" + "get_exit_code" +
-                    "-k" + "get_exit_code" +
-                    "-k" + "exit -1"
-            // A test task that uses project.exec { } sets the stdOut to parse the result,
-            // but the test executable is being run under debugger that has its own output mixed with the
-            // output from the test. Save the stdOut from the test to write the parsed output to it.
-            savedOut = execSpec.standardOutput
-            execSpec.standardOutput = out
-        }
-        out.toString()
-                .also { if (project.verboseTest) println(it) }
-                .split("\n")
-                .dropWhile { s -> !s.startsWith("(lldb) process launch") }
-                .drop(1)  // drop 'process launch' also
-                .dropLastWhile { ! it.matches(".*Process [0-9]* exited with status .*".toRegex()) }
-                .joinToString("\n") {
-                    it.replace("Process [0-9]* exited with status .*".toRegex(), "")
-                            .replace("\r", "")   // TODO: investigate: where does the \r comes from
-                }
-                .also {
-                    savedOut?.write(it.toByteArray())
-                }
+                        "-o" + "get_exit_code" +
+                        "-k" + "get_exit_code" +
+                        "-k" + "exit -1"
+                // A test task that uses project.exec { } sets the stdOut to parse the result,
+                // but the test executable is being run under debugger that has its own output mixed with the
+                // output from the test. Save the stdOut from the test to write the parsed output to it.
+                savedOut = execSpec.standardOutput
+                execSpec.standardOutput = out
+            }
+            out.toString()
+                    .also { if (project.verboseTest) println(it) }
+                    .split("\n")
+                    .dropWhile { s -> !s.startsWith("(lldb) process launch") }
+                    .drop(1)  // drop 'process launch' also
+                    .dropLastWhile { !it.matches(".*Process [0-9]* exited with status .*".toRegex()) }
+                    .joinToString("\n") {
+                        it.replace("Process [0-9]* exited with status .*".toRegex(), "")
+                                .replace("\r", "")   // TODO: investigate: where does the \r comes from
+                    }
+                    .also {
+                        savedOut?.write(it.toByteArray())
+                    }
 
-        uninstall(udid, bundleId)
-        kill()
+            uninstall(udid, bundleId)
+        } catch (exc: Exception) {
+            throw RuntimeException("iOS-device execution failed", exc)
+        } finally {
+            kill()
+        }
         return result
     }