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

*** 93,123 ****
      }
  
  
      // Create AppCDS archive using most common args - convenience method
      // Legacy name preserved for compatibility
!     public static OutputAnalyzer dump(String appJar, String appClasses[],
                                                 String... suffix) throws Exception {
!         return createArchive(appJar, appClasses, suffix);
      }
  
  
      // Create AppCDS archive using most common args - convenience method
!     public static OutputAnalyzer createArchive(String appJar, String appClasses[],
                                                 String... suffix) throws Exception {
!         AppCDSOptions opts = (new AppCDSOptions()).setAppJar(appJar)
!             .setAppClasses(appClasses);
          opts.addSuffix(suffix);
          return createArchive(opts);
      }
  
      // Create AppCDS archive using appcds options
      public static OutputAnalyzer createArchive(AppCDSOptions opts)
          throws Exception {
  
          ArrayList<String> cmd = new ArrayList<String>();
-         File classList = makeClassList(opts.appClasses);
          startNewArchiveName();
  
          for (String p : opts.prefix) cmd.add(p);
  
          if (opts.appJar != null) {
--- 93,122 ----
      }
  
  
      // Create AppCDS archive using most common args - convenience method
      // Legacy name preserved for compatibility
!     public static OutputAnalyzer dump(String appJar, String classList[],
                                                 String... suffix) throws Exception {
!         return createArchive(appJar, classList, suffix);
      }
  
  
      // Create AppCDS archive using most common args - convenience method
!     public static OutputAnalyzer createArchive(String appJar, String classList[],
                                                 String... suffix) throws Exception {
!         AppCDSOptions opts = (new AppCDSOptions()).setAppJar(appJar);
!         opts.setClassList(classList);
          opts.addSuffix(suffix);
          return createArchive(opts);
      }
  
      // Create AppCDS archive using appcds options
      public static OutputAnalyzer createArchive(AppCDSOptions opts)
          throws Exception {
  
          ArrayList<String> cmd = new ArrayList<String>();
          startNewArchiveName();
  
          for (String p : opts.prefix) cmd.add(p);
  
          if (opts.appJar != null) {
*** 127,143 ****
              cmd.add("-cp");
              cmd.add("\"\"");
          }
  
          cmd.add("-Xshare:dump");
-         cmd.add("-XX:ExtraSharedClassListFile=" + classList.getPath());
  
          if (opts.archiveName == null)
              opts.archiveName = getCurrentArchiveName();
  
          cmd.add("-XX:SharedArchiveFile=" + opts.archiveName);
  
          for (String s : opts.suffix) cmd.add(s);
  
          String[] cmdLine = cmd.toArray(new String[cmd.size()]);
          ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(true, cmdLine);
          return executeAndLog(pb, "dump");
--- 126,146 ----
              cmd.add("-cp");
              cmd.add("\"\"");
          }
  
          cmd.add("-Xshare:dump");
  
          if (opts.archiveName == null)
              opts.archiveName = getCurrentArchiveName();
  
          cmd.add("-XX:SharedArchiveFile=" + opts.archiveName);
  
+         if (opts.classList != null) {
+             File classListFile = makeClassList(opts.classList);
+             cmd.add("-XX:ExtraSharedClassListFile=" + classListFile.getPath());
+         }
+ 
          for (String s : opts.suffix) cmd.add(s);
  
          String[] cmdLine = cmd.toArray(new String[cmd.size()]);
          ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(true, cmdLine);
          return executeAndLog(pb, "dump");
*** 233,257 ****
          return runWithArchive(opts);
      }
  
  
      // A common operation: dump, then check results
!     public static OutputAnalyzer testDump(String appJar, String appClasses[],
                                            String... suffix) throws Exception {
!         OutputAnalyzer output = dump(appJar, appClasses, suffix);
          output.shouldContain("Loading classes to share");
          output.shouldHaveExitValue(0);
          return output;
      }
  
  
      /**
!      * Simple test -- dump and execute appJar with the given appClasses in classlist.
       */
!     public static OutputAnalyzer test(String appJar, String appClasses[], String... args)
          throws Exception {
!         testDump(appJar, appClasses);
  
          OutputAnalyzer output = exec(appJar, args);
          return checkExec(output);
      }
  
--- 236,260 ----
          return runWithArchive(opts);
      }
  
  
      // A common operation: dump, then check results
!     public static OutputAnalyzer testDump(String appJar, String classList[],
                                            String... suffix) throws Exception {
!         OutputAnalyzer output = dump(appJar, classList, suffix);
          output.shouldContain("Loading classes to share");
          output.shouldHaveExitValue(0);
          return output;
      }
  
  
      /**
!      * Simple test -- dump and execute appJar with the given classList in classlist.
       */
!     public static OutputAnalyzer test(String appJar, String classList[], String... args)
          throws Exception {
!         testDump(appJar, classList);
  
          OutputAnalyzer output = exec(appJar, args);
          return checkExec(output);
      }