diff options
| author | Li Haoyi <haoyi.sg@gmail.com> | 2018-04-07 20:06:58 -0700 |
|---|---|---|
| committer | Li Haoyi <haoyi.sg@gmail.com> | 2018-04-07 20:25:39 -0700 |
| commit | 5b598b7ee7cdec3bccf797c9a5f7ddd768ec62c2 (patch) | |
| tree | e21f137fac4618f99afe6333c2d33ac118ec6e06 | |
| parent | d593d9eda38f371b642d5ca4d882c87833e91b47 (diff) | |
| download | mill-5b598b7ee7cdec3bccf797c9a5f7ddd768ec62c2.tar.gz mill-5b598b7ee7cdec3bccf797c9a5f7ddd768ec62c2.tar.bz2 mill-5b598b7ee7cdec3bccf797c9a5f7ddd768ec62c2.zip | |
remove clientserver from ci since those tests are now in main
| -rwxr-xr-x | ci/test-mill-0.sh | 2 | ||||
| -rwxr-xr-x | ci/test-mill-bootstrap.sh | 2 | ||||
| -rwxr-xr-x | ci/test-mill-dev.sh | 2 | ||||
| -rw-r--r-- | main/test/src/mill/main/ClientServerTests.scala | 3 | ||||
| -rw-r--r-- | scalalib/src/mill/scalalib/JavaModule.scala | 2 |
5 files changed, 6 insertions, 5 deletions
diff --git a/ci/test-mill-0.sh b/ci/test-mill-0.sh index 2cc78d81..91a1ebf3 100755 --- a/ci/test-mill-0.sh +++ b/ci/test-mill-0.sh @@ -6,4 +6,4 @@ set -eux git clean -xdf # Run tests -mill -i all {clientserver,main,scalalib,scalajslib}.test +mill -i all {main,scalalib,scalajslib}.test diff --git a/ci/test-mill-bootstrap.sh b/ci/test-mill-bootstrap.sh index 537e51f5..8010e700 100755 --- a/ci/test-mill-bootstrap.sh +++ b/ci/test-mill-bootstrap.sh @@ -27,4 +27,4 @@ git clean -xdf rm -rf ~/.mill # Use second build to run tests using Mill -~/mill-2 -i all {clientserver,main,scalalib,scalajslib}.test
\ No newline at end of file +~/mill-2 -i all {main,scalalib,scalajslib}.test
\ No newline at end of file diff --git a/ci/test-mill-dev.sh b/ci/test-mill-dev.sh index f2d82724..459f3eb1 100755 --- a/ci/test-mill-dev.sh +++ b/ci/test-mill-dev.sh @@ -11,5 +11,5 @@ mill -i dev.assembly rm -rf ~/.mill # Second build & run tests -out/dev/assembly/dest/mill -i all {clientserver,main,scalalib,scalajslib}.test +out/dev/assembly/dest/mill -i all {main,scalalib,scalajslib}.test diff --git a/main/test/src/mill/main/ClientServerTests.scala b/main/test/src/mill/main/ClientServerTests.scala index 3ca7c737..d18c01b2 100644 --- a/main/test/src/mill/main/ClientServerTests.scala +++ b/main/test/src/mill/main/ClientServerTests.scala @@ -3,6 +3,7 @@ package mill.main import java.io._ import java.nio.file.Path +import mill.client.Locks import utest._ class EchoServer extends ServerMain[Int]{ def main0(args: Array[String], @@ -54,7 +55,7 @@ object ClientServerTests extends TestSuite{ def runClient(arg: String) = { val (in, out, err) = initStreams() Server.lockBlock(locks.clientLock){ - Client.run( + mill.client.Main.run( tmpDir.toString, () => spawnEchoServer(), locks, diff --git a/scalalib/src/mill/scalalib/JavaModule.scala b/scalalib/src/mill/scalalib/JavaModule.scala index f7dc48fa..633758e7 100644 --- a/scalalib/src/mill/scalalib/JavaModule.scala +++ b/scalalib/src/mill/scalalib/JavaModule.scala @@ -195,7 +195,7 @@ trait JavaModule extends mill.Module with TaskModule { outer => ) ++ options ++ Seq( "-classpath", - compileClasspath().filter(_.path.ext != "pom").mkString(java.io.File.pathSeparator) + compileClasspath().map(_.path).filter(_.ext != "pom").mkString(java.io.File.pathSeparator) ) ++ files.map(_.toString), envArgs = Map(), |