luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add tags to inProccess group as well

This commit is contained in:
frosforever 2020-05-03 11:58:38 -04:00
parent b2942f6321
commit 18d51eac58
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
main/src/main/scala/sbt/Defaults.scala
View File

@ -1208,7 +1208,7 @@ object Defaults extends BuildCommon {
): Initialize[Task[Tests.Output]] = {
val runners = createTestRunners(frameworks, loader, config)
val groupTasks = groups map {
case Tests.Group(_, tests, runPolicy, tags) =>
case Tests.Group(_, tests, runPolicy, groupTags) =>
runPolicy match {
case Tests.SubProcess(opts) =>
s.log.debug(s"javaOptions: ${opts.runJVMOptions}")
@ -1221,13 +1221,20 @@ object Defaults extends BuildCommon {
cp.files,
opts,
s.log,
(Tags.ForkedTestGroup, 1) +: tags: _*
(Tags.ForkedTestGroup, 1) +: groupTags: _*
)
case Tests.InProcess =>
if (javaOptions.nonEmpty) {
s.log.warn("javaOptions will be ignored, fork is set to false")
}
Tests(frameworks, loader, runners, tests.toVector, config, s.log)
Tests(
frameworks,
loader,
runners,
tests.toVector,
config.copy(tags = config.tags ++ groupTags),
s.log
)
}
}
val output = Tests.foldTasks(groupTasks, config.parallel)