Merge
authormockner
Tue, 12 Apr 2016 02:30:13 +0200
changeset 37455 0ead2c64bfde
parent 37452 99a20ba84625 (current diff)
parent 37454 abe575799208 (diff)
child 37456 bf26e0f4235f
Merge
--- a/hotspot/test/runtime/logging/ClassInitializationTest.java	Tue Apr 12 00:24:39 2016 +0200
+++ b/hotspot/test/runtime/logging/ClassInitializationTest.java	Tue Apr 12 02:30:13 2016 +0200
@@ -62,6 +62,16 @@
             out.shouldContain("[Initialized").shouldContain("without side effects]");
             out.shouldHaveExitValue(0);
         }
+
+        // (3) classinit should turn off.
+        pb = ProcessTools.createJavaProcessBuilder("-Xlog:classinit=off",
+                                                   "-Xverify:all",
+                                                   "-Xmx64m",
+                                                   "BadMap50");
+        out = new OutputAnalyzer(pb.start());
+        out.shouldNotContain("[classinit]");
+        out.shouldNotContain("Fail over class verification to old verifier for: BadMap50");
+
     }
     public static class InnerClass {
         public static void main(String[] args) throws Exception {