test/compiler/rtm/cli/TestUseRTMDeoptOptionOnSupportedConfig.java

*** 27,63 ****
   * @summary Verify UseRTMDeopt option processing on CPUs with rtm support
   *          when rtm locking is supported by VM.
   * @library /test/lib /
   * @modules java.base/jdk.internal.misc
   *          java.management
!  *
   * @build sun.hotspot.WhiteBox
   * @run driver ClassFileInstaller sun.hotspot.WhiteBox
   *                                sun.hotspot.WhiteBox$WhiteBoxPermission
   * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
   *                   -XX:+WhiteBoxAPI
   *                   compiler.rtm.cli.TestUseRTMDeoptOptionOnSupportedConfig
   */
  
  package compiler.rtm.cli;
  
- import compiler.testlibrary.rtm.predicate.SupportedCPU;
- import compiler.testlibrary.rtm.predicate.SupportedOS;
- import compiler.testlibrary.rtm.predicate.SupportedVM;
  import jdk.test.lib.process.ExitCode;
  import jdk.test.lib.cli.CommandLineOptionTest;
- import jdk.test.lib.cli.predicate.AndPredicate;
  
! public class TestUseRTMDeoptOptionOnSupportedConfig
!         extends CommandLineOptionTest {
      private static final String DEFAULT_VALUE = "false";
  
-     private TestUseRTMDeoptOptionOnSupportedConfig() {
-         super(new AndPredicate(new SupportedCPU(), new SupportedOS(), new SupportedVM()));
-     }
- 
-     @Override
      public void runTestCases() throws Throwable {
          String shouldPassMessage = " JVM should startup with option '"
                  + "-XX:+UseRTMDeopt' without any warnings";
          // verify that option could be turned on
          CommandLineOptionTest.verifySameJVMStartup(
--- 27,53 ----
   * @summary Verify UseRTMDeopt option processing on CPUs with rtm support
   *          when rtm locking is supported by VM.
   * @library /test/lib /
   * @modules java.base/jdk.internal.misc
   *          java.management
!  * @requires vm.flavor == "server" & !vm.emulatedClient & vm.rtm.cpu & vm.rtm.os
   * @build sun.hotspot.WhiteBox
   * @run driver ClassFileInstaller sun.hotspot.WhiteBox
   *                                sun.hotspot.WhiteBox$WhiteBoxPermission
   * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
   *                   -XX:+WhiteBoxAPI
   *                   compiler.rtm.cli.TestUseRTMDeoptOptionOnSupportedConfig
   */
  
  package compiler.rtm.cli;
  
  import jdk.test.lib.process.ExitCode;
  import jdk.test.lib.cli.CommandLineOptionTest;
  
! public class TestUseRTMDeoptOptionOnSupportedConfig {
      private static final String DEFAULT_VALUE = "false";
  
      public void runTestCases() throws Throwable {
          String shouldPassMessage = " JVM should startup with option '"
                  + "-XX:+UseRTMDeopt' without any warnings";
          // verify that option could be turned on
          CommandLineOptionTest.verifySameJVMStartup(
*** 94,101 ****
                  CommandLineOptionTest.UNLOCK_EXPERIMENTAL_VM_OPTIONS,
                  "-XX:+UseRTMLocking", "-XX:+UseRTMDeopt");
      }
  
      public static void main(String args[]) throws Throwable {
!         new TestUseRTMDeoptOptionOnSupportedConfig().test();
      }
  }
--- 84,91 ----
                  CommandLineOptionTest.UNLOCK_EXPERIMENTAL_VM_OPTIONS,
                  "-XX:+UseRTMLocking", "-XX:+UseRTMDeopt");
      }
  
      public static void main(String args[]) throws Throwable {
!         new TestUseRTMDeoptOptionOnSupportedConfig().runTestCases();
      }
  }