summaryrefslogtreecommitdiff
path: root/scalalib/test
diff options
context:
space:
mode:
authorLi Haoyi <haoyi.sg@gmail.com>2018-01-21 23:35:52 -0800
committerLi Haoyi <haoyi.sg@gmail.com>2018-01-21 23:35:52 -0800
commit4a0658da074bc7b7df0c5bdff90e2c6bb1977b15 (patch)
tree59d077d40a7e96b419161f5b10cb17d326a51f9f /scalalib/test
parent3e80ade3249bc83b564d7b5bd31853c8affd555d (diff)
downloadmill-4a0658da074bc7b7df0c5bdff90e2c6bb1977b15.tar.gz
mill-4a0658da074bc7b7df0c5bdff90e2c6bb1977b15.tar.bz2
mill-4a0658da074bc7b7df0c5bdff90e2c6bb1977b15.zip
- Make `forkTest` and `forkRun` the default, renaming `test` and `run` to `testLocal` and `runLocal`
- Support passing `forkEnv` parameters to `test` and `run`, necessary to get Ammonite working - Standardize signatures of `Jvm.interactiveSubprocess`/`Jvm.subprocess` - `Jvm.inprocess` is now `Jvm.runLocal` - Swap `TestModule.testLocal` over to using `Jvm.runLocal`, for consistency with everything else
Diffstat (limited to 'scalalib/test')
-rw-r--r--scalalib/test/src/mill/scalalib/HelloWorldTests.scala8
1 files changed, 4 insertions, 4 deletions
diff --git a/scalalib/test/src/mill/scalalib/HelloWorldTests.scala b/scalalib/test/src/mill/scalalib/HelloWorldTests.scala
index 8ac45bf3..1c22c578 100644
--- a/scalalib/test/src/mill/scalalib/HelloWorldTests.scala
+++ b/scalalib/test/src/mill/scalalib/HelloWorldTests.scala
@@ -267,7 +267,7 @@ object HelloWorldTests extends TestSuite {
'runIfMainClassProvided - {
val runResult = basePath / 'out / 'run / 'dest / "hello-mill"
val Right((_, evalCount)) = helloWorldWithMainEvaluator(
- HelloWorldWithMain.forkRun(runResult.toString)
+ HelloWorldWithMain.run(runResult.toString)
)
assert(evalCount > 0)
@@ -279,7 +279,7 @@ object HelloWorldTests extends TestSuite {
)
}
'notRunWithoutMainClass - {
- val Left(Result.Exception(err, _)) = helloWorldEvaluator(HelloWorld.forkRun())
+ val Left(Result.Exception(err, _)) = helloWorldEvaluator(HelloWorld.run())
assert(
err.isInstanceOf[RuntimeException]
@@ -290,7 +290,7 @@ object HelloWorldTests extends TestSuite {
'runIfMainClassProvided - {
val runResult = basePath / 'out / 'run / 'dest / "hello-mill"
val Right((_, evalCount)) = helloWorldWithMainEvaluator(
- HelloWorldWithMain.run(runResult.toString)
+ HelloWorldWithMain.runLocal(runResult.toString)
)
assert(evalCount > 0)
@@ -302,7 +302,7 @@ object HelloWorldTests extends TestSuite {
)
}
'notRunWithoutMainClass - {
- val Left(Result.Exception(err, _)) = helloWorldEvaluator(HelloWorld.run())
+ val Left(Result.Exception(err, _)) = helloWorldEvaluator(HelloWorld.runLocal())
assert(
err.isInstanceOf[RuntimeException]