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

Modify forking tests based on Stefan's feedback. Should be ported to 0.12

This commit is contained in:
Eugene Vigdorchik 2012-05-09 22:58:11 +04:00 committed by Mark Harrah
parent 9414f98f2c
commit 04d53c05d5
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
main/actions/ForkTests.scala
View File

@ -50,15 +50,13 @@ private[sbt] object ForkTests {
case Array(`Info`, s: String) => log.info(s); react
case Array(`Debug`, s: String) => log.debug(s); react
case t: Throwable => log.trace(t); react
case tEvents: Array[Event] =>
for (first <- tEvents.headOption) listeners.foreach(_ startGroup first.testName)
case Array(group: String, tEvents: Array[Event]) =>
listeners.foreach(_ startGroup group)
val event = TestEvent(tEvents)
listeners.foreach(_ testEvent event)
for (first <- tEvents.headOption) {
val result = event.result getOrElse TestResult.Passed
results += first.testName -> result
listeners.foreach(_ endGroup (first.testName, result))
}
val result = event.result getOrElse TestResult.Passed
results += group -> result
listeners.foreach(_ endGroup (group, result))
react
}
@ -89,7 +87,7 @@ private[sbt] object ForkTests {
val fullCp = classpath ++: Seq(IO.classLocationFile[ForkMain], IO.classLocationFile[Framework])
val options = javaOpts ++: Seq("-classpath", fullCp mkString File.pathSeparator, classOf[ForkMain].getCanonicalName, server.getLocalPort.toString)
val ec = Fork.java(javaHome, options, LoggedOutput(log))
val ec = Fork.java(javaHome, options, StdoutOutput)
if (ec != 0) log.error("Running java with options " + options.mkString(" ") + " failed with exit code " + ec)
} finally {
server.close()

2
testing/agent/src/main/java/sbt/ForkMain.java
View File

@ -137,7 +137,7 @@ public class ForkMain {
} else {
write(os, new Object[]{ForkTags.Error, "Framework '" + framework + "' does not support test '" + test.name + "'"});
}
write(os, events.toArray(new ForkEvent[events.size()]));
write(os, new Object[]{test.name, events.toArray(new ForkEvent[events.size()])});
}
}
write(os, ForkTags.Done);