From fcbb9c9fd65211d6d5ac40333528fa059c947d0a Mon Sep 17 00:00:00 2001 From: Li Haoyi Date: Sun, 11 Feb 2018 15:39:26 -0800 Subject: make test-mill-release run integration tests using the release assembly --- integration/test/resources/better-files/build.sc | 2 +- integration/test/src/mill/integration/AcyclicTests.scala | 3 ++- integration/test/src/mill/integration/AmmoniteTests.scala | 3 ++- integration/test/src/mill/integration/BetterFilesTests.scala | 3 ++- integration/test/src/mill/integration/IntegrationTestSuite.scala | 4 ++-- integration/test/src/mill/integration/JawnTests.scala | 3 ++- integration/test/src/mill/integration/UpickleTests.scala | 2 +- integration/test/src/mill/integration/forked/Tests.scala | 7 +++++++ integration/test/src/mill/integration/local/Tests.scala | 7 +++++++ 9 files changed, 26 insertions(+), 8 deletions(-) create mode 100644 integration/test/src/mill/integration/forked/Tests.scala create mode 100644 integration/test/src/mill/integration/local/Tests.scala (limited to 'integration') diff --git a/integration/test/resources/better-files/build.sc b/integration/test/resources/better-files/build.sc index 425e70ea..f9747343 100644 --- a/integration/test/resources/better-files/build.sc +++ b/integration/test/resources/better-files/build.sc @@ -27,7 +27,7 @@ trait BetterFilesModule extends SbtModule{ "-Xlint:nullary-unit", // Warn when nullary methods return Unit. "-Xlint:option-implicit", // Option.apply used implicit view. "-Xlint:package-object-classes", // Class or object defined in package object. - "-Xlint:poly-implicit-o¡verload", // Parameterized overloaded implicit methods are not visible as view bounds. + "-Xlint:poly-implicit-overload", // Parameterized overloaded implicit methods are not visible as view bounds. "-Xlint:private-shadow", // A private field (or class parameter) shadows a superclass field. "-Xlint:stars-align", // Pattern sequence wildcard must align with sequence component. "-Xlint:type-parameter-shadow", // A local type parameter shadows a type already in scope. diff --git a/integration/test/src/mill/integration/AcyclicTests.scala b/integration/test/src/mill/integration/AcyclicTests.scala index 42b5179b..d1035af0 100644 --- a/integration/test/src/mill/integration/AcyclicTests.scala +++ b/integration/test/src/mill/integration/AcyclicTests.scala @@ -3,7 +3,8 @@ package mill.integration import ammonite.ops._ import utest._ -object AcyclicTests extends IntegrationTestSuite("MILL_ACYCLIC_REPO", "acyclic") { +class AcyclicTests(fork: Boolean) + extends IntegrationTestSuite("MILL_ACYCLIC_REPO", "acyclic", fork) { val tests = Tests{ initWorkspace() diff --git a/integration/test/src/mill/integration/AmmoniteTests.scala b/integration/test/src/mill/integration/AmmoniteTests.scala index f5906dd2..3f04e84d 100644 --- a/integration/test/src/mill/integration/AmmoniteTests.scala +++ b/integration/test/src/mill/integration/AmmoniteTests.scala @@ -3,7 +3,8 @@ package mill.integration import ammonite.ops._ import utest._ -object AmmoniteTests extends IntegrationTestSuite("MILL_AMMONITE_REPO", "ammonite") { +class AmmoniteTests(fork: Boolean) + extends IntegrationTestSuite("MILL_AMMONITE_REPO", "ammonite", fork) { val tests = Tests{ initWorkspace() diff --git a/integration/test/src/mill/integration/BetterFilesTests.scala b/integration/test/src/mill/integration/BetterFilesTests.scala index 7ee943df..4f3116f7 100644 --- a/integration/test/src/mill/integration/BetterFilesTests.scala +++ b/integration/test/src/mill/integration/BetterFilesTests.scala @@ -3,7 +3,8 @@ package mill.integration import ammonite.ops._ import utest._ -object BetterFilesTests extends IntegrationTestSuite("MILL_BETTERFILES_REPO", "better-files") { +class BetterFilesTests(fork: Boolean) + extends IntegrationTestSuite("MILL_BETTERFILES_REPO", "better-files", fork) { val tests = Tests{ initWorkspace() 'test - { diff --git a/integration/test/src/mill/integration/IntegrationTestSuite.scala b/integration/test/src/mill/integration/IntegrationTestSuite.scala index 4edecbe5..756b724a 100644 --- a/integration/test/src/mill/integration/IntegrationTestSuite.scala +++ b/integration/test/src/mill/integration/IntegrationTestSuite.scala @@ -4,8 +4,8 @@ import ammonite.ops._ import mill.util.ScriptTestSuite import utest._ -abstract class IntegrationTestSuite(repoKey: String, val workspaceSlug: String) - extends ScriptTestSuite{ +abstract class IntegrationTestSuite(repoKey: String, val workspaceSlug: String, fork: Boolean) + extends ScriptTestSuite(fork){ val buildFilePath = pwd / 'integration / 'test / 'resources / workspaceSlug def scriptSourcePath = { // The unzipped git repo snapshots we get from github come with a diff --git a/integration/test/src/mill/integration/JawnTests.scala b/integration/test/src/mill/integration/JawnTests.scala index 21c9f133..da584e01 100644 --- a/integration/test/src/mill/integration/JawnTests.scala +++ b/integration/test/src/mill/integration/JawnTests.scala @@ -3,7 +3,8 @@ package mill.integration import ammonite.ops._ import utest._ -object JawnTests extends IntegrationTestSuite("MILL_JAWN_REPO", "jawn") { +class JawnTests(fork: Boolean) + extends IntegrationTestSuite("MILL_JAWN_REPO", "jawn", fork) { val tests = Tests{ initWorkspace() diff --git a/integration/test/src/mill/integration/UpickleTests.scala b/integration/test/src/mill/integration/UpickleTests.scala index 7c6778ad..b8aa4865 100644 --- a/integration/test/src/mill/integration/UpickleTests.scala +++ b/integration/test/src/mill/integration/UpickleTests.scala @@ -3,7 +3,7 @@ package mill.integration import ammonite.ops._ import utest._ -object UpickleTests extends IntegrationTestSuite("MILL_UPICKLE_REPO", "upickle") { +class UpickleTests(fork: Boolean) extends IntegrationTestSuite("MILL_UPICKLE_REPO", "upickle", fork) { val tests = Tests{ initWorkspace() 'test - { diff --git a/integration/test/src/mill/integration/forked/Tests.scala b/integration/test/src/mill/integration/forked/Tests.scala new file mode 100644 index 00000000..6933bbbe --- /dev/null +++ b/integration/test/src/mill/integration/forked/Tests.scala @@ -0,0 +1,7 @@ +package mill.integration.forked + +object AcyclicTests extends mill.integration.AcyclicTests(fork = true) +object AmmoniteTests extends mill.integration.AmmoniteTests(fork = true) +object BetterFilesTests extends mill.integration.BetterFilesTests(fork = true) +object JawnTests extends mill.integration.JawnTests(fork = true) +object UpickleTests extends mill.integration.UpickleTests(fork = true) \ No newline at end of file diff --git a/integration/test/src/mill/integration/local/Tests.scala b/integration/test/src/mill/integration/local/Tests.scala new file mode 100644 index 00000000..21b9581c --- /dev/null +++ b/integration/test/src/mill/integration/local/Tests.scala @@ -0,0 +1,7 @@ +package mill.integration.local + +object AcyclicTests extends mill.integration.AcyclicTests(fork = false) +object AmmoniteTests extends mill.integration.AmmoniteTests(fork = false) +object BetterFilesTests extends mill.integration.BetterFilesTests(fork = false) +object JawnTests extends mill.integration.JawnTests(fork = false) +object UpickleTests extends mill.integration.UpickleTests(fork = false) \ No newline at end of file -- cgit v1.2.3