test/compiler/rtm/cli/TestUseRTMLockingOptionOnSupportedConfig.java

@@ -27,37 +27,27 @@
  * @summary Verify UseRTMLocking option processing on CPU 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.TestUseRTMLockingOptionOnSupportedConfig
  */
 
 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 TestUseRTMLockingOptionOnSupportedConfig
-        extends CommandLineOptionTest {
+public class TestUseRTMLockingOptionOnSupportedConfig {
     private static final String DEFAULT_VALUE = "false";
 
-    private TestUseRTMLockingOptionOnSupportedConfig() {
-        super(new AndPredicate(new SupportedCPU(), new SupportedOS(), new SupportedVM()));
-    }
-
-    @Override
     public void runTestCases() throws Throwable {
         String unrecongnizedOption
                 =  CommandLineOptionTest.getUnrecognizedOptionErrorMessage(
                 "UseRTMLocking");
         String shouldPassMessage = "VM option 'UseRTMLocking' is experimental"

@@ -102,8 +92,8 @@
                 CommandLineOptionTest.UNLOCK_EXPERIMENTAL_VM_OPTIONS,
                 "-XX:+UseRTMLocking");
     }
 
     public static void main(String args[]) throws Throwable {
-        new TestUseRTMLockingOptionOnSupportedConfig().test();
+        new TestUseRTMLockingOptionOnSupportedConfig().runTestCases();
     }
 }