test/hotspot/jtreg/runtime/SharedArchiveFile/PrintSharedArchiveAndExit.java

*** 31,66 ****
   *          java.management
   */
  
  import jdk.test.lib.cds.CDSOptions;
  import jdk.test.lib.cds.CDSTestUtils;
- import jdk.test.lib.process.ProcessTools;
  import jdk.test.lib.process.OutputAnalyzer;
  
  public class PrintSharedArchiveAndExit {
      public static void main(String[] args) throws Exception {
          String archiveName = "PrintSharedArchiveAndExit.jsa";
          CDSOptions opts = (new CDSOptions()).setArchiveName(archiveName);
          OutputAnalyzer out = CDSTestUtils.createArchive(opts);
          CDSTestUtils.checkDump(out);
  
          // (1) With a valid archive
!         ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
!                 "-XX:+UnlockDiagnosticVMOptions", "-XX:SharedArchiveFile=./" + archiveName,
                  "-XX:+PrintSharedArchiveAndExit", "-version");
!         out = CDSTestUtils.executeAndLog(pb, "print-shared-archive-and-version");
!         CDSTestUtils.checkMappingFailure(out);
  
-         out.shouldContain("archive is valid")
-             .shouldNotContain("java version")     // Should not print JVM version
-             .shouldHaveExitValue(0);              // Should report success in error code.
  
!         pb = ProcessTools.createJavaProcessBuilder(
!                 "-XX:+UnlockDiagnosticVMOptions", "-XX:SharedArchiveFile=./" + archiveName,
                  "-XX:+PrintSharedArchiveAndExit");
!         out = CDSTestUtils.executeAndLog(pb, "print-shared-archive");
!         CDSTestUtils.checkMappingFailure(out);
!         out.shouldContain("archive is valid")
!             .shouldNotContain("Usage:")           // Should not print JVM help message
!             .shouldHaveExitValue(0);              // Should report success in error code.
      }
  }
--- 31,67 ----
   *          java.management
   */
  
  import jdk.test.lib.cds.CDSOptions;
  import jdk.test.lib.cds.CDSTestUtils;
  import jdk.test.lib.process.OutputAnalyzer;
  
  public class PrintSharedArchiveAndExit {
      public static void main(String[] args) throws Exception {
          String archiveName = "PrintSharedArchiveAndExit.jsa";
          CDSOptions opts = (new CDSOptions()).setArchiveName(archiveName);
          OutputAnalyzer out = CDSTestUtils.createArchive(opts);
          CDSTestUtils.checkDump(out);
  
          // (1) With a valid archive
!         opts = (new CDSOptions())
!             .setUseVersion(false)
!             .addSuffix( "-XX:+UnlockDiagnosticVMOptions", "-XX:SharedArchiveFile=./" + archiveName,
                  "-XX:+PrintSharedArchiveAndExit", "-version");
!         CDSTestUtils.run(opts)
!             .assertNormalExit(output -> {
!                 output.shouldContain("archive is valid");
!                 output.shouldNotContain("java version"); // Should not print JVM version
!             });
              
  
!         opts = (new CDSOptions())
!             .setUseVersion(false)
!             .addSuffix( "-XX:+UnlockDiagnosticVMOptions", "-XX:SharedArchiveFile=./" + archiveName,
                  "-XX:+PrintSharedArchiveAndExit");
!         CDSTestUtils.run(opts)
!             .assertNormalExit(output -> {
!                 output.shouldContain("archive is valid");
!                 output.shouldNotContain("Usage:"); // Should not print JVM help message
!             });
      }
  }