Merge
authormockner
Mon, 11 Apr 2016 22:14:14 +0200
changeset 37454 abe575799208
parent 37453 e333d1d43e75 (diff)
parent 37447 cfca237ba41f (current diff)
child 37455 0ead2c64bfde
Merge
--- a/hotspot/test/runtime/logging/ClassInitializationTest.java	Mon Apr 11 14:42:56 2016 +0000
+++ b/hotspot/test/runtime/logging/ClassInitializationTest.java	Mon Apr 11 22:14:14 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 {