7 files changed, 30 insertions, 25 deletions
diff --git a/core/test/src/mill/define/CacherTests.scala b/core/test/src/mill/define/CacherTests.scala
index 611db8c9..077fea8d 100644
--- a/core/test/src/mill/define/CacherTests.scala
+++ b/core/test/src/mill/define/CacherTests.scala
@@ -9,6 +9,7 @@ import utest._
 import utest.framework.TestPath
 import mill.util.TestEvaluator.implicitDisover
 
+import TargetScopt.millScoptTargetReads
 object CacherTests extends TestSuite{
   object Base extends Base
   trait Base extends TestUtil.BaseModule{
@@ -27,36 +28,37 @@ object CacherTests extends TestSuite{
 
   val tests = Tests{
     def eval[T <: TestUtil.BaseModule, V](mapping: T, v: Task[V])
-                                 (implicit discover: Discover[T], tp: TestPath) = {
+                                         (implicit discover: Discover[T], tp: TestPath) = {
       val evaluator = new TestEvaluator(mapping)
       evaluator(v).right.get._1
     }
+    def check(x: Any, y: Any) = assert(x == y)
 
-    'simpleDefIsCached - assert(
-      Base.value eq Base.value,
-      eval(Base, Base.value) == 1
-    )
+    'simpleDefIsCached - {
+      Predef.assert(Base.value eq Base.value)
+      Predef.assert(eval(Base, Base.value) == 1)
+    }
 
-    'resultDefIsCached - assert(
-      Base.result eq Base.result,
-      eval(Base, Base.result) == 1
-    )
+    'resultDefIsCached - {
+      Predef.assert(Base.result eq Base.result)
+      Predef.assert(eval(Base, Base.result) == 1)
+    }
 
 
-    'overridingDefIsAlsoCached - assert(
-      eval(Middle, Middle.value) == 3,
-      Middle.value eq Middle.value
-    )
+    'overridingDefIsAlsoCached - {
+      Predef.assert(eval(Middle, Middle.value) == 3)
+      Predef.assert(Middle.value eq Middle.value)
+    }
 
-    'overridenDefRemainsAvailable - assert(
-      eval(Middle, Middle.overriden) == 1
-    )
+    'overridenDefRemainsAvailable - {
+      Predef.assert(eval(Middle, Middle.overriden) == 1)
+    }
 
 
-    'multipleOverridesWork- assert(
-      eval(Terminal, Terminal.value) == 7,
-      eval(Terminal, Terminal.overriden) == 1
-    )
+    'multipleOverridesWork- {
+      Predef.assert(eval(Terminal, Terminal.value) == 7)
+      Predef.assert(eval(Terminal, Terminal.overriden) == 1)
+    }
     //    Doesn't fail, presumably compileError doesn't go far enough in the
     //    compilation pipeline to hit the override checks
     //
diff --git a/core/test/src/mill/eval/CrossTests.scala b/core/test/src/mill/eval/CrossTests.scala
index c9f7cb70..4e772a40 100644
--- a/core/test/src/mill/eval/CrossTests.scala
+++ b/core/test/src/mill/eval/CrossTests.scala
@@ -1,13 +1,12 @@
 package mill.eval
 
 import ammonite.ops._
-
-import mill.define.Discover
+import mill.define.{Discover, TargetScopt}
 import mill.util.TestEvaluator
 import mill.util.TestEvaluator.implicitDisover
 import mill.util.TestGraphs.{crossResolved, doubleCross, nestedCrosses, singleCross}
 import utest._
-
+import TargetScopt.millScoptTargetReads
 object CrossTests extends TestSuite{
   val tests = Tests{
     'singleCross - {
diff --git a/core/test/src/mill/eval/EvaluationTests.scala b/core/test/src/mill/eval/EvaluationTests.scala
index 9c4ace41..e5f0e57d 100644
--- a/core/test/src/mill/eval/EvaluationTests.scala
+++ b/core/test/src/mill/eval/EvaluationTests.scala
@@ -10,6 +10,7 @@ import utest._
 import utest.framework.TestPath
 import mill.util.TestEvaluator.implicitDisover
 import ammonite.ops._
+
 object EvaluationTests extends TestSuite{
   class Checker[T <: TestUtil.BaseModule](module: T)
                                         (implicit tp: TestPath, discover: Discover[T]) {
@@ -52,7 +53,7 @@ object EvaluationTests extends TestSuite{
 
 
   val tests = Tests{
-    val graphs = new TestGraphs()
+    object graphs extends TestGraphs()
     import graphs._
     import TestGraphs._
     'evaluateSingle - {
diff --git a/core/test/src/mill/eval/FailureTests.scala b/core/test/src/mill/eval/FailureTests.scala
index 91b1851d..6bf53f7c 100644
--- a/core/test/src/mill/eval/FailureTests.scala
+++ b/core/test/src/mill/eval/FailureTests.scala
@@ -6,6 +6,7 @@ import mill.eval.Result.OuterStack
 import utest._
 import utest.framework.TestPath
 import mill.util.TestEvaluator.implicitDisover
+import mill.define.TargetScopt.millScoptTargetReads
 object FailureTests extends TestSuite{
 
   val tests = Tests{
diff --git a/core/test/src/mill/eval/ModuleTests.scala b/core/test/src/mill/eval/ModuleTests.scala
index c6061abb..278b46cc 100644
--- a/core/test/src/mill/eval/ModuleTests.scala
+++ b/core/test/src/mill/eval/ModuleTests.scala
@@ -6,7 +6,7 @@ import mill.T
 import mill.define.Discover
 import mill.util.TestEvaluator.implicitDisover
 import utest._
-
+import mill.define.TargetScopt.millScoptTargetReads
 
 object ModuleTests extends TestSuite{
   object ExternalModule extends mill.define.ExternalModule {
diff --git a/core/test/src/mill/eval/TaskTests.scala b/core/test/src/mill/eval/TaskTests.scala
index 114a2910..ea82677d 100644
--- a/core/test/src/mill/eval/TaskTests.scala
+++ b/core/test/src/mill/eval/TaskTests.scala
@@ -5,6 +5,7 @@ import ammonite.ops._
 import mill.T
 import mill.util.TestEvaluator.implicitDisover
 import mill.util.TestEvaluator
+import mill.define.TargetScopt.millScoptTargetReads
 object TaskTests extends TestSuite{
   val tests = Tests{
     object build extends mill.util.TestUtil.BaseModule{
diff --git a/core/test/src/mill/main/MainTests.scala b/core/test/src/mill/main/MainTests.scala
index 22f93ae0..e1a419cb 100644
--- a/core/test/src/mill/main/MainTests.scala
+++ b/core/test/src/mill/main/MainTests.scala
@@ -4,6 +4,7 @@ import mill.define.{Discover, Segment, Task}
 import mill.util.TestGraphs._
 import mill.util.TestEvaluator.implicitDisover
 import utest._
+import mill.define.TargetScopt.millScoptTargetReads
 object MainTests extends TestSuite{
 
   def check[T <: mill.Module](module: T)(