diff options
author | Ilya Kirillov <darthorimar@users.noreply.github.com> | 2017-07-13 15:50:27 +0300 |
---|---|---|
committer | Ilya Kirillov <darthorimar@users.noreply.github.com> | 2017-07-17 19:34:17 +0300 |
commit | 88d01433b1ebcd1038ff29a72a8dcc78144f44df (patch) | |
tree | 96571b688f0d03d135a6dfd551a82bda8d06a74e | |
parent | 8a2d3b2f2cb996ce04038124cc4d50027179c191 (diff) | |
download | cbt-88d01433b1ebcd1038ff29a72a8dcc78144f44df.tar.gz cbt-88d01433b1ebcd1038ff29a72a8dcc78144f44df.tar.bz2 cbt-88d01433b1ebcd1038ff29a72a8dcc78144f44df.zip |
Add skip tests param
-rw-r--r-- | stage2/plugins/ExportBuildInformation.scala | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/stage2/plugins/ExportBuildInformation.scala b/stage2/plugins/ExportBuildInformation.scala index 0cd340f..720ccbe 100644 --- a/stage2/plugins/ExportBuildInformation.scala +++ b/stage2/plugins/ExportBuildInformation.scala @@ -97,13 +97,13 @@ object BuildInformation { private def convertCbtLibraries = { val cbtBuild = DirectoryDependency(rootBuild.context.cbtHome)(rootBuild.context).dependenciesArray.head.asInstanceOf[BaseBuild] - transitiveBuilds(Seq(cbtBuild)) - .collect { - case d: BoundMavenDependency => d.jar - case d: PackageJars => d.jar.get - } - .map(exportLibrary) - .distinct + transitiveBuilds(Seq(cbtBuild), skipTests = true) + .collect { + case d: BoundMavenDependency => d.jar + case d: PackageJars => d.jar.get + } + .map(exportLibrary) + .distinct } private def collectDependencies(dependencies: Seq[Dependency]): Seq[ModuleDependency] = @@ -173,12 +173,12 @@ object BuildInformation { } // More effectively to call on a all builds at once rather than on one per time - private def transitiveBuilds(builds: Seq[BaseBuild]): Seq[BaseBuild] = { + private def transitiveBuilds(builds: Seq[BaseBuild], skipTests: Boolean = false): Seq[BaseBuild] = { def traverse(visited: Seq[BaseBuild], build: BaseBuild): Seq[BaseBuild] = (build +: build.transitiveDependencies) .collect { case d: BaseBuild => - Seq(d) ++ parentBuild(d) ++ testBuild(d) + Seq(d) ++ parentBuild(d) ++ (if (!skipTests) testBuild(d) else Seq.empty) case d: LazyDependency => lazyBuild(d.dependency) } |