diff options
| author | Simon Ochsenreither <simon@ochsenreither.de> | 2013-05-18 23:35:36 +0200 |
|---|---|---|
| committer | Simon Ochsenreither <simon@ochsenreither.de> | 2013-06-10 17:36:40 +0200 |
| commit | 9cabcf2d2dcdd0917c48e5f081d90f5c5cfe0e99 (patch) | |
| tree | 89f59e2a865de7d30acf7ac8548415b928bcd8f3 | |
| parent | da7c06478f711d6b41ad144b8cf4c8658381373e (diff) | |
| download | scala-9cabcf2d2dcdd0917c48e5f081d90f5c5cfe0e99.tar.gz scala-9cabcf2d2dcdd0917c48e5f081d90f5c5cfe0e99.tar.bz2 scala-9cabcf2d2dcdd0917c48e5f081d90f5c5cfe0e99.zip | |
SI-7479 Make test/files/run/tailcalls.scala pass on Avian
This commit modifies the test and check file to use the new diff filter.
| -rw-r--r-- | src/partest/scala/tools/partest/utils/Properties.scala | 1 | ||||
| -rw-r--r-- | test/files/run/tailcalls.check | 56 | ||||
| -rw-r--r-- | test/files/run/tailcalls.scala | 2 |
3 files changed, 58 insertions, 1 deletions
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 } diff --git a/test/files/run/tailcalls.check b/test/files/run/tailcalls.check index f123bc8f25..10384ac46e 100644 --- a/test/files/run/tailcalls.check +++ b/test/files/run/tailcalls.check @@ -1,3 +1,4 @@ +#partest !avian test Object .f was successful test Final .f was successful test Class .f raised exception java.lang.StackOverflowError @@ -51,3 +52,58 @@ test TailCall.b2 was successful test FancyTailCalls.tcTryLocal was successful test FancyTailCalls.differentInstance was successful test PolyObject.tramp was successful + +#partest avian +test Object .f was successful +test Final .f was successful +test Class .f was successful +test SubClass .f was successful +test Sealed .f was successful +test SubSealed.f was successful + +test O .f was successful +test c .f was successful +test O.O .f was successful +test O.c .f was successful +test c.O .f was successful +test c.c .f was successful +test O.O.O .f was successful +test O.O.c .f was successful +test O.c.O .f was successful +test O.c.c .f was successful +test c.O.O .f was successful +test c.O.c .f was successful +test c.c.O .f was successful +test c.c.c .f was successful +test O.O.O.O.f was successful +test O.O.O.c.f was successful +test O.O.c.O.f was successful +test O.O.c.c.f was successful +test O.c.O.O.f was successful +test O.c.O.c.f was successful +test O.c.c.O.f was successful +test O.c.c.c.f was successful +test c.O.O.O.f was successful +test c.O.O.c.f was successful +test c.O.c.O.f was successful +test c.O.c.c.f was successful +test c.c.O.O.f was successful +test c.c.O.c.f was successful +test c.c.c.O.f was successful +test c.c.c.c.f was successful + +test TailCall.f1 was successful +test TailCall.f2 was successful +test TailCall.f3 was successful +test TailCall.g1 was successful +test TailCall.g2 was successful +test TailCall.g3 was successful +test TailCall.h1 was successful + +test NonTailCall.f1 0 1 2 was successful +test NonTailCall.f2 +test TailCall.b1 was successful +test TailCall.b2 was successful +test FancyTailCalls.tcTryLocal was successful +test FancyTailCalls.differentInstance was successful +test PolyObject.tramp was successful
\ No newline at end of file diff --git a/test/files/run/tailcalls.scala b/test/files/run/tailcalls.scala index 7d06a7e69d..1d4124e138 100644 --- a/test/files/run/tailcalls.scala +++ b/test/files/run/tailcalls.scala @@ -307,7 +307,7 @@ object Test { def main(args: Array[String]) { // compute min and max iteration number val min = 16; - val max = calibrate; + val max = if (scala.tools.partest.utils.Properties.isAvian) 10000 else calibrate // test tail calls in different contexts val Final = new Final() |