test/compiler/rtm/cli/TestUseRTMForStackLocksOptionOnUnsupportedConfig.java

*** 27,63 ****
   * @summary Verify UseRTMForStackLocks option processing on CPUs without
   *          rtm support and/or on VMs without rtm locking support.
   * @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.TestUseRTMForStackLocksOptionOnUnsupportedConfig
   */
  
  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;
- import jdk.test.lib.cli.predicate.NotPredicate;
  
  public class TestUseRTMForStackLocksOptionOnUnsupportedConfig
          extends RTMGenericCommandLineOptionTest {
      private static final String DEFAULT_VALUE = "false";
  
      private TestUseRTMForStackLocksOptionOnUnsupportedConfig() {
!         super(new NotPredicate(
!                 new AndPredicate(new SupportedCPU(), new SupportedOS(), new SupportedVM())),
!                 "UseRTMForStackLocks", true, true,
                  TestUseRTMForStackLocksOptionOnUnsupportedConfig.DEFAULT_VALUE,
                  "true");
      }
  
      @Override
--- 27,56 ----
   * @summary Verify UseRTMForStackLocks option processing on CPUs without
   *          rtm support and/or on VMs without rtm locking support.
   * @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.TestUseRTMForStackLocksOptionOnUnsupportedConfig
   */
  
  package compiler.rtm.cli;
  
  import jdk.test.lib.process.ExitCode;
  import jdk.test.lib.cli.CommandLineOptionTest;
  
  public class TestUseRTMForStackLocksOptionOnUnsupportedConfig
          extends RTMGenericCommandLineOptionTest {
      private static final String DEFAULT_VALUE = "false";
  
      private TestUseRTMForStackLocksOptionOnUnsupportedConfig() {
!         super("UseRTMForStackLocks", true, true,
                  TestUseRTMForStackLocksOptionOnUnsupportedConfig.DEFAULT_VALUE,
                  "true");
      }
  
      @Override
*** 109,116 ****
                  CommandLineOptionTest.UNLOCK_EXPERIMENTAL_VM_OPTIONS,
                  prepareOptionValue("true"));
      }
  
      public static void main(String args[]) throws Throwable {
!         new TestUseRTMForStackLocksOptionOnUnsupportedConfig().test();
      }
  }
--- 102,109 ----
                  CommandLineOptionTest.UNLOCK_EXPERIMENTAL_VM_OPTIONS,
                  prepareOptionValue("true"));
      }
  
      public static void main(String args[]) throws Throwable {
!         new TestUseRTMForStackLocksOptionOnUnsupportedConfig().runTestCases();
      }
  }