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

*** 43,52 ****
--- 43,53 ----
  import java.io.PrintStream;
  
  import java.nio.file.Path;
  import java.nio.file.Paths;
  
+ import jdk.test.lib.Platform;
  import jdk.test.lib.cds.CDSOptions;
  import jdk.test.lib.cds.CDSTestUtils;
  import jdk.test.lib.process.ProcessTools;
  import jdk.test.lib.process.OutputAnalyzer;
  
*** 66,79 ****
--- 67,86 ----
  
      private static final String modes[] = {"on", "off"};
  
      private static String appJar;
      private static String bootAppendJar;
+     private static String limitMods;
  
      public static void main(String... args) throws Exception {
          dumpArchive();
  
+         limitMods = "--limit-modules=java.base";
+         if (!Platform.isSolaris()) {
+             limitMods += ",jdk.internal.vm.compiler";
+         }
+ 
          logTestCase("1");
          testBootAppendModuleClass();
  
          logTestCase("2");
          testBootAppendDuplicateModuleClass();
*** 167,177 ****
      public static void testBootAppendExcludedModuleClass() throws Exception {
          for (String mode : modes) {
              CDSOptions opts = (new CDSOptions())
                  .setXShareMode(mode).setUseVersion(false)
                  .addPrefix("-Xbootclasspath/a:" + bootAppendJar, "-showversion",
!                            "--limit-modules=java.base,jdk.internal.vm.compiler", "-cp", appJar)
                  .addSuffix("-Xlog:class+load=info",
                             APP_CLASS, BOOT_APPEND_MODULE_CLASS_NAME);
  
              OutputAnalyzer out = CDSTestUtils.runWithArchive(opts);
              CDSTestUtils.checkExec(out, opts, "[class,load] javax.sound.sampled.MyClass");
--- 174,184 ----
      public static void testBootAppendExcludedModuleClass() throws Exception {
          for (String mode : modes) {
              CDSOptions opts = (new CDSOptions())
                  .setXShareMode(mode).setUseVersion(false)
                  .addPrefix("-Xbootclasspath/a:" + bootAppendJar, "-showversion",
!                            limitMods, "-cp", appJar)
                  .addSuffix("-Xlog:class+load=info",
                             APP_CLASS, BOOT_APPEND_MODULE_CLASS_NAME);
  
              OutputAnalyzer out = CDSTestUtils.runWithArchive(opts);
              CDSTestUtils.checkExec(out, opts, "[class,load] javax.sound.sampled.MyClass");
*** 196,206 ****
      public static void testBootAppendDuplicateExcludedModuleClass() throws Exception {
          for (String mode : modes) {
              CDSOptions opts = (new CDSOptions())
                  .setXShareMode(mode).setUseVersion(false)
                  .addPrefix("-Xbootclasspath/a:" + bootAppendJar, "-showversion",
!                            "--limit-modules=java.base,jdk.internal.vm.compiler", "-cp", appJar)
                  .addSuffix("-Xlog:class+load=info",
                             APP_CLASS, BOOT_APPEND_DUPLICATE_MODULE_CLASS_NAME);
  
              OutputAnalyzer out = CDSTestUtils.runWithArchive(opts);
              CDSTestUtils.checkExec(out, opts, "[class,load] org.omg.CORBA.Context");
--- 203,213 ----
      public static void testBootAppendDuplicateExcludedModuleClass() throws Exception {
          for (String mode : modes) {
              CDSOptions opts = (new CDSOptions())
                  .setXShareMode(mode).setUseVersion(false)
                  .addPrefix("-Xbootclasspath/a:" + bootAppendJar, "-showversion",
!                            limitMods, "-cp", appJar)
                  .addSuffix("-Xlog:class+load=info",
                             APP_CLASS, BOOT_APPEND_DUPLICATE_MODULE_CLASS_NAME);
  
              OutputAnalyzer out = CDSTestUtils.runWithArchive(opts);
              CDSTestUtils.checkExec(out, opts, "[class,load] org.omg.CORBA.Context");
*** 224,234 ****
      public static void testBootAppendClass() throws Exception {
          for (String mode : modes) {
              CDSOptions opts = (new CDSOptions())
                  .setXShareMode(mode).setUseVersion(false)
                  .addPrefix("-Xbootclasspath/a:" + bootAppendJar, "-showversion",
!                            "--limit-modules=java.base,jdk.internal.vm.compiler", "-cp", appJar)
                  .addSuffix("-Xlog:class+load=info",
                             APP_CLASS, BOOT_APPEND_CLASS_NAME);
  
              OutputAnalyzer out = CDSTestUtils.runWithArchive(opts);
              CDSTestUtils.checkExec(out, opts, "[class,load] nonjdk.myPackage.MyClass");
--- 231,241 ----
      public static void testBootAppendClass() throws Exception {
          for (String mode : modes) {
              CDSOptions opts = (new CDSOptions())
                  .setXShareMode(mode).setUseVersion(false)
                  .addPrefix("-Xbootclasspath/a:" + bootAppendJar, "-showversion",
!                            limitMods, "-cp", appJar)
                  .addSuffix("-Xlog:class+load=info",
                             APP_CLASS, BOOT_APPEND_CLASS_NAME);
  
              OutputAnalyzer out = CDSTestUtils.runWithArchive(opts);
              CDSTestUtils.checkExec(out, opts, "[class,load] nonjdk.myPackage.MyClass");