test/hotspot/jtreg/runtime/cds/TestDefaultArchiveLoading.java

*** 22,11 ***
   * questions.
   */
  
  /**
   * @test id=nocoops_nocoh
!  * @summary Test Loading of default archives in all configurations (requires --enable-cds-archive-nocoh)
   * @requires vm.cds
   * @requires vm.cds.default.archive.available
   * @requires vm.cds.write.archived.java.heap
   * @requires vm.bits == 64
   * @library /test/lib
--- 22,11 ---
   * questions.
   */
  
  /**
   * @test id=nocoops_nocoh
!  * @summary Test Loading of default archives in all configurations
   * @requires vm.cds
   * @requires vm.cds.default.archive.available
   * @requires vm.cds.write.archived.java.heap
   * @requires vm.bits == 64
   * @library /test/lib

*** 35,11 ***
   * @run driver TestDefaultArchiveLoading nocoops_nocoh
   */
  
  /**
   * @test id=nocoops_coh
!  * @summary Test Loading of default archives in all configurations
   * @requires vm.cds
   * @requires vm.cds.default.archive.available
   * @requires vm.cds.write.archived.java.heap
   * @requires vm.bits == 64
   * @library /test/lib
--- 35,11 ---
   * @run driver TestDefaultArchiveLoading nocoops_nocoh
   */
  
  /**
   * @test id=nocoops_coh
!  * @summary Test Loading of default archives in all configurations (requires --enable-cds-archive-coh)
   * @requires vm.cds
   * @requires vm.cds.default.archive.available
   * @requires vm.cds.write.archived.java.heap
   * @requires vm.bits == 64
   * @library /test/lib

*** 48,11 ***
   * @run driver TestDefaultArchiveLoading nocoops_coh
   */
  
  /**
   * @test id=coops_nocoh
!  * @summary Test Loading of default archives in all configurations (requires --enable-cds-archive-nocoh)
   * @requires vm.cds
   * @requires vm.cds.default.archive.available
   * @requires vm.cds.write.archived.java.heap
   * @requires vm.bits == 64
   * @requires vm.gc != "Z"
--- 48,11 ---
   * @run driver TestDefaultArchiveLoading nocoops_coh
   */
  
  /**
   * @test id=coops_nocoh
!  * @summary Test Loading of default archives in all configurations
   * @requires vm.cds
   * @requires vm.cds.default.archive.available
   * @requires vm.cds.write.archived.java.heap
   * @requires vm.bits == 64
   * @requires vm.gc != "Z"

*** 62,11 ***
   * @run driver TestDefaultArchiveLoading coops_nocoh
   */
  
  /**
   * @test id=coops_coh
!  * @summary Test Loading of default archives in all configurations
   * @requires vm.cds
   * @requires vm.cds.default.archive.available
   * @requires vm.cds.write.archived.java.heap
   * @requires vm.bits == 64
   * @requires vm.gc != "Z"
--- 62,11 ---
   * @run driver TestDefaultArchiveLoading coops_nocoh
   */
  
  /**
   * @test id=coops_coh
!  * @summary Test Loading of default archives in all configurations (requires --enable-cds-archive-coh)
   * @requires vm.cds
   * @requires vm.cds.default.archive.available
   * @requires vm.cds.write.archived.java.heap
   * @requires vm.bits == 64
   * @requires vm.gc != "Z"

*** 112,37 ***
          char coh, coops;
  
          switch (args[0]) {
              case "nocoops_nocoh":
                  coh = coops = '-';
!                 archiveSuffix = "_nocoops_nocoh";
                  if (!isArchiveAvailable(coops, coh, archiveSuffix)) {
                      throw new SkippedException("Skipping test due to " +
                                                 archivePath(archiveSuffix).toString() + " not available");
                  }
                  break;
              case "nocoops_coh":
                  coops = '-';
                  coh = '+';
!                 archiveSuffix = "_nocoops";
                  if (!isArchiveAvailable(coops, coh, archiveSuffix)) {
                      throw new SkippedException("Skipping test due to " +
                                                 archivePath(archiveSuffix).toString() + " not available");
                  }
                  break;
              case "coops_nocoh":
                  coops = '+';
                  coh = '-';
!                 archiveSuffix = "_nocoh";
                  if (!isArchiveAvailable(coops, coh, archiveSuffix)) {
                      throw new SkippedException("Skipping test due to " +
                                                 archivePath(archiveSuffix).toString() + " not available");
                  }
                  break;
              case "coops_coh":
                  coh = coops = '+';
!                 archiveSuffix = "";
                  if (!isArchiveAvailable(coops, coh, archiveSuffix)) {
                      throw new SkippedException("Skipping test due to " +
                                                 archivePath(archiveSuffix).toString() + " not available");
                  }
                  break;
--- 112,37 ---
          char coh, coops;
  
          switch (args[0]) {
              case "nocoops_nocoh":
                  coh = coops = '-';
!                 archiveSuffix = "_nocoops";
                  if (!isArchiveAvailable(coops, coh, archiveSuffix)) {
                      throw new SkippedException("Skipping test due to " +
                                                 archivePath(archiveSuffix).toString() + " not available");
                  }
                  break;
              case "nocoops_coh":
                  coops = '-';
                  coh = '+';
!                 archiveSuffix = "_nocoops_coh";
                  if (!isArchiveAvailable(coops, coh, archiveSuffix)) {
                      throw new SkippedException("Skipping test due to " +
                                                 archivePath(archiveSuffix).toString() + " not available");
                  }
                  break;
              case "coops_nocoh":
                  coops = '+';
                  coh = '-';
!                 archiveSuffix = "";
                  if (!isArchiveAvailable(coops, coh, archiveSuffix)) {
                      throw new SkippedException("Skipping test due to " +
                                                 archivePath(archiveSuffix).toString() + " not available");
                  }
                  break;
              case "coops_coh":
                  coh = coops = '+';
!                 archiveSuffix = "_coh";
                  if (!isArchiveAvailable(coops, coh, archiveSuffix)) {
                      throw new SkippedException("Skipping test due to " +
                                                 archivePath(archiveSuffix).toString() + " not available");
                  }
                  break;