diff options
author | Philipp Haller <hallerp@gmail.com> | 2010-04-12 13:25:57 +0000 |
---|---|---|
committer | Philipp Haller <hallerp@gmail.com> | 2010-04-12 13:25:57 +0000 |
commit | a5051ddadc7c7236e5eb0da67d547b1eda06eb4f (patch) | |
tree | 3aba779846341f6fe15ba83494cbb87b0dc4301e /src | |
parent | 08496424f2df9baf9d3612ed2f1bdb2553e7bfd6 (diff) | |
download | scala-a5051ddadc7c7236e5eb0da67d547b1eda06eb4f.tar.gz scala-a5051ddadc7c7236e5eb0da67d547b1eda06eb4f.tar.bz2 scala-a5051ddadc7c7236e5eb0da67d547b1eda06eb4f.zip |
Attempting to unblock partest by handling Asser...
Attempting to unblock partest by handling AssertionErrors. No review.
Diffstat (limited to 'src')
-rw-r--r-- | src/partest/scala/tools/partest/Compilable.scala | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/partest/scala/tools/partest/Compilable.scala b/src/partest/scala/tools/partest/Compilable.scala index c11532f278..d7365c1620 100644 --- a/src/partest/scala/tools/partest/Compilable.scala +++ b/src/partest/scala/tools/partest/Compilable.scala @@ -81,7 +81,10 @@ trait PartestCompilation { class PartestGlobal(settings: Settings, val creporter: ConsoleReporter) extends Global(settings, creporter) { def partestCompile(files: List[String], printSummary: Boolean): Boolean = { try { new Run compile files } - catch { case FatalError(msg) => creporter.error(null, "fatal error: " + msg) } + catch { + case FatalError(msg) => creporter.error(null, "fatal error: " + msg) + case ae: AssertionError => creporter.error(null, ""+ae) + } if (printSummary) creporter.printSummary @@ -102,4 +105,4 @@ trait PartestCompilation { (new PartestGlobal(command.settings, reporter), command.files) } } -}
\ No newline at end of file +} |