diff options
| author | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-06-28 12:15:28 -0700 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-06-28 14:24:44 -0700 |
| commit | a106df12c642ed44a72d28b893f6b320e8873bcc (patch) | |
| tree | d365a00c74b79103047e88b035802f9e29007b9b /src/partest | |
| parent | e320a920d4c32752157cf73be5a5fbbd3b9cc6e7 (diff) | |
| parent | 54cb6af7dbcf630a4f57e98f0099d77dd3b36693 (diff) | |
| download | scala-a106df12c642ed44a72d28b893f6b320e8873bcc.tar.gz scala-a106df12c642ed44a72d28b893f6b320e8873bcc.tar.bz2 scala-a106df12c642ed44a72d28b893f6b320e8873bcc.zip | |
Merge 2.10.x into master
Conflicts:
src/compiler/scala/tools/nsc/typechecker/Namers.scala
src/partest/scala/tools/partest/PartestTask.scala
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) |