summaryrefslogtreecommitdiff
path: root/ci
diff options
context:
space:
mode:
authorLi Haoyi <haoyi.sg@gmail.com>2018-02-11 15:39:26 -0800
committerLi Haoyi <haoyi.sg@gmail.com>2018-02-11 16:43:31 -0800
commitfcbb9c9fd65211d6d5ac40333528fa059c947d0a (patch)
treede0b6ebd7dcd9907d62954247063cfa0138681dd /ci
parent521e8cbbf5f7331fa59147445b68a858f179a9ba (diff)
downloadmill-fcbb9c9fd65211d6d5ac40333528fa059c947d0a.tar.gz
mill-fcbb9c9fd65211d6d5ac40333528fa059c947d0a.tar.bz2
mill-fcbb9c9fd65211d6d5ac40333528fa059c947d0a.zip
make test-mill-release run integration tests using the release assembly
Diffstat (limited to 'ci')
-rwxr-xr-xci/test-mill-built.sh4
-rwxr-xr-xci/test-mill-release.sh4
-rwxr-xr-xci/test-sbt-built.sh4
-rwxr-xr-xci/test-sbt.sh2
4 files changed, 7 insertions, 7 deletions
diff --git a/ci/test-mill-built.sh b/ci/test-mill-built.sh
index 216606cd..61fcf294 100755
--- a/ci/test-mill-built.sh
+++ b/ci/test-mill-built.sh
@@ -14,6 +14,6 @@ target/bin/mill devAssembly
# Second build & run tests using Mill
out/devAssembly/dest/out.jar all {main,scalalib,scalajslib}.test devAssembly
-out/devAssembly/dest/out.jar integration.test mill.integration.AmmoniteTests
-out/devAssembly/dest/out.jar integration.test "mill.integration.{AcyclicTests,BetterFilesTests,JawnTests,UpickleTests}"
+out/devAssembly/dest/out.jar integration.test mill.integration.local.AmmoniteTests
+out/devAssembly/dest/out.jar integration.test "mill.integration.local.{AcyclicTests,BetterFilesTests,JawnTests,UpickleTests}"
out/devAssembly/dest/out.jar devAssembly
diff --git a/ci/test-mill-release.sh b/ci/test-mill-release.sh
index e6f53f9a..f8e27ed4 100755
--- a/ci/test-mill-release.sh
+++ b/ci/test-mill-release.sh
@@ -18,6 +18,6 @@ git clean -xdf
# Second build & run tests using Mill
~/mill-release all {main,scalalib,scalajslib}.test
-~/mill-release integration.test mill.integration.AmmoniteTests
-~/mill-release integration.test "mill.integration.{AcyclicTests,BetterFilesTests,JawnTests,UpickleTests}"
+~/mill-release integration.test mill.integration.forked.AmmoniteTests
+~/mill-release integration.test "mill.integration.forked.{AcyclicTests,BetterFilesTests,JawnTests,UpickleTests}"
~/mill-release devAssembly
diff --git a/ci/test-sbt-built.sh b/ci/test-sbt-built.sh
index 491c5fed..b27be37f 100755
--- a/ci/test-sbt-built.sh
+++ b/ci/test-sbt-built.sh
@@ -9,6 +9,6 @@ sbt bin/test:assembly
# Run tests using Mill built using SBT
target/bin/mill all {main,scalalib,scalajslib}.test
-target/bin/mill integration.test mill.integration.AmmoniteTests
-target/bin/mill integration.test "mill.integration.{AcyclicTests,BetterFilesTests,JawnTests,UpickleTests}"
+target/bin/mill integration.test mill.integration.local.AmmoniteTests
+target/bin/mill integration.test "mill.integration.local.{AcyclicTests,BetterFilesTests,JawnTests,UpickleTests}"
target/bin/mill devAssembly
diff --git a/ci/test-sbt.sh b/ci/test-sbt.sh
index 79d93cf5..b54b39e1 100755
--- a/ci/test-sbt.sh
+++ b/ci/test-sbt.sh
@@ -7,5 +7,5 @@ git clean -xdf
# First build & run tests using SBT
sbt core/test main/test scalalib/test scalajslib/test
-sbt integration/test
+sbt "integration/test-only -- mill.integration.local"
sbt bin/test:assembly