test/lib/jdk/test/lib/cds/CDSTestUtils.java

*** 245,255 ****
  
          for (String p : opts.prefix) cmd.add(p);
  
          cmd.add("-Xshare:dump");
          cmd.add("-Xlog:cds,cds+hashtables");
-         cmd.add("-XX:+UnlockDiagnosticVMOptions");
          if (opts.archiveName == null)
              opts.archiveName = getDefaultArchiveName();
          cmd.add("-XX:SharedArchiveFile=./" + opts.archiveName);
  
          for (String s : opts.suffix) cmd.add(s);
--- 245,254 ----
*** 383,393 ****
          ArrayList<String> cmd = new ArrayList<String>();
  
          for (String p : opts.prefix) cmd.add(p);
  
          cmd.add("-Xshare:" + opts.xShareMode);
-         cmd.add("-XX:+UnlockDiagnosticVMOptions");
          cmd.add("-Dtest.timeout.factor=" + TestTimeoutFactor);
  
          if (opts.archiveName == null)
              opts.archiveName = getDefaultArchiveName();
          cmd.add("-XX:SharedArchiveFile=" + opts.archiveName);
--- 382,391 ----