From 8986f9755a026691d1839bac806b0b75c2e3e74d Mon Sep 17 00:00:00 2001 From: Li Haoyi Date: Fri, 26 Jan 2018 17:53:47 -0800 Subject: Fix `dest`-assignment for overriden `T.command`s, and add basic unit tests to validate the `dest` paths of overriden commands and overriden targets --- scalalib/test/src/mill/scalalib/GenIdeaTests.scala | 3 ++- scalalib/test/src/mill/scalalib/HelloWorldTests.scala | 8 +++++++- 2 files changed, 9 insertions(+), 2 deletions(-) (limited to 'scalalib/test') diff --git a/scalalib/test/src/mill/scalalib/GenIdeaTests.scala b/scalalib/test/src/mill/scalalib/GenIdeaTests.scala index 3bafcfe3..d49e6a1c 100644 --- a/scalalib/test/src/mill/scalalib/GenIdeaTests.scala +++ b/scalalib/test/src/mill/scalalib/GenIdeaTests.scala @@ -2,7 +2,7 @@ package mill.scalalib import ammonite.ops._ import mill._ - +import mill.define.Discover import mill.util.{TestEvaluator, TestUtil} import utest._ @@ -21,6 +21,7 @@ object GenIdeaTests extends TestSuite { val helloWorldEvaluator = new TestEvaluator( HelloWorld, + Discover[HelloWorld.type], outPath, workingSrcPath ) diff --git a/scalalib/test/src/mill/scalalib/HelloWorldTests.scala b/scalalib/test/src/mill/scalalib/HelloWorldTests.scala index 0f2826bb..85e53703 100644 --- a/scalalib/test/src/mill/scalalib/HelloWorldTests.scala +++ b/scalalib/test/src/mill/scalalib/HelloWorldTests.scala @@ -5,7 +5,7 @@ import java.util.jar.JarFile import ammonite.ops._ import ammonite.ops.ImplicitWd._ import mill._ -import mill.define.Target +import mill.define.{Discover, Target} import mill.eval.{Evaluator, Result} import mill.scalalib.publish._ import mill.util.{TestEvaluator, TestUtil} @@ -84,31 +84,37 @@ object HelloWorldTests extends TestSuite { val helloWorldEvaluator = new TestEvaluator( HelloWorld, + Discover[HelloWorld.type], outPath, workingSrcPath ) val helloWorldWithMainEvaluator = new TestEvaluator( HelloWorldWithMain, + Discover[HelloWorldWithMain.type], outPath, workingSrcPath ) val helloWorldWithMainAssemblyEvaluator = new TestEvaluator( HelloWorldWithMainAssembly, + Discover[HelloWorldWithMainAssembly.type], outPath, workingSrcPath ) val helloWorldFatalEvaluator = new TestEvaluator( HelloWorldFatalWarnings, + Discover[HelloWorldFatalWarnings.type], outPath, workingSrcPath ) val helloWorldOverrideEvaluator = new TestEvaluator( HelloWorldScalaOverride, + Discover[HelloWorldScalaOverride.type], outPath, workingSrcPath ) val helloWorldCrossEvaluator = new TestEvaluator( CrossHelloWorld, + Discover[CrossHelloWorld.type], outPath, workingSrcPath ) -- cgit v1.2.3