diff options
author | Li Haoyi <haoyi.sg@gmail.com> | 2018-02-24 17:52:48 -0800 |
---|---|---|
committer | Li Haoyi <haoyi.sg@gmail.com> | 2018-02-24 20:13:37 -0800 |
commit | 0768db2c44952ff97348f5b1aebfd423ca868b33 (patch) | |
tree | 431b3f703d7f2e1a89ae2a15d93ee43914f0a6be /main | |
parent | 5d7d42659c545571b7201efce0ba6a57ab4b0935 (diff) | |
download | mill-0768db2c44952ff97348f5b1aebfd423ca868b33.tar.gz mill-0768db2c44952ff97348f5b1aebfd423ca868b33.tar.bz2 mill-0768db2c44952ff97348f5b1aebfd423ca868b33.zip |
Properly propagate exit codes from server output to client
Diffstat (limited to 'main')
-rw-r--r-- | main/src/mill/Main.scala | 4 | ||||
-rw-r--r-- | main/test/src/mill/util/ScriptTestSuite.scala | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/main/src/mill/Main.scala b/main/src/mill/Main.scala index 482de0bf..d6a908d3 100644 --- a/main/src/mill/Main.scala +++ b/main/src/mill/Main.scala @@ -48,7 +48,7 @@ object ClientMain { .start() } def main(args: Array[String]): Unit = { - Client.WithLock(1) { lockBase => + val exitCode = Client.WithLock(1) { lockBase => val c = new Client( lockBase, () => initServer(lockBase), @@ -59,7 +59,7 @@ object ClientMain { ) c.run(args) } - System.exit(0) + System.exit(exitCode) } } object ServerMain extends mill.clientserver.ServerMain[Evaluator.State]{ diff --git a/main/test/src/mill/util/ScriptTestSuite.scala b/main/test/src/mill/util/ScriptTestSuite.scala index 1f89ab8d..6bc96540 100644 --- a/main/test/src/mill/util/ScriptTestSuite.scala +++ b/main/test/src/mill/util/ScriptTestSuite.scala @@ -21,7 +21,7 @@ abstract class ScriptTestSuite(fork: Boolean) extends TestSuite{ if (!fork) runner.runScript(workspacePath / "build.sc", s.toList) else{ try { - %%(home / "mill-release", s)(workspacePath) + %%(home / "mill-release", "-i", s)(workspacePath) true }catch{case e: Throwable => false} } |