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

*** 44,64 ****
  
          // (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
              });
--- 44,64 ----
  
          // (1) With a valid archive
          opts = (new CDSOptions())
              .setUseVersion(false)
              .addSuffix( "-XX:+UnlockDiagnosticVMOptions", "-XX:SharedArchiveFile=./" + archiveName,
!                 "-XX:+PrintSharedArchiveAndExit", "-Xlog:cds", "-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", "-Xlog:cds");
          CDSTestUtils.run(opts)
              .assertNormalExit(output -> {
                  output.shouldContain("archive is valid");
                  output.shouldNotContain("Usage:"); // Should not print JVM help message
              });