diff options
| author | Nikolay Tatarinov <5min4eq.unity@gmail.com> | 2018-04-20 00:46:44 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-20 00:46:44 +0300 |
| commit | 13d026574a5de41c42482d3ef20ab9ec7dd3bc20 (patch) | |
| tree | 6077602163934bdc0dfb5cd6fbc1fc16c86daa6f /scalalib/test | |
| parent | 7898368fe809779e73ef1cd909f1b2e5de84e6c1 (diff) | |
| download | mill-13d026574a5de41c42482d3ef20ab9ec7dd3bc20.tar.gz mill-13d026574a5de41c42482d3ef20ab9ec7dd3bc20.tar.bz2 mill-13d026574a5de41c42482d3ef20ab9ec7dd3bc20.zip | |
Mark test module as test sources; change sbt module root (#298)
* mark test module as test sources
* add test case for test module in GenIdea
* fixes #201 change mill project path for sbt and maven tests
Diffstat (limited to 'scalalib/test')
| -rw-r--r-- | scalalib/test/resources/gen-idea/idea/modules.xml | 3 | ||||
| -rw-r--r-- | scalalib/test/resources/gen-idea/idea_modules/test.iml | 18 | ||||
| -rw-r--r-- | scalalib/test/src/mill/scalalib/GenIdeaTests.scala | 5 |
3 files changed, 25 insertions, 1 deletions
diff --git a/scalalib/test/resources/gen-idea/idea/modules.xml b/scalalib/test/resources/gen-idea/idea/modules.xml index d7cfbd08..d6334ea3 100644 --- a/scalalib/test/resources/gen-idea/idea/modules.xml +++ b/scalalib/test/resources/gen-idea/idea/modules.xml @@ -3,6 +3,7 @@ <modules> <module fileurl="file://$PROJECT_DIR$/.idea_modules/mill-build.iml" filepath="$PROJECT_DIR$/.idea_modules/mill-build.iml"/> <module fileurl="file://$PROJECT_DIR$/.idea_modules/.iml" filepath="$PROJECT_DIR$/.idea_modules/.iml"/> + <module fileurl="file://$PROJECT_DIR$/.idea_modules/test.iml" filepath="$PROJECT_DIR$/.idea_modules/test.iml"/> </modules> </component> -</project>
\ No newline at end of file +</project> diff --git a/scalalib/test/resources/gen-idea/idea_modules/test.iml b/scalalib/test/resources/gen-idea/idea_modules/test.iml new file mode 100644 index 00000000..f67445ae --- /dev/null +++ b/scalalib/test/resources/gen-idea/idea_modules/test.iml @@ -0,0 +1,18 @@ +<module type="JAVA_MODULE" version="4"> + <component name="NewModuleRootManager"> + <output url="file://$MODULE_DIR$/../target/workspace/mill/scalalib/GenIdeaTests/helloWorldEvaluator/test/compile/dest/classes"/> + <exclude-output/> + <content url="file://$MODULE_DIR$/../target/workspace/mill/scalalib/GenIdeaTests/helloWorldEvaluator/test/generatedSources/dest"/> + <content url="file://$MODULE_DIR$/../target/workspace/gen-idea/test"> + <sourceFolder url="file://$MODULE_DIR$/../target/workspace/gen-idea/test/src" isTestSource="true"/> + <sourceFolder url="file://$MODULE_DIR$/../target/workspace/gen-idea/test/resources" isTestSource="true" type="java-resource"/> + <excludeFolder url="file://$MODULE_DIR$/../target/workspace/gen-idea/test/target"/> + </content> + <orderEntry type="inheritedJdk"/> + <orderEntry type="sourceFolder" forTests="false"/> + <orderEntry type="library" name="scala-sdk-2.12.4" level="application"/> + <orderEntry type="library" name="scala-library-2.12.4-sources.jar" level="project"/> + <orderEntry type="library" name="scala-library-2.12.4.jar" level="project"/> + <orderEntry type="module" module-name="" exported=""/> + </component> +</module> diff --git a/scalalib/test/src/mill/scalalib/GenIdeaTests.scala b/scalalib/test/src/mill/scalalib/GenIdeaTests.scala index dc8faaf4..b21c070c 100644 --- a/scalalib/test/src/mill/scalalib/GenIdeaTests.scala +++ b/scalalib/test/src/mill/scalalib/GenIdeaTests.scala @@ -13,6 +13,9 @@ object GenIdeaTests extends TestSuite { trait HelloWorldModule extends scalalib.ScalaModule { def scalaVersion = "2.12.4" def millSourcePath = GenIdeaTests.millSourcePath + object test extends super.Tests { + def testFrameworks = Seq("utest.runner.Framework") + } } object HelloWorld extends TestUtil.BaseModule with HelloWorldModule @@ -34,6 +37,8 @@ object GenIdeaTests extends TestSuite { Seq( "gen-idea/idea_modules/iml" -> millSourcePath / "generated" / ".idea_modules" /".iml", + "gen-idea/idea_modules/test.iml" -> + millSourcePath / "generated" / ".idea_modules" /"test.iml", "gen-idea/idea_modules/mill-build.iml" -> millSourcePath / "generated" / ".idea_modules" /"mill-build.iml", "gen-idea/idea/libraries/scala-library-2.12.4.jar.xml" -> |