diff options
| author | Li Haoyi <haoyi.sg@gmail.com> | 2018-01-20 03:49:17 -0800 |
|---|---|---|
| committer | Li Haoyi <haoyi.sg@gmail.com> | 2018-01-20 03:49:17 -0800 |
| commit | d14f56a3fd881f809e58783c49866d1491a5f3fe (patch) | |
| tree | 4a9f93d3d7f69211aa444ce15837fe6e79b9db7f /integration | |
| parent | aebd7a144fab5bdb95f6ee4f4bc170be65cd0549 (diff) | |
| download | mill-d14f56a3fd881f809e58783c49866d1491a5f3fe.tar.gz mill-d14f56a3fd881f809e58783c49866d1491a5f3fe.tar.bz2 mill-d14f56a3fd881f809e58783c49866d1491a5f3fe.zip | |
Swap over to simplified Mill module/source layout from SBT's
Removes a lot of useless folders and gives us a chance to exercise this simplified layout. Support for the SBT layout is still verified by our integration tests
Diffstat (limited to 'integration')
| -rw-r--r-- | integration/test/resources/acyclic/build.sc (renamed from integration/src/test/resources/acyclic/build.sc) | 0 | ||||
| -rw-r--r-- | integration/test/resources/ammonite/build.sc (renamed from integration/src/test/resources/ammonite/build.sc) | 0 | ||||
| -rw-r--r-- | integration/test/resources/better-files/build.sc (renamed from integration/src/test/resources/better-files/build.sc) | 0 | ||||
| -rw-r--r-- | integration/test/resources/jawn/build.sc (renamed from integration/src/test/resources/jawn/build.sc) | 0 | ||||
| -rw-r--r-- | integration/test/src/mill/integration/AcyclicTests.scala (renamed from integration/src/test/scala/mill/integration/AcyclicTests.scala) | 0 | ||||
| -rw-r--r-- | integration/test/src/mill/integration/AmmoniteTests.scala (renamed from integration/src/test/scala/mill/integration/AmmoniteTests.scala) | 0 | ||||
| -rw-r--r-- | integration/test/src/mill/integration/BetterFilesTests.scala (renamed from integration/src/test/scala/mill/integration/BetterFilesTests.scala) | 0 | ||||
| -rw-r--r-- | integration/test/src/mill/integration/IntegrationTestSuite.scala (renamed from integration/src/test/scala/mill/integration/IntegrationTestSuite.scala) | 2 | ||||
| -rw-r--r-- | integration/test/src/mill/integration/JawnTests.scala (renamed from integration/src/test/scala/mill/integration/JawnTests.scala) | 0 |
9 files changed, 1 insertions, 1 deletions
diff --git a/integration/src/test/resources/acyclic/build.sc b/integration/test/resources/acyclic/build.sc index b8f878ad..b8f878ad 100644 --- a/integration/src/test/resources/acyclic/build.sc +++ b/integration/test/resources/acyclic/build.sc diff --git a/integration/src/test/resources/ammonite/build.sc b/integration/test/resources/ammonite/build.sc index cb8d32ab..cb8d32ab 100644 --- a/integration/src/test/resources/ammonite/build.sc +++ b/integration/test/resources/ammonite/build.sc diff --git a/integration/src/test/resources/better-files/build.sc b/integration/test/resources/better-files/build.sc index 582d3400..582d3400 100644 --- a/integration/src/test/resources/better-files/build.sc +++ b/integration/test/resources/better-files/build.sc diff --git a/integration/src/test/resources/jawn/build.sc b/integration/test/resources/jawn/build.sc index 4898a3cb..4898a3cb 100644 --- a/integration/src/test/resources/jawn/build.sc +++ b/integration/test/resources/jawn/build.sc diff --git a/integration/src/test/scala/mill/integration/AcyclicTests.scala b/integration/test/src/mill/integration/AcyclicTests.scala index 42b5179b..42b5179b 100644 --- a/integration/src/test/scala/mill/integration/AcyclicTests.scala +++ b/integration/test/src/mill/integration/AcyclicTests.scala diff --git a/integration/src/test/scala/mill/integration/AmmoniteTests.scala b/integration/test/src/mill/integration/AmmoniteTests.scala index 22bd3cb8..22bd3cb8 100644 --- a/integration/src/test/scala/mill/integration/AmmoniteTests.scala +++ b/integration/test/src/mill/integration/AmmoniteTests.scala diff --git a/integration/src/test/scala/mill/integration/BetterFilesTests.scala b/integration/test/src/mill/integration/BetterFilesTests.scala index 7ee943df..7ee943df 100644 --- a/integration/src/test/scala/mill/integration/BetterFilesTests.scala +++ b/integration/test/src/mill/integration/BetterFilesTests.scala diff --git a/integration/src/test/scala/mill/integration/IntegrationTestSuite.scala b/integration/test/src/mill/integration/IntegrationTestSuite.scala index 293411c5..4649abdb 100644 --- a/integration/src/test/scala/mill/integration/IntegrationTestSuite.scala +++ b/integration/test/src/mill/integration/IntegrationTestSuite.scala @@ -9,7 +9,7 @@ import utest._ abstract class IntegrationTestSuite(repoKey: String, workspaceSlug: String) extends TestSuite{ val workspacePath = pwd / 'target / 'workspace / workspaceSlug - val buildFilePath = pwd / 'integration / 'src / 'test / 'resources / workspaceSlug + val buildFilePath = pwd / 'integration / 'test / 'resources / workspaceSlug val stdOutErr = new PrintStream(new ByteArrayOutputStream()) val stdIn = new ByteArrayInputStream(Array()) val runner = new mill.main.MainRunner( diff --git a/integration/src/test/scala/mill/integration/JawnTests.scala b/integration/test/src/mill/integration/JawnTests.scala index 21c9f133..21c9f133 100644 --- a/integration/src/test/scala/mill/integration/JawnTests.scala +++ b/integration/test/src/mill/integration/JawnTests.scala |