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

*** 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");
--- 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", "-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");
--- 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", "-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");
--- 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", "-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");