summaryrefslogtreecommitdiff
path: root/integration
diff options
context:
space:
mode:
authorLi Haoyi <haoyi.sg@gmail.com>2018-01-07 00:31:34 -0800
committerLi Haoyi <haoyi.sg@gmail.com>2018-01-07 00:31:34 -0800
commit259b57dd34fc6762835dde236ba4e459dec32103 (patch)
treedb6e6b7bb5d602e19171c039f600a3cf2fd02d7e /integration
parent7cd18fd936b95410274be031a8231e5a3d9866a4 (diff)
downloadmill-259b57dd34fc6762835dde236ba4e459dec32103.tar.gz
mill-259b57dd34fc6762835dde236ba4e459dec32103.tar.bz2
mill-259b57dd34fc6762835dde236ba4e459dec32103.zip
Rename `resource/` folders `resources/` to properly match SBT convention, making changes within them get picked up by the file-watching `~compile`/`~test` commands
Diffstat (limited to 'integration')
-rw-r--r--integration/src/test/resources/acyclic/build.sc (renamed from integration/src/test/resource/acyclic/build.sc)0
-rw-r--r--integration/src/test/resources/better-files/build.sc (renamed from integration/src/test/resource/better-files/build.sc)0
-rw-r--r--integration/src/test/resources/jawn/build.sc (renamed from integration/src/test/resource/jawn/build.sc)0
-rw-r--r--integration/src/test/scala/mill/integration/IntegrationTestSuite.scala2
4 files changed, 1 insertions, 1 deletions
diff --git a/integration/src/test/resource/acyclic/build.sc b/integration/src/test/resources/acyclic/build.sc
index f1381c7e..f1381c7e 100644
--- a/integration/src/test/resource/acyclic/build.sc
+++ b/integration/src/test/resources/acyclic/build.sc
diff --git a/integration/src/test/resource/better-files/build.sc b/integration/src/test/resources/better-files/build.sc
index ace8f766..ace8f766 100644
--- a/integration/src/test/resource/better-files/build.sc
+++ b/integration/src/test/resources/better-files/build.sc
diff --git a/integration/src/test/resource/jawn/build.sc b/integration/src/test/resources/jawn/build.sc
index 074e30f9..074e30f9 100644
--- a/integration/src/test/resource/jawn/build.sc
+++ b/integration/src/test/resources/jawn/build.sc
diff --git a/integration/src/test/scala/mill/integration/IntegrationTestSuite.scala b/integration/src/test/scala/mill/integration/IntegrationTestSuite.scala
index b7dc722d..ba4415fa 100644
--- a/integration/src/test/scala/mill/integration/IntegrationTestSuite.scala
+++ b/integration/src/test/scala/mill/integration/IntegrationTestSuite.scala
@@ -7,7 +7,7 @@ import utest._
abstract class IntegrationTestSuite(repoKey: String, workspaceSlug: String) extends TestSuite{
val workspacePath = pwd / 'target / 'workspace / workspaceSlug
- val buildFilePath = pwd / 'integration / 'src / 'test / 'resource / workspaceSlug
+ val buildFilePath = pwd / 'integration / 'src / 'test / 'resources / workspaceSlug
val stdOutErr = new PrintStream(new ByteArrayOutputStream())
val stdIn = new ByteArrayInputStream(Array())
val runner = new mill.main.MainRunner(