test/compiler/rtm/cli/TestUseRTMDeoptOptionOnUnsupportedConfig.java

*** 48,70 ****
  
      private TestUseRTMDeoptOptionOnUnsupportedConfig() {
          super(new NotPredicate(new AndPredicate(new SupportedCPU(),
                          new SupportedVM())),
                  "UseRTMDeopt", true, false,
!                 TestUseRTMDeoptOptionOnUnsupportedConfig.DEFAULT_VALUE, "true");
      }
  
      @Override
      protected void runX86SupportedVMTestCases() throws Throwable {
          super.verifyJVMStartup();
          // verify default value
          CommandLineOptionTest.verifyOptionValueForSameVM(optionName,
!                 defaultValue);
          // verify that until RTMLocking is not used, value
          // will be set to default false.
          CommandLineOptionTest.verifyOptionValueForSameVM(optionName,
!                 defaultValue, "-XX:+UseRTMDeopt");
      }
  
      public static void main(String args[]) throws Throwable {
          new TestUseRTMDeoptOptionOnUnsupportedConfig().test();
      }
--- 48,76 ----
  
      private TestUseRTMDeoptOptionOnUnsupportedConfig() {
          super(new NotPredicate(new AndPredicate(new SupportedCPU(),
                          new SupportedVM())),
                  "UseRTMDeopt", true, false,
!                 TestUseRTMDeoptOptionOnUnsupportedConfig.DEFAULT_VALUE,
!                 "true");
      }
  
      @Override
      protected void runX86SupportedVMTestCases() throws Throwable {
          super.verifyJVMStartup();
          // verify default value
          CommandLineOptionTest.verifyOptionValueForSameVM(optionName,
!                 defaultValue, String.format("'%s' should have '%s' "
!                         + "default value on unsupported configs.",
!                         optionName, DEFAULT_VALUE)); 
          // verify that until RTMLocking is not used, value
          // will be set to default false.
          CommandLineOptionTest.verifyOptionValueForSameVM(optionName,
!                 defaultValue, String.format("'%s' should be off on unsupported"
!                         + " configs even if '-XX:+%s' flag set", optionName,
!                         optionName),
!                 "-XX:+UseRTMDeopt");
      }
  
      public static void main(String args[]) throws Throwable {
          new TestUseRTMDeoptOptionOnUnsupportedConfig().test();
      }