test/compiler/rtm/cli/TestPrintPreciseRTMLockingStatisticsOptionOnSupportedConfig.java

*** 27,58 ****
   * @summary Verify PrintPreciseRTMLockingStatistics on CPUs with
   *          rtm support and on VM with 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.TestPrintPreciseRTMLockingStatisticsOptionOnSupportedConfig
   */
  
  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.cli.CommandLineOptionTest;
- import jdk.test.lib.cli.predicate.AndPredicate;
  
  public class TestPrintPreciseRTMLockingStatisticsOptionOnSupportedConfig
          extends TestPrintPreciseRTMLockingStatisticsBase {
-     private TestPrintPreciseRTMLockingStatisticsOptionOnSupportedConfig() {
-         super(new AndPredicate(new SupportedCPU(), new SupportedOS(), new SupportedVM()));
-     }
  
      @Override
      protected void verifyOptionValues() throws Throwable {
          super.verifyOptionValues();
          // verify default value
--- 27,51 ----
   * @summary Verify PrintPreciseRTMLockingStatistics on CPUs with
   *          rtm support and on VM with 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.TestPrintPreciseRTMLockingStatisticsOptionOnSupportedConfig
   */
  
  package compiler.rtm.cli;
  
  import jdk.test.lib.cli.CommandLineOptionTest;
  
  public class TestPrintPreciseRTMLockingStatisticsOptionOnSupportedConfig
          extends TestPrintPreciseRTMLockingStatisticsBase {
  
      @Override
      protected void verifyOptionValues() throws Throwable {
          super.verifyOptionValues();
          // verify default value
*** 85,92 ****
                  "-XX:+UseRTMLocking", prepareOptionValue("true"));
      }
  
      public static void main(String args[]) throws Throwable {
          new TestPrintPreciseRTMLockingStatisticsOptionOnSupportedConfig()
!                 .test();
      }
  }
--- 78,85 ----
                  "-XX:+UseRTMLocking", prepareOptionValue("true"));
      }
  
      public static void main(String args[]) throws Throwable {
          new TestPrintPreciseRTMLockingStatisticsOptionOnSupportedConfig()
!                 .runTestCases();
      }
  }