diff options
| author | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-06-18 10:28:02 -0700 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-06-18 10:28:02 -0700 |
| commit | 9736f97a9765dade23fef7131fa9b34229b5feef (patch) | |
| tree | 14e2956793ffb8edbf2a7aaa7cf620fcefe4dd34 /src/partest | |
| parent | 70a93f52c3efafe604d6547b335cc361deff4f29 (diff) | |
| parent | 9cabcf2d2dcdd0917c48e5f081d90f5c5cfe0e99 (diff) | |
| download | scala-9736f97a9765dade23fef7131fa9b34229b5feef.tar.gz scala-9736f97a9765dade23fef7131fa9b34229b5feef.tar.bz2 scala-9736f97a9765dade23fef7131fa9b34229b5feef.zip | |
Merge pull request #2561 from soc/SI-7479
SI-7479 Make test/files/run/tailcalls.scala pass on Avian
Diffstat (limited to 'src/partest')
| -rw-r--r-- | src/partest/scala/tools/partest/nest/Runner.scala | 3 | ||||
| -rw-r--r-- | src/partest/scala/tools/partest/utils/Properties.scala | 1 |
2 files changed, 3 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 } diff --git a/src/partest/scala/tools/partest/utils/Properties.scala b/src/partest/scala/tools/partest/utils/Properties.scala index 1263c96e9e..b9394b50c9 100644 --- a/src/partest/scala/tools/partest/utils/Properties.scala +++ b/src/partest/scala/tools/partest/utils/Properties.scala @@ -14,4 +14,5 @@ package utils object Properties extends scala.util.PropertiesTrait { protected def propCategory = "partest" protected def pickJarBasedOn = classOf[nest.RunnerManager] + override def isAvian = super.isAvian } |