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

More indentation messed up.

This commit is contained in:
Eugene Vigdorchik 2012-04-04 16:25:12 +04:00
parent b5766e4057
commit 2ba9bbc767
3 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
main/Defaults.scala
View File

@ -288,7 +288,7 @@ object Defaults extends BuildCommon
testFilter in testQuick <<= testQuickFilter, testFilter in testQuick <<= testQuickFilter,
executeTests <<= (streams in test, loadedTestFrameworks, testLoader, testGrouping in test, fullClasspath in test, javaOptions in test, javaHome in test) flatMap { executeTests <<= (streams in test, loadedTestFrameworks, testLoader, testGrouping in test, fullClasspath in test, javaOptions in test, javaHome in test) flatMap {
(s, frameworkMap, loader, groups, cp, javaOpts, javaHome) => (s, frameworkMap, loader, groups, cp, javaOpts, javaHome) =>
val tasks = groups map { val tasks = groups map {
case Tests.Group(name, tests, config) => case Tests.Group(name, tests, config) =>
config.subproc match { config.subproc match {
case Tests.Fork(extraJvm) => case Tests.Fork(extraJvm) =>
@ -297,7 +297,7 @@ object Defaults extends BuildCommon
Tests(frameworkMap, loader, tests, config, s.log) Tests(frameworkMap, loader, tests, config, s.log)
} }
} }
Tests.foldTasks(tasks) Tests.foldTasks(tasks)
}, },
test <<= (executeTests, streams, resolvedScoped, state) map { test <<= (executeTests, streams, resolvedScoped, state) map {
(results, s, scoped, st) => (results, s, scoped, st) =>
@ -378,7 +378,7 @@ object Defaults extends BuildCommon
val tasks = groups map { val tasks = groups map {
case Tests.Group(name, tests, config) => case Tests.Group(name, tests, config) =>
val modifiedOpts = Tests.Filter(filter(selected)) +: Tests.Argument(frameworkOptions : _*) +: config.options val modifiedOpts = Tests.Filter(filter(selected)) +: Tests.Argument(frameworkOptions : _*) +: config.options
val newConfig = config.copy(options = modifiedOpts) val newConfig = config.copy(options = modifiedOpts)
newConfig.subproc match { newConfig.subproc match {
case Tests.Fork(extraJvm) => case Tests.Fork(extraJvm) =>
ForkTests(frameworks.keys.toSeq, tests.toList, newConfig, cp.files, javaHome, javaOpts, s.log) tag Tags.ForkedTestGroup ForkTests(frameworks.keys.toSeq, tests.toList, newConfig, cp.files, javaHome, javaOpts, s.log) tag Tags.ForkedTestGroup
@ -527,12 +527,11 @@ object Defaults extends BuildCommon
def runnerTask = runner <<= runnerInit def runnerTask = runner <<= runnerInit
def runnerInit: Initialize[Task[ScalaRun]] = def runnerInit: Initialize[Task[ScalaRun]] =
(taskTemporaryDirectory, scalaInstance, baseDirectory, javaOptions, outputStrategy, fork, javaHome, trapExit, connectInput) map { (taskTemporaryDirectory, scalaInstance, baseDirectory, javaOptions, outputStrategy, fork, javaHome, trapExit, connectInput) map {
(tmp, si, base, options, strategy, forkRun, javaHomeDir, trap, connectIn) => (tmp, si, base, options, strategy, forkRun, javaHomeDir, trap, connectIn) =>
if(forkRun) { if(forkRun) {
new ForkRun( ForkOptions(scalaJars = si.jars, javaHome = javaHomeDir, connectInput = connectIn, outputStrategy = strategy, new ForkRun( ForkOptions(scalaJars = si.jars, javaHome = javaHomeDir, connectInput = connectIn, outputStrategy = strategy, runJVMOptions = options, workingDirectory = Some(base)) )
runJVMOptions = options, workingDirectory = Some(base)) ) } else
} else new Run(si, trap, tmp)
new Run(si, trap, tmp)
} }
@deprecated("Use `docTaskSettings` instead", "0.12.0") @deprecated("Use `docTaskSettings` instead", "0.12.0")

22
main/actions/ForkTests.scala
View File

@ -43,7 +43,7 @@ private[sbt] object ForkTests {
val is = new ObjectInputStream(socket.getInputStream) val is = new ObjectInputStream(socket.getInputStream)
import Tags._ import Tags._
@annotation.tailrec def react: Unit = is.readObject match { @annotation.tailrec def react: Unit = is.readObject match {
case `Done` => os.writeObject(Done); case `Done` => os.writeObject(Done);
case Array(`Error`, s: String) => log.error(s); react case Array(`Error`, s: String) => log.error(s); react
case Array(`Warn`, s: String) => log.warn(s); react case Array(`Warn`, s: String) => log.warn(s); react
@ -52,14 +52,14 @@ private[sbt] object ForkTests {
case t: Throwable => log.trace(t); react case t: Throwable => log.trace(t); react
case tEvents: Array[Event] => case tEvents: Array[Event] =>
for (first <- tEvents.headOption) listeners.foreach(_ startGroup first.testName) for (first <- tEvents.headOption) listeners.foreach(_ startGroup first.testName)
val event = TestEvent(tEvents) val event = TestEvent(tEvents)
listeners.foreach(_ testEvent event) listeners.foreach(_ testEvent event)
for (first <- tEvents.headOption) { for (first <- tEvents.headOption) {
val result = event.result getOrElse TestResult.Passed val result = event.result getOrElse TestResult.Passed
results += first.testName -> result results += first.testName -> result
listeners.foreach(_ endGroup (first.testName, result)) listeners.foreach(_ endGroup (first.testName, result))
} }
react react
} }
try { try {
@ -80,8 +80,8 @@ private[sbt] object ForkTests {
} finally { } finally {
is.close(); os.close(); socket.close() is.close(); os.close(); socket.close()
} }
} }
} }
try { try {
testListeners.foreach(_.doInit()) testListeners.foreach(_.doInit())

4
main/actions/Tests.scala
View File

@ -128,8 +128,8 @@ object Tests
(overall(results.map(_._2)), results.toMap) (overall(results.map(_._2)), results.toMap)
def foldTasks(results: Seq[Task[Output]]): Task[Output] = def foldTasks(results: Seq[Task[Output]]): Task[Output] =
reduced(results.toIndexedSeq, { reduced(results.toIndexedSeq, {
case ((v1, m1), (v2, m2)) => (if (v1.id < v2.id) v2 else v1, m1 ++ m2) case ((v1, m1), (v2, m2)) => (if (v1.id < v2.id) v2 else v1, m1 ++ m2)
}) })
def overall(results: Iterable[TestResult.Value]): TestResult.Value = def overall(results: Iterable[TestResult.Value]): TestResult.Value =
(TestResult.Passed /: results) { (acc, result) => if(acc.id < result.id) result else acc } (TestResult.Passed /: results) { (acc, result) => if(acc.id < result.id) result else acc }
def discover(frameworks: Seq[Framework], analysis: Analysis, log: Logger): (Seq[TestDefinition], Set[String]) = def discover(frameworks: Seq[Framework], analysis: Analysis, log: Logger): (Seq[TestDefinition], Set[String]) =