diff options
Diffstat (limited to 'project/Partest.scala')
| -rw-r--r-- | project/Partest.scala | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/project/Partest.scala b/project/Partest.scala index bbc160a41d..fbb0a2a980 100644 --- a/project/Partest.scala +++ b/project/Partest.scala @@ -58,8 +58,8 @@ object partest { val results = runner run Array(testArgs ++ extraArgs ++ extras: _*) asScala // TODO - save results val failures = results collect { - case (path, 1) => path + " [FAILED]" - case (path, 2) => path + " [TIMEOUT]" + case (path, "FAIL") => path + " [FAILED]" + case (path, "TIMEOUT") => path + " [TIMEOUT]" } if (failures.isEmpty) @@ -115,7 +115,7 @@ object partest { } } - def partestRunnerTask(classpath: ScopedTask[Classpath], javacOptions: SettingKey[Seq[String]]): Project.Initialize[Task[PartestRunner]] = + def partestRunnerTask(classpath: ScopedTask[Classpath], javacOptions: TaskKey[Seq[String]]): Project.Initialize[Task[PartestRunner]] = (classpath, javacOptions) map ((cp, opts) => new PartestRunner(Build.data(cp), opts mkString " ")) } @@ -128,11 +128,11 @@ class PartestRunner(classpath: Seq[File], javaOpts: String) { (c,m) } lazy val classPathArgs = Seq("-cp", classpath.map(_.getAbsoluteFile).mkString(java.io.File.pathSeparator)) - def run(args: Array[String]): java.util.Map[String,Int] = try { + def run(args: Array[String]): java.util.Map[String,String] = try { // TODO - undo this settings after running. Also globals are bad. System.setProperty("partest.java_opts", javaOpts) val allArgs = (classPathArgs ++ args).toArray - mainMethod.invoke(null, allArgs).asInstanceOf[java.util.Map[String,Int]] + mainMethod.invoke(null, allArgs).asInstanceOf[java.util.Map[String,String]] } catch { case e => //error("Could not run Partest: " + e) |