test/compiler/rtm/cli/TestUseRTMLockingOptionOnSupportedConfig.java

rev 6420 : 8054805: Update CLI tests on RTM options to reflect changes in JDK-8054376
Reviewed-by:

*** 51,95 ****
      @Override
      public void runTestCases() throws Throwable {
          String unrecongnizedOption
                  = CommandLineOptionTest.getUnrecognizedOptionErrorMessage(
                  "UseRTMLocking");
-         String experimentalOptionError
-                 = CommandLineOptionTest.getExperimentalOptionErrorMessage(
-                 "UseRTMLocking");
-         // verify that options is experimental
-         CommandLineOptionTest.verifySameJVMStartup(
-                 new String[] { experimentalOptionError }, null, ExitCode.FAIL,
-                 "-XX:+UseRTMLocking");
          // verify that there are no warning or error in VM output
          CommandLineOptionTest.verifySameJVMStartup(null,
                  new String[]{
                          RTMGenericCommandLineOptionTest.RTM_INSTR_ERROR,
                          unrecongnizedOption
!                 }, ExitCode.OK,
!                 CommandLineOptionTest.UNLOCK_EXPERIMENTAL_VM_OPTIONS,
!                 "-XX:+UseRTMLocking");
  
          CommandLineOptionTest.verifySameJVMStartup(null,
                  new String[]{
                          RTMGenericCommandLineOptionTest.RTM_INSTR_ERROR,
                          unrecongnizedOption
!                 }, ExitCode.OK,
!                 CommandLineOptionTest.UNLOCK_EXPERIMENTAL_VM_OPTIONS,
!                 "-XX:-UseRTMLocking");
          // verify that UseRTMLocking is of by default
          CommandLineOptionTest.verifyOptionValueForSameVM("UseRTMLocking",
!                 TestUseRTMLockingOptionOnSupportedConfig.DEFAULT_VALUE,
!                 CommandLineOptionTest.UNLOCK_EXPERIMENTAL_VM_OPTIONS);
          // verify that we can change UseRTMLocking value
          CommandLineOptionTest.verifyOptionValueForSameVM("UseRTMLocking",
                  TestUseRTMLockingOptionOnSupportedConfig.DEFAULT_VALUE,
-                 CommandLineOptionTest.UNLOCK_EXPERIMENTAL_VM_OPTIONS,
                  "-XX:-UseRTMLocking");
          CommandLineOptionTest.verifyOptionValueForSameVM("UseRTMLocking",
!                 "true", CommandLineOptionTest.UNLOCK_EXPERIMENTAL_VM_OPTIONS,
!                 "-XX:+UseRTMLocking");
      }
  
      public static void main(String args[]) throws Throwable {
          new TestUseRTMLockingOptionOnSupportedConfig().test();
      }
--- 51,83 ----
      @Override
      public void runTestCases() throws Throwable {
          String unrecongnizedOption
                  =  CommandLineOptionTest.getUnrecognizedOptionErrorMessage(
                  "UseRTMLocking");
          // verify that there are no warning or error in VM output
          CommandLineOptionTest.verifySameJVMStartup(null,
                  new String[]{
                          RTMGenericCommandLineOptionTest.RTM_INSTR_ERROR,
                          unrecongnizedOption
!                 }, ExitCode.OK, "-XX:+UseRTMLocking"
!         );
  
          CommandLineOptionTest.verifySameJVMStartup(null,
                  new String[]{
                          RTMGenericCommandLineOptionTest.RTM_INSTR_ERROR,
                          unrecongnizedOption
!                 }, ExitCode.OK, "-XX:-UseRTMLocking"
!         );
          // verify that UseRTMLocking is of by default
          CommandLineOptionTest.verifyOptionValueForSameVM("UseRTMLocking",
!                 TestUseRTMLockingOptionOnSupportedConfig.DEFAULT_VALUE);
          // verify that we can change UseRTMLocking value
          CommandLineOptionTest.verifyOptionValueForSameVM("UseRTMLocking",
                  TestUseRTMLockingOptionOnSupportedConfig.DEFAULT_VALUE,
                  "-XX:-UseRTMLocking");
          CommandLineOptionTest.verifyOptionValueForSameVM("UseRTMLocking",
!                 "true", "-XX:+UseRTMLocking");
      }
  
      public static void main(String args[]) throws Throwable {
          new TestUseRTMLockingOptionOnSupportedConfig().test();
      }