diff options
| author | Grzegorz Kossakowski <grzegorz.kossakowski@gmail.com> | 2013-07-01 11:51:37 -0700 |
|---|---|---|
| committer | Grzegorz Kossakowski <grzegorz.kossakowski@gmail.com> | 2013-07-01 11:51:37 -0700 |
| commit | 5f60f27ab34f59253b7af5251250388ca606019b (patch) | |
| tree | be12d6b46b3d2ebf347fc875d49c35674e70fcc0 /src/partest | |
| parent | 7e833bcc75b382cecc4b6e8f33b8def68037af82 (diff) | |
| parent | a106df12c642ed44a72d28b893f6b320e8873bcc (diff) | |
| download | scala-5f60f27ab34f59253b7af5251250388ca606019b.tar.gz scala-5f60f27ab34f59253b7af5251250388ca606019b.tar.bz2 scala-5f60f27ab34f59253b7af5251250388ca606019b.zip | |
Merge pull request #2694 from adriaanm/master
Merge 2.10.x into master
Diffstat (limited to 'src/partest')
| -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 b5b09a753a..8b88021dbf 100644 --- a/src/partest/scala/tools/partest/PartestTask.scala +++ b/src/partest/scala/tools/partest/PartestTask.scala @@ -15,6 +15,7 @@ import java.lang.reflect.Method import org.apache.tools.ant.Task import org.apache.tools.ant.types.{ 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). * @@ -34,7 +35,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 { type Path = org.apache.tools.ant.types.Path private var kinds: List[String] = Nil @@ -178,7 +179,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) |