summaryrefslogtreecommitdiff
path: root/test/files
diff options
context:
space:
mode:
authormichelou <michelou@epfl.ch>2008-12-09 14:10:01 +0000
committermichelou <michelou@epfl.ch>2008-12-09 14:10:01 +0000
commit4d32e17513cf46b786eef8523653ac366c73a09c (patch)
tree9597ac9fbc1fb91bbd7329a0a3a20f728e125128 /test/files
parentaae227ba010e11622442743d6f3f9f23d29c1e6b (diff)
downloadscala-4d32e17513cf46b786eef8523653ac366c73a09c.tar.gz
scala-4d32e17513cf46b786eef8523653ac366c73a09c.tar.bz2
scala-4d32e17513cf46b786eef8523653ac366c73a09c.zip
disabled one test on Java 1.4
Diffstat (limited to 'test/files')
-rw-r--r--test/files/jvm/manifests.check2
-rw-r--r--test/files/jvm/manifests.scala2
2 files changed, 1 insertions, 3 deletions
diff --git a/test/files/jvm/manifests.check b/test/files/jvm/manifests.check
index 2539cd956b..bfcd6a20eb 100644
--- a/test/files/jvm/manifests.check
+++ b/test/files/jvm/manifests.check
@@ -55,5 +55,3 @@ List(List(1), List(2))=List(List(1), List(2))
Array(Array(1), Array(2))=Array(Array(1), Array(2))
-x=char, m=scala.reflect.Manifest[char]
-
diff --git a/test/files/jvm/manifests.scala b/test/files/jvm/manifests.scala
index a240278eaa..bb8843f834 100644
--- a/test/files/jvm/manifests.scala
+++ b/test/files/jvm/manifests.scala
@@ -1,7 +1,7 @@
object Test extends Application {
Test1
Test2
- Test3
+ //Test3 // Java 1.5+ only
}
class Foo[T](x: T)