summaryrefslogtreecommitdiff
path: root/clientserver/test
diff options
context:
space:
mode:
authorLi Haoyi <haoyi.sg@gmail.com>2018-02-26 21:35:32 -0800
committerLi Haoyi <haoyi.sg@gmail.com>2018-02-26 21:52:42 -0800
commitfd8a2567ad32c11bcf8adbaca85bdba72bb4f935 (patch)
tree618d27157adab6508a4a6804e5c857975fcfb8cd /clientserver/test
parent02e64b943b90387993f8f7bd7e3cd265ee569d27 (diff)
downloadmill-fd8a2567ad32c11bcf8adbaca85bdba72bb4f935.tar.gz
mill-fd8a2567ad32c11bcf8adbaca85bdba72bb4f935.tar.bz2
mill-fd8a2567ad32c11bcf8adbaca85bdba72bb4f935.zip
Port Mill client over to Java
This helps us avoid accidentally depending on the Scala library, whose classloading takes tens to hundreds of milliseconds. This removes the last parts of the Scala library used in the client (e.g. lambdas) and reduces `mill show core.compile` from ~380ms to ~290ms
Diffstat (limited to 'clientserver/test')
-rw-r--r--clientserver/test/src/mill/clientserver/ClientServerTests.scala10
1 files changed, 5 insertions, 5 deletions
diff --git a/clientserver/test/src/mill/clientserver/ClientServerTests.scala b/clientserver/test/src/mill/clientserver/ClientServerTests.scala
index ed9a49d9..2c9a57b0 100644
--- a/clientserver/test/src/mill/clientserver/ClientServerTests.scala
+++ b/clientserver/test/src/mill/clientserver/ClientServerTests.scala
@@ -30,7 +30,7 @@ object ClientServerTests extends TestSuite{
}
def init() = {
val tmpDir = java.nio.file.Files.createTempDirectory("")
- val locks = new MemoryLocks()
+ val locks = Locks.memory()
(tmpDir, locks)
}
@@ -52,16 +52,16 @@ object ClientServerTests extends TestSuite{
def runClient(arg: String) = {
val (in, out, err) = initStreams()
- locks.clientLock.lockBlock{
- val c = new Client(
+ Server.lockBlock(locks.clientLock){
+ Client.run(
tmpDir.toString,
() => spawnEchoServer(),
locks,
in,
out,
- err
+ err,
+ Array(arg)
)
- c.run(Array(arg))
Thread.sleep(100)
(new String(out.toByteArray), new String(err.toByteArray))
}