test/compiler/rtm/cli/TestUseRTMForStackLocksOptionOnSupportedConfig.java

*** 27,63 ****
   * @summary Verify UseRTMForStackLocks option processing on CPU with
   *          rtm support when VM supports rtm locking.
   * @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.TestUseRTMForStackLocksOptionOnSupportedConfig
   */
  
  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 TestUseRTMForStackLocksOptionOnSupportedConfig
!         extends CommandLineOptionTest {
      private static final String DEFAULT_VALUE = "false";
  
-     private TestUseRTMForStackLocksOptionOnSupportedConfig() {
-         super(new AndPredicate(new SupportedCPU(), new SupportedOS(), new SupportedVM()));
-     }
- 
-     @Override
      public void runTestCases() throws Throwable {
          String errorMessage
                  = CommandLineOptionTest.getExperimentalOptionErrorMessage(
                  "UseRTMForStackLocks");
          String warningMessage
--- 27,53 ----
   * @summary Verify UseRTMForStackLocks option processing on CPU with
   *          rtm support when VM supports rtm locking.
   * @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.TestUseRTMForStackLocksOptionOnSupportedConfig
   */
  
  package compiler.rtm.cli;
  
  import jdk.test.lib.process.ExitCode;
  import jdk.test.lib.cli.CommandLineOptionTest;
  
! public class TestUseRTMForStackLocksOptionOnSupportedConfig {
      private static final String DEFAULT_VALUE = "false";
  
      public void runTestCases() throws Throwable {
          String errorMessage
                  = CommandLineOptionTest.getExperimentalOptionErrorMessage(
                  "UseRTMForStackLocks");
          String warningMessage
*** 125,132 ****
                          CommandLineOptionTest.UNLOCK_EXPERIMENTAL_VM_OPTIONS,
                          "-XX:+UseRTMLocking", "-XX:+UseRTMForStackLocks");
      }
  
      public static void main(String args[]) throws Throwable {
!         new TestUseRTMForStackLocksOptionOnSupportedConfig().test();
      }
  }
--- 115,122 ----
                          CommandLineOptionTest.UNLOCK_EXPERIMENTAL_VM_OPTIONS,
                          "-XX:+UseRTMLocking", "-XX:+UseRTMForStackLocks");
      }
  
      public static void main(String args[]) throws Throwable {
!         new TestUseRTMForStackLocksOptionOnSupportedConfig().runTestCases();
      }
  }