Mark test module as test sources; change sbt module root #298
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rockjam
commented
Apr 15, 2018
| @@ -321,7 +324,9 @@ object GenIdeaImpl { | |||
| compileOutputPath: Path, | |||
| generatedSourceOutputPath: Path, | |||
| libNames: Strict.Agg[String], | |||
| depNames: Strict.Agg[String]) = { | |||
| depNames: Strict.Agg[String], | |||
| isTest: Boolean | |||
There was a problem hiding this comment.
This allows us to display test sources nicely in sources tree,
and split them from ordinary sources in search
rockjam
commented
Apr 15, 2018
| @@ -65,13 +65,13 @@ trait MavenModule extends JavaModule{outer => | |||
| ) | |||
| override def resources = T.sources{ millSourcePath / 'src / 'main / 'resources } | |||
| trait Tests extends super.Tests with MavenTests { | |||
| override def millSourcePath = outer.millSourcePath | |||
| override def millSourcePath = outer.millSourcePath / 'src / 'test | |||
There was a problem hiding this comment.
I thought that we can make parentModule/src/test as a root for test module. @lihaoyi Don't you mind that?
There was a problem hiding this comment.
Or maybe we can do special handling of base path in GenIdea itself, cause this change may break current builds, when you rely on path of your test module. This happened in Play Json build.
|
Seems to fail with cross-modules, need to fix it |
|
@lihaoyi ready for review |
|
Looks good to me. Once you flesh out the PR description feel free to squash and merge |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR fixes #201
It's achieved by introducing
intellijModulePath, which is different frommillSourcePathfor sbt/maven module's tests.For instance:
module path in Intellij is:
modulemodule's test path in Intellij is:
module/src/test.Meanwhile
millSourcePathdidn't change