After review changes

Flank · Mar 9, 2020 · b9ce727 · b9ce727
1 parent cc3d31e
commit b9ce727
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 9 deletions.
diff --git a/test_runner/src/main/kotlin/ftl/Main.kt b/test_runner/src/main/kotlin/ftl/Main.kt
@@ -49,7 +49,12 @@ class Main : Runnable {
             // BugSnag opens a non-daemon thread which will keep the JVM process alive.
             // Flank must invoke exitProcess to exit cleanly.
             // https://github.com/bugsnag/bugsnag-java/issues/151
-            exitProcess(CommandLine(Main()).execute(*args))
+            try {
+                exitProcess(CommandLine(Main()).execute(*args))
+            } catch (t: Throwable) {
+                t.printStackTrace()
+                exitProcess(CommandLine.ExitCode.SOFTWARE)
+            }
         }
     }
 }
diff --git a/test_runner/src/test/kotlin/Debug.kt b/test_runner/src/test/kotlin/Debug.kt
@@ -15,12 +15,19 @@ fun main() {
 
     // Bugsnag keeps the process alive so we must call exitProcess
     // https://github.com/bugsnag/bugsnag-java/issues/151
-    exitProcess(CommandLine(Main()).execute(
-        "--debug",
-        "firebase", "test",
-        "android", "run",
-        "--dry",
-        "-c=src/test/kotlin/ftl/fixtures/test_app_cases/flank-$quantity-$type.yml",
-        "--project=$projectId"
-    ))
+    try {
+        exitProcess(
+            CommandLine(Main()).execute(
+                "--debug",
+                "firebase", "test",
+                "android", "run",
+                "--dry",
+                "-c=src/test/kotlin/ftl/fixtures/test_app_cases/flank-$quantity-$type.yml",
+                "--project=$projectId"
+            )
+        )
+    } catch (t: Throwable) {
+        t.printStackTrace()
+        exitProcess(CommandLine.ExitCode.SOFTWARE)
+    }
 }