test/compiler/rtm/locking/TestRTMLockingCalculationDelay.java

*** 27,36 ****
--- 27,37 ----
   * @summary Verify that RTMLockingCalculationDelay affect when
   *          abort ratio calculation is started.
   * @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
*** 40,69 ****
  package compiler.rtm.locking;
  
  import compiler.testlibrary.rtm.AbortProvoker;
  import compiler.testlibrary.rtm.AbortType;
  import compiler.testlibrary.rtm.RTMTestBase;
- import compiler.testlibrary.rtm.predicate.SupportedCPU;
- import compiler.testlibrary.rtm.predicate.SupportedOS;
- import compiler.testlibrary.rtm.predicate.SupportedVM;
  import jdk.test.lib.Asserts;
  import jdk.test.lib.process.OutputAnalyzer;
  import jdk.test.lib.cli.CommandLineOptionTest;
- import jdk.test.lib.cli.predicate.AndPredicate;
  
  /**
   * Test verifies that abort ratio calculation could be delayed using
   * RTMLockingCalculationDelay option.
   */
! public class TestRTMLockingCalculationDelay extends CommandLineOptionTest {
      private static final boolean INFLATE_MONITOR = true;
  
-     private TestRTMLockingCalculationDelay() {
-         super(new AndPredicate(new SupportedCPU(), new SupportedOS(), new SupportedVM()));
-     }
- 
-     @Override
      protected void runTestCases() throws Throwable {
          // verify that calculation will be started immediately
          verifyLockingCalculationDelay(0, 0, true);
  
          // verify that calculation will not be started during
--- 41,61 ----
  package compiler.rtm.locking;
  
  import compiler.testlibrary.rtm.AbortProvoker;
  import compiler.testlibrary.rtm.AbortType;
  import compiler.testlibrary.rtm.RTMTestBase;
  import jdk.test.lib.Asserts;
  import jdk.test.lib.process.OutputAnalyzer;
  import jdk.test.lib.cli.CommandLineOptionTest;
  
  /**
   * Test verifies that abort ratio calculation could be delayed using
   * RTMLockingCalculationDelay option.
   */
! public class TestRTMLockingCalculationDelay {
      private static final boolean INFLATE_MONITOR = true;
  
      protected void runTestCases() throws Throwable {
          // verify that calculation will be started immediately
          verifyLockingCalculationDelay(0, 0, true);
  
          // verify that calculation will not be started during
*** 108,115 ****
                      + "rtm_state_chage are expected");
          }
      }
  
      public static void main(String args[]) throws Throwable {
!         new TestRTMLockingCalculationDelay().test();
      }
  }
--- 100,107 ----
                      + "rtm_state_chage are expected");
          }
      }
  
      public static void main(String args[]) throws Throwable {
!         new TestRTMLockingCalculationDelay().runTestCases();
      }
  }