summaryrefslogtreecommitdiff
path: root/main/test/src/mill/util
diff options
context:
space:
mode:
authorLi Haoyi <haoyi.sg@gmail.com>2018-02-20 22:19:11 -0800
committerLi Haoyi <haoyi.sg@gmail.com>2018-02-21 09:08:24 -0800
commit9d22d7127b8e49c007100f0173e01a35b2e68540 (patch)
tree9257e46d0b341b609c6f3e9296764cccadb5714b /main/test/src/mill/util
parent0573f06a4d82010935ab5a3f784bdbabdbc772b1 (diff)
downloadmill-9d22d7127b8e49c007100f0173e01a35b2e68540.tar.gz
mill-9d22d7127b8e49c007100f0173e01a35b2e68540.tar.bz2
mill-9d22d7127b8e49c007100f0173e01a35b2e68540.zip
fix-tests
Diffstat (limited to 'main/test/src/mill/util')
-rw-r--r--main/test/src/mill/util/TestEvaluator.scala9
-rw-r--r--main/test/src/mill/util/TestGraphs.scala7
2 files changed, 8 insertions, 8 deletions
diff --git a/main/test/src/mill/util/TestEvaluator.scala b/main/test/src/mill/util/TestEvaluator.scala
index b35ebeb8..be91abaa 100644
--- a/main/test/src/mill/util/TestEvaluator.scala
+++ b/main/test/src/mill/util/TestEvaluator.scala
@@ -11,20 +11,17 @@ import utest.framework.TestPath
import language.experimental.macros
object TestEvaluator{
- implicit def implicitDisover[T]: Discover[T] = macro applyImpl[T]
val externalOutPath = pwd / 'target / 'external
def static[T <: TestUtil.BaseModule](module: T)
- (implicit discover: Discover[T],
- fullName: sourcecode.FullName) = {
- new TestEvaluator[T](module)(discover, fullName, TestPath(Nil))
+ (implicit fullName: sourcecode.FullName) = {
+ new TestEvaluator[T](module)(fullName, TestPath(Nil))
}
}
class TestEvaluator[T <: TestUtil.BaseModule](module: T)
- (implicit discover: Discover[T],
- fullName: sourcecode.FullName,
+ (implicit fullName: sourcecode.FullName,
tp: TestPath){
val outPath = TestUtil.getOutPath()
diff --git a/main/test/src/mill/util/TestGraphs.scala b/main/test/src/mill/util/TestGraphs.scala
index 581d5e0a..20f5c9ef 100644
--- a/main/test/src/mill/util/TestGraphs.scala
+++ b/main/test/src/mill/util/TestGraphs.scala
@@ -1,6 +1,6 @@
package mill.util
import TestUtil.test
-import mill.define.Cross
+import mill.define.{Cross, Discover}
import mill.{Module, T}
/**
@@ -180,6 +180,7 @@ object TestGraphs{
object canOverrideSuper extends TestUtil.BaseModule with BaseModule {
override def foo = T{ super.foo() ++ Seq("object") }
override def cmd(i: Int) = T.command{ super.cmd(i)() ++ Seq("object" + i) }
+ def millDiscover: Discover[this.type] = Discover[this.type]
}
trait TraitWithModule extends Module{ outer =>
@@ -191,7 +192,9 @@ object TestGraphs{
// Make sure nested objects inherited from traits work
- object TraitWithModuleObject extends TestUtil.BaseModule with TraitWithModule
+ object TraitWithModuleObject extends TestUtil.BaseModule with TraitWithModule{
+ def millDiscover: Discover[this.type] = Discover[this.type]
+ }
object singleCross extends TestUtil.BaseModule {