summaryrefslogtreecommitdiff
path: root/core/test
diff options
context:
space:
mode:
authorLi Haoyi <haoyi.sg@gmail.com>2018-02-02 22:10:16 -0800
committerLi Haoyi <haoyi.sg@gmail.com>2018-02-02 23:04:04 -0800
commitde2016a970b1e4bcd2f618815edc616282f7f20e (patch)
tree02b1207d7f6e5ddedaf6c4047ea94c8621af2b30 /core/test
parent80c8ad730132145fc33b790657b14669f282d5b0 (diff)
downloadmill-de2016a970b1e4bcd2f618815edc616282f7f20e.tar.gz
mill-de2016a970b1e4bcd2f618815edc616282f7f20e.tar.bz2
mill-de2016a970b1e4bcd2f618815edc616282f7f20e.zip
use an implicit to indicate whether a ctx is within an external module
Diffstat (limited to 'core/test')
-rw-r--r--core/test/src/mill/eval/ModuleTests.scala3
-rw-r--r--core/test/src/mill/util/TestEvaluator.scala4
2 files changed, 4 insertions, 3 deletions
diff --git a/core/test/src/mill/eval/ModuleTests.scala b/core/test/src/mill/eval/ModuleTests.scala
index 56c1a47b..db70fee3 100644
--- a/core/test/src/mill/eval/ModuleTests.scala
+++ b/core/test/src/mill/eval/ModuleTests.scala
@@ -18,10 +18,11 @@ object ModuleTests extends TestSuite{
def z = T{ ExternalModule.x() + ExternalModule.inner.y() }
}
val tests = Tests {
+ rm(TestEvaluator.externalOutPath)
'externalModuleTargetsAreNamespacedByModulePackagePath - {
val check = new TestEvaluator(
Build,
- pwd / 'target / 'workspace / "module-tests" / "externalModule",
+ pwd / 'target / 'external,
pwd
)
diff --git a/core/test/src/mill/util/TestEvaluator.scala b/core/test/src/mill/util/TestEvaluator.scala
index 26577f3e..416ed71c 100644
--- a/core/test/src/mill/util/TestEvaluator.scala
+++ b/core/test/src/mill/util/TestEvaluator.scala
@@ -16,8 +16,8 @@ class TestEvaluator[T <: TestUtil.TestBuild](module: T,
workspacePath: Path,
millSourcePath: Path)
(implicit discover: Discover[T]){
- val logger = DummyLogger
-// val logger = new PrintLogger(true, ammonite.util.Colors.Default, System.out, System.out, System.err)
+// val logger = DummyLogger
+ val logger = new PrintLogger(true, ammonite.util.Colors.Default, System.out, System.out, System.err)
val evaluator = new Evaluator(workspacePath, millSourcePath, TestEvaluator.externalOutPath, module, discover, logger)
def apply[T](t: Task[T]): Either[Result.Failing, (T, Int)] = {