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

@@ -22,11 +22,11 @@
   * questions.
   */
  
  /**
   * @test id=nocoops_nocoh
-  * @summary Test Loading of default archives in all configurations (requires --enable-cds-archive-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 +35,11 @@
   * @run driver TestDefaultArchiveLoading nocoops_nocoh
   */
  
  /**
   * @test id=nocoops_coh
-  * @summary Test Loading of default archives in all configurations
+  * @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 +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)
+  * @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 +62,11 @@
   * @run driver TestDefaultArchiveLoading coops_nocoh
   */
  
  /**
   * @test id=coops_coh
-  * @summary Test Loading of default archives in all configurations
+  * @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 +112,37 @@
          char coh, coops;
  
          switch (args[0]) {
              case "nocoops_nocoh":
                  coh = coops = '-';
-                 archiveSuffix = "_nocoops_nocoh";
+                 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";
+                 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 = "_nocoh";
+                 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 = "";
+                 archiveSuffix = "_coh";
                  if (!isArchiveAvailable(coops, coh, archiveSuffix)) {
                      throw new SkippedException("Skipping test due to " +
                                                 archivePath(archiveSuffix).toString() + " not available");
                  }
                  break;