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

*** 108,129 ****
          opts.addSuffix(suffix);
          return createArchive(opts);
      }
  
      // If you use -XX:+UseAppCDS or -XX:-UseAppCDS in your JVM command-line, call this method
!     // to wrap the arguments. On commercial builds, -XX:+UnlockCommercialFeatures will be
!     // prepended to the command-line. See JDK-8193664.
      public static String[] makeCommandLineForAppCDS(String... args) throws Exception {
-         if (BuildHelper.isCommercialBuild()) {
-             String[] newArgs = new String[args.length + 1];
-             newArgs[0] = "-XX:+UnlockCommercialFeatures";
-             System.arraycopy(args, 0, newArgs, 1, args.length);
-             return newArgs;
-         } else {
              return args;
          }
-     }
  
      // Create AppCDS archive using appcds options
      public static OutputAnalyzer createArchive(AppCDSOptions opts)
          throws Exception {
  
--- 108,121 ----
          opts.addSuffix(suffix);
          return createArchive(opts);
      }
  
      // If you use -XX:+UseAppCDS or -XX:-UseAppCDS in your JVM command-line, call this method
!     // to wrap the arguments.
      public static String[] makeCommandLineForAppCDS(String... args) throws Exception {
          return args;
      }
  
      // Create AppCDS archive using appcds options
      public static OutputAnalyzer createArchive(AppCDSOptions opts)
          throws Exception {