summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoman Timushev <rtimush@gmail.com>2017-12-29 21:12:52 +0100
committerRoman Timushev <rtimush@gmail.com>2017-12-29 21:14:57 +0100
commit417f2ea33202c4dd5d3732cb9fbc6a35f8b7b4ed (patch)
tree94eb0c8f38c1b9e9c90131e1eba834822eae60ba
parent1a0cce2d21e9d90058386890f77a57291a494359 (diff)
downloadmill-417f2ea33202c4dd5d3732cb9fbc6a35f8b7b4ed.tar.gz
mill-417f2ea33202c4dd5d3732cb9fbc6a35f8b7b4ed.tar.bz2
mill-417f2ea33202c4dd5d3732cb9fbc6a35f8b7b4ed.zip
Fix running ScalaJS plugin tests from SBT
-rw-r--r--build.sbt2
-rwxr-xr-xtest.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/build.sbt b/build.sbt
index f1d795ee..716559bd 100644
--- a/build.sbt
+++ b/build.sbt
@@ -140,7 +140,7 @@ lazy val scalajsplugin = project
name := "mill-scalajsplugin",
fork in Test := true,
baseDirectory in (Test, test) := (baseDirectory in (Test, test)).value / "..",
- javaOptions in (Test, test) := bridgeProps.value.toSeq
+ javaOptions in (Test, test) := jsbridgeProps.value.toSeq
)
def jsbridge(binary: String, version: String) =
Project(
diff --git a/test.sh b/test.sh
index 691f3318..e73405ee 100755
--- a/test.sh
+++ b/test.sh
@@ -6,7 +6,7 @@ set -eux
git clean -xdf
# First build & run tests using SBT
-sbt core/test scalaplugin/test bin/test:assembly
+sbt core/test scalaplugin/test scalajsplugin/test bin/test:assembly
# Build Mill using SBT
bin/target/mill devAssembly