summaryrefslogtreecommitdiff
path: root/scalalib/src/mill/scalalib/TestRunner.scala
diff options
context:
space:
mode:
Diffstat (limited to 'scalalib/src/mill/scalalib/TestRunner.scala')
-rw-r--r--scalalib/src/mill/scalalib/TestRunner.scala13
1 files changed, 6 insertions, 7 deletions
diff --git a/scalalib/src/mill/scalalib/TestRunner.scala b/scalalib/src/mill/scalalib/TestRunner.scala
index 0b9c897f..42e65d63 100644
--- a/scalalib/src/mill/scalalib/TestRunner.scala
+++ b/scalalib/src/mill/scalalib/TestRunner.scala
@@ -1,5 +1,4 @@
package mill.scalalib
-import ammonite.ops.Path
import ammonite.util.Colors
import mill.Agg
import mill.modules.Jvm
@@ -40,12 +39,12 @@ object TestRunner {
System.in,
debugEnabled = false
)
- val home = Path(homeStr)
+ val home = os.Path(homeStr)
}
val result = runTests(
frameworkInstances = TestRunner.frameworks(frameworks),
- entireClasspath = Agg.from(classpath.map(Path(_))),
- testClassfilePath = Agg(Path(testCp)),
+ entireClasspath = Agg.from(classpath.map(os.Path(_))),
+ testClassfilePath = Agg(os.Path(testCp)),
args = arguments
)(ctx)
@@ -53,7 +52,7 @@ object TestRunner {
// dirtied the thread-interrupted flag and forgot to clean up. Otherwise
// that flag causes writing the results to disk to fail
Thread.interrupted()
- ammonite.ops.write(Path(outputPath), upickle.default.write(result))
+ ammonite.ops.write(os.Path(outputPath), upickle.default.write(result))
}catch{case e: Throwable =>
println(e)
e.printStackTrace()
@@ -65,8 +64,8 @@ object TestRunner {
}
def runTests(frameworkInstances: ClassLoader => Seq[sbt.testing.Framework],
- entireClasspath: Agg[Path],
- testClassfilePath: Agg[Path],
+ entireClasspath: Agg[os.Path],
+ testClassfilePath: Agg[os.Path],
args: Seq[String])
(implicit ctx: Ctx.Log with Ctx.Home): (String, Seq[mill.scalalib.TestRunner.Result]) = {
//Leave the context class loader set and open so that shutdown hooks can access it