Merge
authoramurillo
Tue, 17 May 2016 07:43:45 -0700
changeset 38369 73280b96de24
parent 38368 c8eb5d6812c5 (current diff)
parent 38329 254b331d0059 (diff)
child 38370 61f46e1e7aee
Merge
--- a/jdk/test/java/lang/Class/getDeclaredField/FieldSetAccessibleTest.java	Tue May 17 05:38:15 2016 -0700
+++ b/jdk/test/java/lang/Class/getDeclaredField/FieldSetAccessibleTest.java	Tue May 17 07:43:45 2016 -0700
@@ -228,12 +228,18 @@
     }
 
     static boolean test(String s, boolean addExports) {
+        String clsName = s.replace('/', '.').substring(0, s.length() - 6);
         try {
+            System.out.println("Loading " + clsName);
             final Class<?> c = Class.forName(
-                    s.replace('/', '.').substring(0, s.length() - 6),
+                    clsName,
                     false,
                     systemClassLoader);
             return test(c, addExports);
+        } catch (VerifyError ve) {
+            System.err.println("VerifyError for " + clsName);
+            ve.printStackTrace(System.err);
+            failed.add(s);
         } catch (Exception t) {
             t.printStackTrace(System.err);
             failed.add(s);
--- a/jdk/test/tools/jimage/VerifyJimage.java	Tue May 17 05:38:15 2016 -0700
+++ b/jdk/test/tools/jimage/VerifyJimage.java	Tue May 17 07:43:45 2016 -0700
@@ -188,7 +188,11 @@
                         String cn = removeModule(n).replaceAll("\\.class$", "").replace('/', '.');
                         count.incrementAndGet();
                         try {
+                            System.out.println("Loading " + cn);
                             Class.forName(cn, false, loader);
+                        } catch (VerifyError ve) {
+                            System.err.println("VerifyError for " + cn);
+                            failed.add(reader.imageName() + ": " + cn + " not verified: " + ve.getMessage());
                         } catch (ClassNotFoundException e) {
                             failed.add(reader.imageName() + ": " + cn + " not found");
                         }