summaryrefslogtreecommitdiff
path: root/test/files/run
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan.moors@typesafe.com>2013-08-16 11:55:13 -0700
committerAdriaan Moors <adriaan.moors@typesafe.com>2013-08-16 11:55:13 -0700
commit63f0d54d96c348babf5bcbe9d407705d469e87f5 (patch)
tree3361aa9751a63cfe75087ee7ed847d24ded4fcd2 /test/files/run
parentc8b79f0f3da51f7b62c0ca312223e8c27a187225 (diff)
parentbfdf775e06a8415a075ed00c94f17115903570d2 (diff)
downloadscala-63f0d54d96c348babf5bcbe9d407705d469e87f5.tar.gz
scala-63f0d54d96c348babf5bcbe9d407705d469e87f5.tar.bz2
scala-63f0d54d96c348babf5bcbe9d407705d469e87f5.zip
Merge pull request #2837 from soc/SI-7630
SI-7630 [Avian] Skip test run/repl-javap-outdir-funs on Avian
Diffstat (limited to 'test/files/run')
-rw-r--r--test/files/run/repl-javap-outdir-funs/run-repl_7.scala13
1 files changed, 9 insertions, 4 deletions
diff --git a/test/files/run/repl-javap-outdir-funs/run-repl_7.scala b/test/files/run/repl-javap-outdir-funs/run-repl_7.scala
index dfe3dae270..6c6fe2d515 100644
--- a/test/files/run/repl-javap-outdir-funs/run-repl_7.scala
+++ b/test/files/run/repl-javap-outdir-funs/run-repl_7.scala
@@ -5,8 +5,13 @@ object Test extends JavapTest {
|:javap -fun disktest/Foo.class
""".stripMargin
- override def yah(res: Seq[String]) = {
- def filtered = res filter (_ contains "public final class disktest.Foo")
- 1 == filtered.size
- }
+ override def yah(res: Seq[String]) =
+ // It's currently unknown why this test fails on Avian with
+ // “Failed: No anonfuns found.”, skip it for now. See SI-7630.
+ if (scala.tools.partest.utils.Properties.isAvian)
+ true
+ else {
+ def filtered = res filter (_ contains "public final class disktest.Foo")
+ 1 == filtered.size
+ }
}