summaryrefslogtreecommitdiff
path: root/scalajslib
diff options
context:
space:
mode:
authorLi Haoyi <haoyi.sg@gmail.com>2018-02-02 21:48:35 -0800
committerLi Haoyi <haoyi.sg@gmail.com>2018-02-02 21:48:35 -0800
commit80c8ad730132145fc33b790657b14669f282d5b0 (patch)
treefa9d39763756cc07a3e9524cf146186cb2979516 /scalajslib
parent27273750636acbbff1b37cf53bba76684f0b96bb (diff)
downloadmill-80c8ad730132145fc33b790657b14669f282d5b0.tar.gz
mill-80c8ad730132145fc33b790657b14669f282d5b0.tar.bz2
mill-80c8ad730132145fc33b790657b14669f282d5b0.zip
- Rename `basePath` -> `millSourcePath`
- Make `T.worker`s not flush out their directories between instantiations
Diffstat (limited to 'scalajslib')
-rw-r--r--scalajslib/test/src/mill/scalajslib/HelloJSWorldTests.scala12
1 files changed, 6 insertions, 6 deletions
diff --git a/scalajslib/test/src/mill/scalajslib/HelloJSWorldTests.scala b/scalajslib/test/src/mill/scalajslib/HelloJSWorldTests.scala
index 5ba4343f..fc419e27 100644
--- a/scalajslib/test/src/mill/scalajslib/HelloJSWorldTests.scala
+++ b/scalajslib/test/src/mill/scalajslib/HelloJSWorldTests.scala
@@ -20,7 +20,7 @@ object HelloJSWorldTests extends TestSuite {
trait HelloJSWorldModule extends ScalaJSModule with PublishModule {
- override def basePath = HelloJSWorldTests.workspacePath
+ override def millSourcePath = HelloJSWorldTests.workspacePath
override def mainClass = Some("Main")
}
@@ -36,7 +36,7 @@ object HelloJSWorldTests extends TestSuite {
class BuildModuleUtest(scalaVersion0: String, sjsVersion0: String)
extends BuildModule(scalaVersion0: String, sjsVersion0: String) {
object test extends super.Tests {
- override def sources = T.input{ Agg(PathRef(basePath / 'src / 'utest)) }
+ override def sources = T.input{ Agg(PathRef(millSourcePath / 'src / 'utest)) }
def testFramework: T[String] = "utest.runner.Framework"
override def ivyDeps = Agg(
ivy"com.lihaoyi:utest_sjs${scalaJSBinaryVersion()}_${Lib.scalaBinaryVersion(scalaVersion())}:0.6.3"
@@ -48,7 +48,7 @@ object HelloJSWorldTests extends TestSuite {
class BuildModuleScalaTest(scalaVersion0: String, sjsVersion0: String)
extends BuildModule(scalaVersion0: String, sjsVersion0: String) {
object test extends super.Tests {
- override def sources = T.input{ Agg(PathRef(basePath / 'src / 'scalatest)) }
+ override def sources = T.input{ Agg(PathRef(millSourcePath / 'src / 'scalatest)) }
def testFramework: T[String] = "org.scalatest.tools.Framework"
override def ivyDeps = Agg(
ivy"org.scalatest:scalatest_sjs${scalaJSBinaryVersion()}_${Lib.scalaBinaryVersion(scalaVersion())}:3.0.4"
@@ -76,7 +76,7 @@ object HelloJSWorldTests extends TestSuite {
}
}
- val srcPath = pwd / 'scalajslib / 'test / 'resources / "hello-js-world"
+ val millSourcePath = pwd / 'scalajslib / 'test / 'resources / "hello-js-world"
val workspacePath = pwd / 'target / 'workspace / "hello-js-world"
val outputPath = workspacePath / 'out
val mainObject = workspacePath / 'src / "Main.scala"
@@ -84,7 +84,7 @@ object HelloJSWorldTests extends TestSuite {
val helloWorldEvaluator = new TestEvaluator(
HelloJSWorld,
workspacePath,
- srcPath
+ millSourcePath
)
class Console {
@@ -243,7 +243,7 @@ object HelloJSWorldTests extends TestSuite {
def prepareWorkspace(): Unit = {
rm(workspacePath)
mkdir(workspacePath / up)
- cp(srcPath, workspacePath)
+ cp(millSourcePath, workspacePath)
}
}