test/hotspot/jtreg/runtime/appcds/TestCommon.java

*** 21,30 ****
--- 21,31 ----
   * questions.
   *
   */
  
  import jdk.test.lib.Utils;
+ import jdk.test.lib.BuildHelper;
  import jdk.test.lib.JDKToolFinder;
  import jdk.test.lib.Platform;
  import jdk.test.lib.cds.CDSOptions;
  import jdk.test.lib.cds.CDSTestUtils;
  import jdk.test.lib.process.ProcessTools;
*** 126,135 ****
--- 127,139 ----
              cmd.add("\"\"");
          }
  
          cmd.add("-Xshare:dump");
          cmd.add("-Xlog:cds,cds+hashtables");
+         if (BuildHelper.isCommercialBuild()) {
+             cmd.add("-XX:+UnlockCommercialFeatures");
+         }
          cmd.add("-XX:+UseAppCDS");
          cmd.add("-XX:ExtraSharedClassListFile=" + classList.getPath());
  
          if (opts.archiveName == null)
              opts.archiveName = getCurrentArchiveName();
*** 151,160 ****
--- 155,167 ----
          ArrayList<String> cmd = new ArrayList<String>();
  
          for (String p : opts.prefix) cmd.add(p);
  
          cmd.add("-Xshare:" + opts.xShareMode);
+         if (BuildHelper.isCommercialBuild()) {
+             cmd.add("-XX:+UnlockCommercialFeatures");
+         }
          cmd.add("-XX:+UseAppCDS");
          cmd.add("-showversion");
          cmd.add("-XX:SharedArchiveFile=" + getCurrentArchiveName());
          cmd.add("-Dtest.timeout.factor=" + timeoutFactor);