From 262ee3a852f278f97b083a05376de0eab96c805d Mon Sep 17 00:00:00 2001 From: Paul Phillips Date: Sat, 11 Dec 2010 14:57:06 +0000 Subject: When was the last time -Xcheckinit was run? It ... When was the last time -Xcheckinit was run? It must have been a long time. All these changes are to address bugs revealed by -Xcheckinit, mostly in test cases, some in the compiler. I'm guessing the partest -Xcheckinit runs are hanging the first time they run into a failure, so if it starts "working" again after this commit don't get too confident. No review. --- test/files/jvm/t3003/Annot.java | 4 +++- test/files/jvm/t3003/Test_1.scala | 9 ++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) (limited to 'test/files/jvm/t3003') diff --git a/test/files/jvm/t3003/Annot.java b/test/files/jvm/t3003/Annot.java index 1d5f206fd7..30dcb66bd7 100644 --- a/test/files/jvm/t3003/Annot.java +++ b/test/files/jvm/t3003/Annot.java @@ -1,4 +1,6 @@ -@java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME) +import java.lang.annotation.*; + +@Retention(RetentionPolicy.RUNTIME) public @interface Annot { Class optionType(); } diff --git a/test/files/jvm/t3003/Test_1.scala b/test/files/jvm/t3003/Test_1.scala index ec7f220c94..8ec08bebc6 100644 --- a/test/files/jvm/t3003/Test_1.scala +++ b/test/files/jvm/t3003/Test_1.scala @@ -3,6 +3,13 @@ class C { } object Test { def main(args: Array[String]) { - println(classOf[C].getDeclaredFields.toList.sortBy(f => f.getName).map(f => f.getAnnotations.toList)) + val xs = ( + classOf[C].getDeclaredFields.toList + . sortBy(f => f.getName) + . map(f => f.getAnnotations.toList) + . filterNot (_.isEmpty) // there are extra fields under -Xcheckinit + ) + + println(xs) } } -- cgit v1.2.3