diff options
| author | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-06-27 15:09:55 -0700 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-06-27 15:09:55 -0700 |
| commit | 79fd0c69e8b2b4848c924457b2f8ff3b61168a7a (patch) | |
| tree | 491bad063d233e7ec00ec84b20f3eea97e7297bc | |
| parent | deb88538116ab0f1fe598c91e4d026a83ecc5404 (diff) | |
| parent | 0c752d7ff85b908b97b1921497dd8b863f8f9693 (diff) | |
| download | scala-79fd0c69e8b2b4848c924457b2f8ff3b61168a7a.tar.gz scala-79fd0c69e8b2b4848c924457b2f8ff3b61168a7a.tar.bz2 scala-79fd0c69e8b2b4848c924457b2f8ff3b61168a7a.zip | |
Merge pull request #2686 from retronym/topic/partest-task-no-stack-trace
Less noise on a partest failure.
| -rw-r--r-- | src/partest/scala/tools/partest/PartestTask.scala | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/partest/scala/tools/partest/PartestTask.scala b/src/partest/scala/tools/partest/PartestTask.scala index 0199400ada..dc40f9f81b 100644 --- a/src/partest/scala/tools/partest/PartestTask.scala +++ b/src/partest/scala/tools/partest/PartestTask.scala @@ -19,6 +19,7 @@ import java.lang.reflect.Method import org.apache.tools.ant.Task import org.apache.tools.ant.types.{Path, Reference, FileSet} import org.apache.tools.ant.types.Commandline.Argument +import scala.tools.ant.ScalaTask /** An Ant task to execute the Scala test suite (NSC). * @@ -54,7 +55,7 @@ import org.apache.tools.ant.types.Commandline.Argument * * @author Philippe Haller */ -class PartestTask extends Task with CompilationPathProperty { +class PartestTask extends Task with CompilationPathProperty with ScalaTask { def addConfiguredPosTests(input: FileSet) { posFiles = Some(input) @@ -406,7 +407,7 @@ class PartestTask extends Task with CompilationPathProperty { val allFailures = _results map (_._2) sum val allFailedPaths = _results flatMap (_._3) - def f = if (errorOnFailed && allFailures > 0) (sys error _) else log(_: String) + def f = if (errorOnFailed && allFailures > 0) buildError(_: String) else log(_: String) def s = if (allFailures > 1) "s" else "" val msg = if (allFailures > 0) |