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

*** 33,43 ****
  
  import jdk.test.lib.cds.CDSOptions;
  import jdk.test.lib.cds.CDSTestUtils;
  import jdk.test.lib.process.OutputAnalyzer;
  import jdk.test.lib.process.ProcessTools;
! import java.io.File;
  
  public class NonBootLoaderClasses {
      public static void main(String[] args) throws Exception {
          final String PLATFORM_CLASS = "jdk/dynalink/DynamicLinker";
          final String APP_CLASS = "com/sun/tools/javac/Main";
--- 33,43 ----
  
  import jdk.test.lib.cds.CDSOptions;
  import jdk.test.lib.cds.CDSTestUtils;
  import jdk.test.lib.process.OutputAnalyzer;
  import jdk.test.lib.process.ProcessTools;
! import jtreg.SkippedException;
  
  public class NonBootLoaderClasses {
      public static void main(String[] args) throws Exception {
          final String PLATFORM_CLASS = "jdk/dynalink/DynamicLinker";
          final String APP_CLASS = "com/sun/tools/javac/Main";
*** 54,64 ****
          ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
                  "-cp", "\"\"",
                  "-XX:+UnlockDiagnosticVMOptions", "-XX:SharedArchiveFile=./" + archiveName,
                  "-XX:+PrintSharedArchiveAndExit", "-XX:+PrintSharedDictionary");
          OutputAnalyzer out = CDSTestUtils.executeAndLog(pb, "print-shared-archive");
!         if (!CDSTestUtils.isUnableToMap(out)) {
              out.shouldContain("archive is valid")
                 .shouldHaveExitValue(0)               // Should report success in error code.
                 .shouldContain(PLATFORM_CLASS.replace('/', '.'))
                 .shouldContain(APP_CLASS.replace('/', '.'));
          }
--- 54,66 ----
          ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
                  "-cp", "\"\"",
                  "-XX:+UnlockDiagnosticVMOptions", "-XX:SharedArchiveFile=./" + archiveName,
                  "-XX:+PrintSharedArchiveAndExit", "-XX:+PrintSharedDictionary");
          OutputAnalyzer out = CDSTestUtils.executeAndLog(pb, "print-shared-archive");
!         if (CDSTestUtils.isUnableToMap(out)) {
!             throw new SkippedException(CDSTestUtils.UnableToMapMsg);
!         } else {
              out.shouldContain("archive is valid")
                 .shouldHaveExitValue(0)               // Should report success in error code.
                 .shouldContain(PLATFORM_CLASS.replace('/', '.'))
                 .shouldContain(APP_CLASS.replace('/', '.'));
          }