diff options
| author | Simon Ochsenreither <simon@ochsenreither.de> | 2013-05-18 23:24:03 +0200 |
|---|---|---|
| committer | Simon Ochsenreither <simon@ochsenreither.de> | 2013-06-06 01:36:16 +0200 |
| commit | da7c06478f711d6b41ad144b8cf4c8658381373e (patch) | |
| tree | 6b010360998117fc1798819c2f74fbb7912e3c8b /src/partest | |
| parent | 803d451a28824af17f0cab446e4c76f51003fd01 (diff) | |
| download | scala-da7c06478f711d6b41ad144b8cf4c8658381373e.tar.gz scala-da7c06478f711d6b41ad144b8cf4c8658381373e.tar.bz2 scala-da7c06478f711d6b41ad144b8cf4c8658381373e.zip | |
SI-7479 Add avian option to partest's diff filter...
... so that the different results of the test on Avian
can be specified in the check file.
Diffstat (limited to 'src/partest')
| -rw-r--r-- | src/partest/scala/tools/partest/nest/Runner.scala | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/partest/scala/tools/partest/nest/Runner.scala b/src/partest/scala/tools/partest/nest/Runner.scala index 1034d724d2..a53698eb77 100644 --- a/src/partest/scala/tools/partest/nest/Runner.scala +++ b/src/partest/scala/tools/partest/nest/Runner.scala @@ -286,7 +286,7 @@ class Runner(val testFile: File, fileManager: FileManager, val testRunParams: Te * might be failing, in the normal case. */ def diffilter(d: String) = { - import scala.util.Properties.javaVersion + import scala.util.Properties.{javaVersion, isAvian} val prefix = "#partest" val margin = "> " val leader = margin + prefix @@ -297,6 +297,7 @@ class Runner(val testFile: File, fileManager: FileManager, val testRunParams: Te val cond = token match { case "java7" => javaVersion startsWith "1.7" case "java6" => javaVersion startsWith "1.6" + case "avian" => isAvian case "true" => true case _ => false } |