diff options
| -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.scala | 2 | ||||
| -rw-r--r-- | scalajslib/src/test/resources/hello-js-world/src/main/scala/Main.scala (renamed from scalajslib/src/test/resource/hello-js-world/src/main/scala/Main.scala) | 0 | ||||
| -rw-r--r-- | scalajslib/src/test/scala/mill/scalajslib/HelloJSWorldTests.scala | 2 | ||||
| -rw-r--r-- | scalalib/src/test/resources/hello-world/src/main/scala/Main.scala (renamed from scalalib/src/test/resource/hello-world/src/main/scala/Main.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/resources/hello-world/src/main/scala/Result.scala (renamed from scalalib/src/test/resource/hello-world/src/main/scala/Result.scala) | 0 | ||||
| -rw-r--r-- | scalalib/src/test/scala/mill/scalalib/HelloWorldTests.scala | 2 |
9 files changed, 3 insertions, 3 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( diff --git a/scalajslib/src/test/resource/hello-js-world/src/main/scala/Main.scala b/scalajslib/src/test/resources/hello-js-world/src/main/scala/Main.scala index 60cef56d..60cef56d 100644 --- a/scalajslib/src/test/resource/hello-js-world/src/main/scala/Main.scala +++ b/scalajslib/src/test/resources/hello-js-world/src/main/scala/Main.scala diff --git a/scalajslib/src/test/scala/mill/scalajslib/HelloJSWorldTests.scala b/scalajslib/src/test/scala/mill/scalajslib/HelloJSWorldTests.scala index 4a8fd3cf..8a79df98 100644 --- a/scalajslib/src/test/scala/mill/scalajslib/HelloJSWorldTests.scala +++ b/scalajslib/src/test/scala/mill/scalajslib/HelloJSWorldTests.scala @@ -47,7 +47,7 @@ object HelloJSWorld extends TestUtil.BaseModule { object HelloJSWorldTests extends TestSuite { - val srcPath = pwd / 'scalajslib / 'src / 'test / 'resource / "hello-js-world" + val srcPath = pwd / 'scalajslib / 'src / 'test / 'resources / "hello-js-world" val workspacePath = pwd / 'target / 'workspace / "hello-js-world" val outputPath = workspacePath / 'out val mainObject = workspacePath / 'src / 'main / 'scala / "Main.scala" diff --git a/scalalib/src/test/resource/hello-world/src/main/scala/Main.scala b/scalalib/src/test/resources/hello-world/src/main/scala/Main.scala index 14139d6f..14139d6f 100644 --- a/scalalib/src/test/resource/hello-world/src/main/scala/Main.scala +++ b/scalalib/src/test/resources/hello-world/src/main/scala/Main.scala diff --git a/scalalib/src/test/resource/hello-world/src/main/scala/Result.scala b/scalalib/src/test/resources/hello-world/src/main/scala/Result.scala index d7d29a51..d7d29a51 100644 --- a/scalalib/src/test/resource/hello-world/src/main/scala/Result.scala +++ b/scalalib/src/test/resources/hello-world/src/main/scala/Result.scala diff --git a/scalalib/src/test/scala/mill/scalalib/HelloWorldTests.scala b/scalalib/src/test/scala/mill/scalalib/HelloWorldTests.scala index c9419d07..fe313f8a 100644 --- a/scalalib/src/test/scala/mill/scalalib/HelloWorldTests.scala +++ b/scalalib/src/test/scala/mill/scalalib/HelloWorldTests.scala @@ -65,7 +65,7 @@ object HelloWorldScalaOverride extends TestUtil.BaseModule with HelloWorldModule } object HelloWorldTests extends TestSuite { - val srcPath = pwd / 'scalalib / 'src / 'test / 'resource / "hello-world" + val srcPath = pwd / 'scalalib / 'src / 'test / 'resources / "hello-world" val basePath = pwd / 'target / 'workspace / "hello-world" val workingSrcPath = basePath / 'src val outPath = basePath / 'out |