Acyclic test suite works now that we can fork and set a proper working directory, but only when run alone (???)

2 files changed, 45 insertions, 8 deletions

diff --git a/scalaplugin/src/main/scala/mill/scalaplugin/ScalaModule.scala b/scalaplugin/src/main/scala/mill/scalaplugin/ScalaModule.scala
index 53c98be1..504fe93e 100644
--- a/scalaplugin/src/main/scala/mill/scalaplugin/ScalaModule.scala
+++ b/scalaplugin/src/main/scala/mill/scalaplugin/ScalaModule.scala
@@ -2,19 +2,21 @@ package mill
 package scalaplugin
 
 import java.io.File
+import java.net.URLClassLoader
 import java.util.Optional
 
 import ammonite.ops._
 import coursier.{Cache, Fetch, MavenRepository, Repository, Resolution}
 import mill.define.Task
 import mill.define.Task.{Module, TaskModule}
-import mill.eval.PathRef
+import mill.eval.{PathRef, Result}
+import mill.modules.Jvm
 import mill.modules.Jvm.{createAssembly, createJar, subprocess}
 import sbt.internal.inc._
 import sbt.internal.util.{ConsoleOut, MainAppender}
 import sbt.util.{InterfaceUtil, LogExchange}
 import xsbti.compile.{CompilerCache => _, FileAnalysisStore => _, ScalaInstance => _, _}
-
+import mill.util.JsonFormatters._
 
 
 
@@ -165,13 +167,39 @@ import ScalaModule._
 trait TestScalaModule extends ScalaModule with TaskModule {
   override def defaultCommandName() = "test"
   def testFramework: T[String]
+
+  def forkWorkingDir = ammonite.ops.pwd
+  def forkTest(args: String*) = T.command{
+    val outputPath = tmp.dir()/"out.json"
+    Jvm.subprocess(
+      "mill.scalaplugin.TestRunner",
+      getClass.getClassLoader.asInstanceOf[URLClassLoader].getURLs.toList.map(
+        u => Path(new java.io.File(u.toURI))
+      ),
+      Seq(
+        testFramework(),
+        (runDepClasspath().map(_.path) :+ compile().path).mkString(" "),
+        Seq(compile().path).mkString(" "),
+        args.mkString(" "),
+        outputPath.toString
+      ),
+      workingDir = forkWorkingDir
+    )
+    upickle.default.read[Option[String]](ammonite.ops.read(outputPath)) match{
+      case Some(errMsg) => Result.Failure(errMsg)
+      case None => Result.Success(())
+    }
+  }
   def test(args: String*) = T.command{
     TestRunner(
       testFramework(),
       runDepClasspath().map(_.path) :+ compile().path,
       Seq(compile().path),
       args
-    )
+    ) match{
+      case Some(errMsg) => Result.Failure(errMsg)
+      case None => Result.Success(())
+    }
   }
 }
 trait ScalaModule extends Module with TaskModule{ outer =>
diff --git a/scalaplugin/src/main/scala/mill/scalaplugin/TestRunner.scala b/scalaplugin/src/main/scala/mill/scalaplugin/TestRunner.scala
index 09e41a74..03292b68 100644
--- a/scalaplugin/src/main/scala/mill/scalaplugin/TestRunner.scala
+++ b/scalaplugin/src/main/scala/mill/scalaplugin/TestRunner.scala
@@ -37,11 +37,20 @@ object TestRunner {
     }
     testClasses
   }
-
+  def main(args: Array[String]): Unit = {
+    val result = apply(
+      frameworkName = args(0),
+      entireClasspath = args(1).split(" ").map(Path(_)),
+      testClassfilePath = args(2).split(" ").map(Path(_)),
+      args = args(3) match{ case "" => Nil case x => x.split(" ").toList }
+    )
+    val outputPath = args(4)
+    ammonite.ops.write(Path(outputPath), upickle.default.write(result))
+  }
   def apply(frameworkName: String,
             entireClasspath: Seq[Path],
             testClassfilePath: Seq[Path],
-            args: Seq[String]): mill.eval.Result[Unit] = {
+            args: Seq[String]): Option[String] = {
     val outerClassLoader = getClass.getClassLoader
     val cl = new URLClassLoader(
       entireClasspath.map(_.toIO.toURI.toURL).toArray,
@@ -93,13 +102,13 @@ object TestRunner {
     }
     val doneMsg = runner.done()
     val msg =
-      if (doneMsg.trim.nonEmpty)doneMsg
+      if (doneMsg.trim.nonEmpty) doneMsg
       else{
         val grouped = events.groupBy(x => x).mapValues(_.length).filter(_._2 != 0).toList.sorted
         grouped.map{case (k, v) => k + ": " + v}.mkString(",")
       }
     println(msg)
-    if (events.count(Set(Status.Error, Status.Failure)) == 0) mill.eval.Result.Success(())
-    else mill.eval.Result.Failure(msg)
+    if (events.count(Set(Status.Error, Status.Failure)) == 0) None
+    else Some(msg)
   }
 }