test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/OptimizeModuleHandlingTest.java

*** 22,32 ****
   *
   */
  
  /**
   * @test
!  * @requires vm.cds & !vm.jvmci
   * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds
   * @run driver OptimizeModuleHandlingTest
   * @summary test module path changes for optimization of
   *          module handling.
   *
--- 22,32 ----
   *
   */
  
  /**
   * @test
!  * @requires vm.cds & !vm.graal.enabled
   * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds
   * @run driver OptimizeModuleHandlingTest
   * @summary test module path changes for optimization of
   *          module handling.
   *
*** 61,72 ****
      private static Path mainJar = null;
      private static Path testJar = null;
  
      private static String CLASS_FOUND_MESSAGE = "com.foos.Test found";
      private static String CLASS_NOT_FOUND_MESSAGE = "java.lang.ClassNotFoundException: com.foos.Test";
!     private static String OPTIMIZE_ENABLED = "Using optimized module handling enabled";
!     private static String OPTIMIZE_DISABLED = "Using optimized module handling disabled";
      private static String MAIN_FROM_JAR = "class,load.*com.bars.Main.*[.]jar";
      private static String MAIN_FROM_CDS = "class,load.*com.bars.Main.*shared objects file";
      private static String TEST_FROM_JAR = "class,load.*com.foos.Test.*[.]jar";
      private static String TEST_FROM_CDS = "class,load.*com.foos.Test.*shared objects file";
      private static String MAP_FAILED  = "Unable to use shared archive";
--- 61,72 ----
      private static Path mainJar = null;
      private static Path testJar = null;
  
      private static String CLASS_FOUND_MESSAGE = "com.foos.Test found";
      private static String CLASS_NOT_FOUND_MESSAGE = "java.lang.ClassNotFoundException: com.foos.Test";
!     private static String OPTIMIZE_ENABLED = "optimized module handling: enabled";
!     private static String OPTIMIZE_DISABLED = "optimized module handling: disabled";
      private static String MAIN_FROM_JAR = "class,load.*com.bars.Main.*[.]jar";
      private static String MAIN_FROM_CDS = "class,load.*com.bars.Main.*shared objects file";
      private static String TEST_FROM_JAR = "class,load.*com.foos.Test.*[.]jar";
      private static String TEST_FROM_CDS = "class,load.*com.foos.Test.*shared objects file";
      private static String MAP_FAILED  = "Unable to use shared archive";