test/compiler/rtm/cli/RTMLockingAwareTest.java

*** 21,36 ****
   * questions.
   */
  
  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 java.util.LinkedList;
  import java.util.List;
  
  /**
--- 21,32 ----
*** 64,75 ****
       */
      protected RTMLockingAwareTest(String optionName, boolean isBoolean,
              boolean isExperimental, String defaultValue,
              String[] correctValues, String[] incorrectValues,
              String warningMessage) {
!         super(new AndPredicate(new SupportedCPU(), new SupportedOS(), new SupportedVM()),
!                 optionName, isBoolean, isExperimental, defaultValue);
          this.correctValues = correctValues;
          this.incorrectValues = incorrectValues;
          this.warningMessage = warningMessage;
      }
  
--- 60,70 ----
       */
      protected RTMLockingAwareTest(String optionName, boolean isBoolean,
              boolean isExperimental, String defaultValue,
              String[] correctValues, String[] incorrectValues,
              String warningMessage) {
!         super(optionName, isBoolean, isExperimental, defaultValue);
          this.correctValues = correctValues;
          this.incorrectValues = incorrectValues;
          this.warningMessage = warningMessage;
      }