test/hotspot/jtreg/runtime/appcds/jigsaw/classpathtests/BootAppendTests.java

*** 30,40 ****
   * @modules java.base/jdk.internal.misc
   *          java.management
   *          jdk.jartool/sun.tools.jar
   *          jdk.internal.jvmstat/sun.jvmstat.monitor
   * @compile src/jdk/test/Main.java
!  * @compile src/com/sun/tools/javac/Main2.jasm
   * @compile src/sun/nio/cs/ext/MyClass.java
   * @compile src/sun/nio/cs/ext1/MyClass.java
   * @run main BootAppendTests
   */
  
--- 30,40 ----
   * @modules java.base/jdk.internal.misc
   *          java.management
   *          jdk.jartool/sun.tools.jar
   *          jdk.internal.jvmstat/sun.jvmstat.monitor
   * @compile src/jdk/test/Main.java
!  * @compile src/com/sun/tools/javac/MyMain.jasm
   * @compile src/sun/nio/cs/ext/MyClass.java
   * @compile src/sun/nio/cs/ext1/MyClass.java
   * @run main BootAppendTests
   */
  
*** 50,60 ****
      private static final String TEST_SRC = System.getProperty("test.src");
      private static final Path SRC_DIR = Paths.get(TEST_SRC, "src");
      private static final Path CLASSES_DIR = Paths.get("classes");
  
      private static final String MAIN_CLASS = "jdk.test.Main";
!     private static final String APP_MODULE_CLASS = "com/sun/tools/javac/Main2";
      private static final String BOOT_APPEND_MODULE_CLASS = "sun/nio/cs/ext/MyClass";
      private static final String BOOT_APPEND_CLASS = "sun/nio/cs/ext1/MyClass";
      private static final String[] ARCHIVE_CLASSES =
           {APP_MODULE_CLASS, BOOT_APPEND_MODULE_CLASS, BOOT_APPEND_CLASS};
  
--- 50,60 ----
      private static final String TEST_SRC = System.getProperty("test.src");
      private static final Path SRC_DIR = Paths.get(TEST_SRC, "src");
      private static final Path CLASSES_DIR = Paths.get("classes");
  
      private static final String MAIN_CLASS = "jdk.test.Main";
!     private static final String APP_MODULE_CLASS = "com/sun/tools/javac/MyMain";
      private static final String BOOT_APPEND_MODULE_CLASS = "sun/nio/cs/ext/MyClass";
      private static final String BOOT_APPEND_CLASS = "sun/nio/cs/ext1/MyClass";
      private static final String[] ARCHIVE_CLASSES =
           {APP_MODULE_CLASS, BOOT_APPEND_MODULE_CLASS, BOOT_APPEND_CLASS};
  
*** 237,247 ****
              "-Xlog:class+load=info",
              "--limit-modules", "java.base",
              MAIN_CLASS, "Test #9", APP_MODULE_CLASS, "true", "BOOT")
              .assertSilentlyDisabledCDS(out -> {
                  out.shouldHaveExitValue(0)
!                    .shouldMatch(".class.load. com.sun.tools.javac.Main2 source:.*bootAppend.jar");
              });
      }
  
      // Test #10: A shared class in excluded package defined in jimage app module
      //    - should be loaded from the -Xbootclasspath/a with AppCDS
--- 237,247 ----
              "-Xlog:class+load=info",
              "--limit-modules", "java.base",
              MAIN_CLASS, "Test #9", APP_MODULE_CLASS, "true", "BOOT")
              .assertSilentlyDisabledCDS(out -> {
                  out.shouldHaveExitValue(0)
!                    .shouldMatch(".class.load. com.sun.tools.javac.MyMain source:.*bootAppend.jar");
              });
      }
  
      // Test #10: A shared class in excluded package defined in jimage app module
      //    - should be loaded from the -Xbootclasspath/a with AppCDS
*** 251,259 ****
              "-Xlog:class+load=info",
              "--limit-modules", "java.base",
              MAIN_CLASS, "Test #10", APP_MODULE_CLASS, "true", "BOOT")
              .assertSilentlyDisabledCDS(out -> {
                  out.shouldHaveExitValue(0)
!                    .shouldMatch(".class.load. com.sun.tools.javac.Main2 source:.*bootAppend.jar");
              });
      }
  }
--- 251,259 ----
              "-Xlog:class+load=info",
              "--limit-modules", "java.base",
              MAIN_CLASS, "Test #10", APP_MODULE_CLASS, "true", "BOOT")
              .assertSilentlyDisabledCDS(out -> {
                  out.shouldHaveExitValue(0)
!                    .shouldMatch(".class.load. com.sun.tools.javac.MyMain source:.*bootAppend.jar");
              });
      }
  }