From bd9364a0d087ecac9ceed4fde182bba0fdb4053c Mon Sep 17 00:00:00 2001
From: Matias Saavedra Silva <matias.s.saavedra.silva@oracle.com>
Date: Tue, 9 May 2023 21:08:48 +0000
Subject: [PATCH] 8281715: Move "base CDS archive not loaded" tests to
 SharedArchiveFileOption.java

---
 .../dynamicArchive/ArchiveConsistency.java    | 27 -------------------
 .../SharedArchiveFileOption.java              | 24 +++++++++++++++++
 2 files changed, 24 insertions(+), 27 deletions(-)

diff --git a/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/ArchiveConsistency.java b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/ArchiveConsistency.java
index 5240202db67aa..00bd63fa3d466 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/ArchiveConsistency.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/ArchiveConsistency.java
@@ -218,32 +218,5 @@ private static void doTest(String baseArchiveName, String topArchiveName) throws
         runTwo(nonExistBase, nonExistTop,
                appJar, mainClass, isAuto ? 0 : 1,
                "Specified shared archive not found (" + nonExistBase + ")");
-
-        // following two tests:
-        //   -Xshare:auto -XX:SharedArchiveFile=top.jsa, but base does not exist.
-
-      if (!isUseSharedSpacesDisabled()) {
-        new File(baseArchiveName).delete();
-
-        startTest("11. -XX:+AutoCreateSharedArchive -XX:SharedArchiveFile=" + topArchiveName);
-        run(topArchiveName,
-            "-Xshare:auto",
-            "-XX:+AutoCreateSharedArchive",
-            "-cp",
-            appJar, mainClass)
-            .assertNormalExit(output -> {
-                output.shouldContain("warning: -XX:+AutoCreateSharedArchive is unsupported when base CDS archive is not loaded");
-            });
-
-        startTest("12. -XX:SharedArchiveFile=" + topArchiveName + " -XX:ArchiveClassesAtExit=" + getNewArchiveName("top3"));
-        run(topArchiveName,
-            "-Xshare:auto",
-            "-XX:ArchiveClassesAtExit=" + getNewArchiveName("top3"),
-            "-cp",
-            appJar, mainClass)
-            .assertNormalExit(output -> {
-                output.shouldContain("-XX:ArchiveClassesAtExit is unsupported when base CDS archive is not loaded");
-            });
-      }
     }
 }
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/SharedArchiveFileOption.java b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/SharedArchiveFileOption.java
index 3f354ee993ffb..489efdfed067b 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/SharedArchiveFileOption.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/SharedArchiveFileOption.java
@@ -228,6 +228,30 @@ private static void doTest(String baseArchiveName, String topArchiveName) throws
                   "-Xlog:cds",
                   "-cp", appJar, mainClass)
                  .assertAbnormalExit("Cannot use the following option when dumping the shared archive: --patch-module");
+
+            // following two tests:
+            //   -Xshare:auto -XX:SharedArchiveFile=top.jsa, but base does not exist.
+            if (!isUseSharedSpacesDisabled()) {
+                new File(baseArchiveName).delete();
+                testcase("Archive not loaded -XX:+AutoCreateSharedArchive -XX:SharedArchiveFile=" + topArchiveName);
+                run(topArchiveName,
+                    "-Xshare:auto",
+                    "-XX:+AutoCreateSharedArchive",
+                    "-cp",
+                    appJar, mainClass)
+                    .assertNormalExit(output -> {
+                        output.shouldContain("warning: -XX:+AutoCreateSharedArchive is unsupported when base CDS archive is not loaded");
+                    });
+                testcase("Archive not loaded -XX:SharedArchiveFile=" + topArchiveName + " -XX:ArchiveClassesAtExit=" + getNewArchiveName("top3"));
+                run(topArchiveName,
+                    "-Xshare:auto",
+                    "-XX:ArchiveClassesAtExit=" + getNewArchiveName("top3"),
+                    "-cp",
+                    appJar, mainClass)
+                    .assertNormalExit(output -> {
+                        output.shouldContain(ERROR);
+                    });
+            }
         }
 
         {