diff options
| author | Tobias Roeser <le.petit.fou@web.de> | 2018-12-10 11:46:09 +0100 |
|---|---|---|
| committer | Tobias Roeser <le.petit.fou@web.de> | 2019-05-03 14:07:14 +0200 |
| commit | 18031fef5bc169e9b603a8867b0e2edeeeb87780 (patch) | |
| tree | ceac09e3b49cc4f2e8944b1bc6dc451fbbe585f2 /main/test | |
| parent | 38fce64bb4884ba0e6cf8509245bca769c03ce1b (diff) | |
| download | mill-18031fef5bc169e9b603a8867b0e2edeeeb87780.tar.gz mill-18031fef5bc169e9b603a8867b0e2edeeeb87780.tar.bz2 mill-18031fef5bc169e9b603a8867b0e2edeeeb87780.zip | |
Accept sysprops via cmdline and forward to mill server
See https://github.com/lihaoyi/mill/issues/498
See https://github.com/lihaoyi/mill/issues/499
Diffstat (limited to 'main/test')
| -rw-r--r-- | main/test/src/main/ClientServerTests.scala | 6 | ||||
| -rw-r--r-- | main/test/src/util/ScriptTestSuite.scala | 3 |
2 files changed, 7 insertions, 2 deletions
diff --git a/main/test/src/main/ClientServerTests.scala b/main/test/src/main/ClientServerTests.scala index 05238a5f..6d918b30 100644 --- a/main/test/src/main/ClientServerTests.scala +++ b/main/test/src/main/ClientServerTests.scala @@ -13,7 +13,8 @@ class EchoServer extends MillServerMain[Int]{ stdout: PrintStream, stderr: PrintStream, env: Map[String, String], - setIdle: Boolean => Unit) = { + setIdle: Boolean => Unit, + systemProperties: Map[String, String]) = { val reader = new BufferedReader(new InputStreamReader(stdin)) val str = reader.readLine() @@ -23,6 +24,9 @@ class EchoServer extends MillServerMain[Int]{ env.toSeq.sortBy(_._1).foreach{ case (key, value) => stdout.println(s"$key=$value") } + systemProperties.toSeq.sortBy(_._1).foreach{ + case (key, value) => stdout.println(s"$key=$value") + } stdout.flush() if (args.nonEmpty){ stderr.println(str.toUpperCase + args(0)) diff --git a/main/test/src/util/ScriptTestSuite.scala b/main/test/src/util/ScriptTestSuite.scala index 92f57c4f..f3850dda 100644 --- a/main/test/src/util/ScriptTestSuite.scala +++ b/main/test/src/util/ScriptTestSuite.scala @@ -16,10 +16,11 @@ abstract class ScriptTestSuite(fork: Boolean) extends TestSuite{ val disableTicker = false val debugLog = false val keepGoing = false + val systemProperties = Map[String, String]() lazy val runner = new mill.main.MainRunner( ammonite.main.Cli.Config(wd = wd), disableTicker, stdOutErr, stdOutErr, stdIn, None, Map.empty, - b => (), debugLog, keepGoing = keepGoing + b => (), debugLog, keepGoing = keepGoing, systemProperties ) def eval(s: String*) = { if (!fork) runner.runScript(workspacePath / buildPath , s.toList) |