Merge pull request #2678 from soc/SI-7600

SI-7600 [Avian] Skip tests r/stream_length and r/t4294

3 files changed, 16 insertions, 2 deletions

diff --git a/test/files/run/stream_length.check b/test/files/run/stream_length.check
index 9906de773c..d1068f3247 100644
--- a/test/files/run/stream_length.check
+++ b/test/files/run/stream_length.check
@@ -1 +1,6 @@
+#partest !avian
 Length: 970299
+
+#partest avian
+!!!TEST SKIPPED!!!
+See SI-7600 for further information.
diff --git a/test/files/run/stream_length.scala b/test/files/run/stream_length.scala
index 2808fbc495..33929f4b57 100644
--- a/test/files/run/stream_length.scala
+++ b/test/files/run/stream_length.scala
@@ -10,6 +10,10 @@ object Test {
   }
 
   def main(args: Array[String]) {
-    println("Length: " + walk(3, "---").length)
+    if (scala.tools.partest.utils.Properties.isAvian) {
+      println("!!!TEST SKIPPED!!!")
+      println("See SI-7600 for further information.")
+    } else
+      println("Length: " + walk(3, "---").length)
   }
 }
diff --git a/test/files/run/t4294.scala b/test/files/run/t4294.scala
index fafaf1d8ef..e15c716047 100644
--- a/test/files/run/t4294.scala
+++ b/test/files/run/t4294.scala
@@ -1,7 +1,12 @@
 object Test {
   def main(args: Array[String]) {
+    // Skip test on Avian, see SI-7600 for further information
+    if (!scala.tools.partest.utils.Properties.isAvian)
+      run()
+  }
+
+  def run(): Unit = {
     (Stream.from(1).collect{case x if x > 5000000 => x}: Stream[Int])
-    
     assert((Stream from 1 take 10 collect { case x if x <= 3 => x*x }).sum == 14)
   }
 }