WIP keep mill server alive if you Ctrl-C during --watch (#339)

* wip

* Clean up more resources in the Mill client after every command

* catch and ignore SIGINT in Mill server to make it survive Ctrl-C on the client

2 files changed, 6 insertions, 4 deletions

diff --git a/main/test/src/mill/main/ClientServerTests.scala b/main/test/src/mill/main/ClientServerTests.scala
index 7ed826af..2462f650 100644
--- a/main/test/src/mill/main/ClientServerTests.scala
+++ b/main/test/src/mill/main/ClientServerTests.scala
@@ -6,14 +6,15 @@ import mill.main.client.{Util, Locks}
 
 import scala.collection.JavaConverters._
 import utest._
-class EchoServer extends ServerMain[Int]{
+class EchoServer extends MillServerMain[Int]{
   def main0(args: Array[String],
             stateCache: Option[Int],
             mainInteractive: Boolean,
             stdin: InputStream,
             stdout: PrintStream,
             stderr: PrintStream,
-            env: Map[String, String]) = {
+            env: Map[String, String],
+            setIdle: Boolean => Unit) = {
 
     val reader = new BufferedReader(new InputStreamReader(stdin))
     val str = reader.readLine()
@@ -60,7 +61,7 @@ object ClientServerTests extends TestSuite{
                   (env : Map[String, String], args: Array[String]) = {
     val (in, out, err) = initStreams()
     Server.lockBlock(locks.clientLock){
-      mill.main.client.Main.run(
+      mill.main.client.MillClientMain.run(
         tmpDir.toString,
         () => spawnEchoServer(tmpDir, locks),
         locks,
diff --git a/main/test/src/mill/util/ScriptTestSuite.scala b/main/test/src/mill/util/ScriptTestSuite.scala
index e9f31ce3..a23b34fe 100644
--- a/main/test/src/mill/util/ScriptTestSuite.scala
+++ b/main/test/src/mill/util/ScriptTestSuite.scala
@@ -16,7 +16,8 @@ abstract class ScriptTestSuite(fork: Boolean) extends TestSuite{
   val stdIn = new ByteArrayInputStream(Array())
   lazy val runner = new mill.main.MainRunner(
     ammonite.main.Cli.Config(wd = wd),
-    stdOutErr, stdOutErr, stdIn, None, Map.empty
+    stdOutErr, stdOutErr, stdIn, None, Map.empty,
+    b => ()
   )
   def eval(s: String*) = {
     if (!fork) runner.runScript(workspacePath / buildPath , s.toList)