diff options
author | Josh Suereth <Joshua.Suereth@gmail.com> | 2012-09-01 09:05:19 -0700 |
---|---|---|
committer | Josh Suereth <Joshua.Suereth@gmail.com> | 2012-09-01 09:05:19 -0700 |
commit | c4d81e1e2de3c9724cce32dee4345298d46ef1cc (patch) | |
tree | d4253af6cce62845eb72465a719a5b3651a16a5f /src | |
parent | 37680b44f96362057c14713da7541add946706cc (diff) | |
parent | b4a54f18bde00ddaeba91dcd0a5442b66c7c4a1a (diff) | |
download | scala-c4d81e1e2de3c9724cce32dee4345298d46ef1cc.tar.gz scala-c4d81e1e2de3c9724cce32dee4345298d46ef1cc.tar.bz2 scala-c4d81e1e2de3c9724cce32dee4345298d46ef1cc.zip |
Merge pull request #1222 from jsuereth/fix/sbt-build
SBT build now works with SBT 0.12.
Diffstat (limited to 'src')
-rw-r--r-- | src/partest/scala/tools/partest/nest/SBTRunner.scala | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/partest/scala/tools/partest/nest/SBTRunner.scala b/src/partest/scala/tools/partest/nest/SBTRunner.scala index 266153d9d3..6fa31492f3 100644 --- a/src/partest/scala/tools/partest/nest/SBTRunner.scala +++ b/src/partest/scala/tools/partest/nest/SBTRunner.scala @@ -34,7 +34,7 @@ object SBTRunner extends DirectRunner { scalacOptions: Seq[String] = Seq(), justFailedTests: Boolean = false) - def mainReflect(args: Array[String]): java.util.Map[String, TestState] = { + def mainReflect(args: Array[String]): java.util.Map[String, String] = { setProp("partest.debug", "true") val Argument = new scala.util.matching.Regex("-(.*)") @@ -73,9 +73,13 @@ object SBTRunner extends DirectRunner { (for { (testType, files) <- runs (path, result) <- reflectiveRunTestsForFiles(files,testType).asScala - } yield (path, result)).seq.asJava + } yield (path, fixResult(result))).seq.asJava + } + def fixResult(result: TestState): String = result match { + case TestState.Ok => "OK" + case TestState.Fail => "FAIL" + case TestState.Timeout => "TIMEOUT" } - def main(args: Array[String]): Unit = { val failures = ( for ((path, result) <- mainReflect(args).asScala ; if result != TestState.Ok) yield |