test/gc/arguments/TestVerifyBeforeAndAfterGCFlags.java

*** 41,62 ****
  import jdk.test.lib.ProcessTools;
  
  public class TestVerifyBeforeAndAfterGCFlags {
  
      // VerifyBeforeGC:[Verifying threads heap tenured eden syms strs zone dict metaspace chunks hand C-heap code cache ]
!     public static final String VERIFY_BEFORE_GC_PATTERN = "VerifyBeforeGC:\\[Verifying\\s+([^]\\s]+\\s+)+\\]";
      // VerifyBeforeGC: VerifyBeforeGC: VerifyBeforeGC:
      public static final String VERIFY_BEFORE_GC_CORRUPTED_PATTERN = "VerifyBeforeGC:(?!\\[Verifying[^]]+\\])";
  
      // VerifyAfterGC:[Verifying threads heap tenured eden syms strs zone dict metaspace chunks hand C-heap code cache ]
!     public static final String VERIFY_AFTER_GC_PATTERN = "VerifyAfterGC:\\[Verifying\\s+([^]\\s]+\\s+)+\\]";
      // VerifyAfterGC: VerifyAfterGC: VerifyAfterGC:
      public static final String VERIFY_AFTER_GC_CORRUPTED_PATTERN = "VerifyAfterGC:(?!\\[Verifying[^]]+\\])";
  
      public static void main(String args[]) throws Exception {
          String[] filteredOpts = Utils.getFilteredTestJavaOpts(
!                                     new String[] { "-Xloggc:",
                                                     "-XX:+UseGCLogFileRotation",
                                                     "-XX:-DisplayVMOutput",
                                                     "VerifyBeforeGC",
                                                     "VerifyAfterGC" });
          testVerifyFlags(false, false, filteredOpts);
--- 41,62 ----
  import jdk.test.lib.ProcessTools;
  
  public class TestVerifyBeforeAndAfterGCFlags {
  
      // VerifyBeforeGC:[Verifying threads heap tenured eden syms strs zone dict metaspace chunks hand C-heap code cache ]
!     public static final String VERIFY_BEFORE_GC_PATTERN = "Verifying Before GC";
      // VerifyBeforeGC: VerifyBeforeGC: VerifyBeforeGC:
      public static final String VERIFY_BEFORE_GC_CORRUPTED_PATTERN = "VerifyBeforeGC:(?!\\[Verifying[^]]+\\])";
  
      // VerifyAfterGC:[Verifying threads heap tenured eden syms strs zone dict metaspace chunks hand C-heap code cache ]
!     public static final String VERIFY_AFTER_GC_PATTERN = "Verifying After GC";
      // VerifyAfterGC: VerifyAfterGC: VerifyAfterGC:
      public static final String VERIFY_AFTER_GC_CORRUPTED_PATTERN = "VerifyAfterGC:(?!\\[Verifying[^]]+\\])";
  
      public static void main(String args[]) throws Exception {
          String[] filteredOpts = Utils.getFilteredTestJavaOpts(
!                                     new String[] { "-Xlog:gc+verify=debug",
                                                     "-XX:+UseGCLogFileRotation",
                                                     "-XX:-DisplayVMOutput",
                                                     "VerifyBeforeGC",
                                                     "VerifyAfterGC" });
          testVerifyFlags(false, false, filteredOpts);
*** 72,81 ****
--- 72,82 ----
          if (opts != null && (opts.length > 0)) {
              Collections.addAll(vmOpts, opts);
          }
  
          Collections.addAll(vmOpts, new String[] {
+                                        "-Xlog:gc+verify=debug",
                                         "-Xmx5m",
                                         "-Xms5m",
                                         "-Xmn3m",
                                         "-XX:+UnlockDiagnosticVMOptions",
                                         (verifyBeforeGC ? "-XX:+VerifyBeforeGC"