summaryrefslogtreecommitdiff
path: root/scalaworker
diff options
context:
space:
mode:
authorLi Haoyi <haoyi.sg@gmail.com>2018-02-09 19:38:22 -0800
committerLi Haoyi <haoyi.sg@gmail.com>2018-02-09 19:38:22 -0800
commitec61701af4527429a1cf3df9a8d0b725ba11df0b (patch)
treea1a16b874b12b704608a8b1e1525ce35e18b4936 /scalaworker
parent3e6744393de81a9f0aded7412f92209831f0f9d0 (diff)
downloadmill-ec61701af4527429a1cf3df9a8d0b725ba11df0b.tar.gz
mill-ec61701af4527429a1cf3df9a8d0b725ba11df0b.tar.bz2
mill-ec61701af4527429a1cf3df9a8d0b725ba11df0b.zip
Some long-overdue renamings
Diffstat (limited to 'scalaworker')
-rw-r--r--scalaworker/src/mill/scalaworker/ScalaWorker.scala12
1 files changed, 6 insertions, 6 deletions
diff --git a/scalaworker/src/mill/scalaworker/ScalaWorker.scala b/scalaworker/src/mill/scalaworker/ScalaWorker.scala
index 9ae367e6..4430f710 100644
--- a/scalaworker/src/mill/scalaworker/ScalaWorker.scala
+++ b/scalaworker/src/mill/scalaworker/ScalaWorker.scala
@@ -36,7 +36,7 @@ object ScalaWorker{
def main(args: Array[String]): Unit = {
try{
- val result = new ScalaWorker(null, null).apply(
+ val result = new ScalaWorker(null, null).runTests(
frameworkInstance = TestRunner.framework(args(0)),
entireClasspath = Agg.from(args(1).split(" ").map(Path(_))),
testClassfilePath = Agg.from(args(2).split(" ").map(Path(_))),
@@ -230,11 +230,11 @@ class ScalaWorker(ctx0: mill.util.Ctx,
}catch{case e: CompileFailed => mill.eval.Result.Failure(e.toString)}
}
- def apply(frameworkInstance: ClassLoader => sbt.testing.Framework,
- entireClasspath: Agg[Path],
- testClassfilePath: Agg[Path],
- args: Seq[String])
- (implicit ctx: mill.util.Ctx.Log): (String, Seq[Result]) = {
+ def runTests(frameworkInstance: ClassLoader => sbt.testing.Framework,
+ entireClasspath: Agg[Path],
+ testClassfilePath: Agg[Path],
+ args: Seq[String])
+ (implicit ctx: mill.util.Ctx.Log): (String, Seq[Result]) = {
Jvm.inprocess(entireClasspath, classLoaderOverrideSbtTesting = true, cl => {
val framework = frameworkInstance(cl)