test/hotspot/jtreg/runtime/cds/sharedStrings/IncompatibleOptions.java

*** 34,44 ****
   * @requires vm.cds.archived.java.heap
   * @comment This test explicitly chooses the type of GC to be used by sub-processes. It may conflict with the GC type set
   * via the -vmoptions command line option of JTREG. vm.gc==null will help the test case to discard the explicitly passed
   * vm options.
   * @requires (vm.gc=="null")
!  * @library /test/lib /test/hotspot/jtreg/runtime/appcds
   * @modules jdk.jartool/sun.tools.jar
   * @build sun.hotspot.WhiteBox
   * @run driver ClassFileInstaller sun.hotspot.WhiteBox sun.hotspot.WhiteBox$WhiteBoxPermission
   * @build HelloString
   * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:. IncompatibleOptions 0
--- 34,44 ----
   * @requires vm.cds.archived.java.heap
   * @comment This test explicitly chooses the type of GC to be used by sub-processes. It may conflict with the GC type set
   * via the -vmoptions command line option of JTREG. vm.gc==null will help the test case to discard the explicitly passed
   * vm options.
   * @requires (vm.gc=="null")
!  * @library /test/lib /test/hotspot/jtreg/runtime/cds
   * @modules jdk.jartool/sun.tools.jar
   * @build sun.hotspot.WhiteBox
   * @run driver ClassFileInstaller sun.hotspot.WhiteBox sun.hotspot.WhiteBox$WhiteBoxPermission
   * @build HelloString
   * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:. IncompatibleOptions 0
*** 47,57 ****
  
  /*
   * @test
   * @requires vm.cds.archived.java.heap
   * @requires (vm.gc=="null")
!  * @library /test/lib /test/hotspot/jtreg/runtime/appcds
   * @modules jdk.jartool/sun.tools.jar
   * @build sun.hotspot.WhiteBox
   * @run driver ClassFileInstaller sun.hotspot.WhiteBox sun.hotspot.WhiteBox$WhiteBoxPermission
   * @build HelloString
   * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:. IncompatibleOptions 1
--- 47,57 ----
  
  /*
   * @test
   * @requires vm.cds.archived.java.heap
   * @requires (vm.gc=="null")
!  * @library /test/lib /test/hotspot/jtreg/runtime/cds
   * @modules jdk.jartool/sun.tools.jar
   * @build sun.hotspot.WhiteBox
   * @run driver ClassFileInstaller sun.hotspot.WhiteBox sun.hotspot.WhiteBox$WhiteBoxPermission
   * @build HelloString
   * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:. IncompatibleOptions 1
*** 59,69 ****
  
  /*
   * @test
   * @requires vm.cds.archived.java.heap
   * @requires (vm.gc=="null")
!  * @library /test/lib /test/hotspot/jtreg/runtime/appcds
   * @modules jdk.jartool/sun.tools.jar
   * @build sun.hotspot.WhiteBox
   * @run driver ClassFileInstaller sun.hotspot.WhiteBox sun.hotspot.WhiteBox$WhiteBoxPermission
   * @build HelloString
   * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:. IncompatibleOptions 2
--- 59,69 ----
  
  /*
   * @test
   * @requires vm.cds.archived.java.heap
   * @requires (vm.gc=="null")
!  * @library /test/lib /test/hotspot/jtreg/runtime/cds
   * @modules jdk.jartool/sun.tools.jar
   * @build sun.hotspot.WhiteBox
   * @run driver ClassFileInstaller sun.hotspot.WhiteBox sun.hotspot.WhiteBox$WhiteBoxPermission
   * @build HelloString
   * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:. IncompatibleOptions 2