From da7c06478f711d6b41ad144b8cf4c8658381373e Mon Sep 17 00:00:00 2001 From: Simon Ochsenreither Date: Sat, 18 May 2013 23:24:03 +0200 Subject: 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. --- src/partest/scala/tools/partest/nest/Runner.scala | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/partest') 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 } -- cgit v1.2.3