1.1 --- a/test/compiler/rtm/cli/TestUseRTMLockingOptionOnSupportedConfig.java Mon Aug 11 11:43:22 2014 -0700
1.2 +++ b/test/compiler/rtm/cli/TestUseRTMLockingOptionOnSupportedConfig.java Mon Aug 11 19:19:47 2014 +0400
1.3 @@ -51,43 +51,31 @@
1.4 @Override
1.5 public void runTestCases() throws Throwable {
1.6 String unrecongnizedOption
1.7 - = CommandLineOptionTest.getUnrecognizedOptionErrorMessage(
1.8 + = CommandLineOptionTest.getUnrecognizedOptionErrorMessage(
1.9 "UseRTMLocking");
1.10 - String experimentalOptionError
1.11 - = CommandLineOptionTest.getExperimentalOptionErrorMessage(
1.12 - "UseRTMLocking");
1.13 - // verify that options is experimental
1.14 - CommandLineOptionTest.verifySameJVMStartup(
1.15 - new String[] { experimentalOptionError }, null, ExitCode.FAIL,
1.16 - "-XX:+UseRTMLocking");
1.17 // verify that there are no warning or error in VM output
1.18 CommandLineOptionTest.verifySameJVMStartup(null,
1.19 new String[]{
1.20 RTMGenericCommandLineOptionTest.RTM_INSTR_ERROR,
1.21 unrecongnizedOption
1.22 - }, ExitCode.OK,
1.23 - CommandLineOptionTest.UNLOCK_EXPERIMENTAL_VM_OPTIONS,
1.24 - "-XX:+UseRTMLocking");
1.25 + }, ExitCode.OK, "-XX:+UseRTMLocking"
1.26 + );
1.27
1.28 CommandLineOptionTest.verifySameJVMStartup(null,
1.29 new String[]{
1.30 RTMGenericCommandLineOptionTest.RTM_INSTR_ERROR,
1.31 unrecongnizedOption
1.32 - }, ExitCode.OK,
1.33 - CommandLineOptionTest.UNLOCK_EXPERIMENTAL_VM_OPTIONS,
1.34 - "-XX:-UseRTMLocking");
1.35 + }, ExitCode.OK, "-XX:-UseRTMLocking"
1.36 + );
1.37 // verify that UseRTMLocking is of by default
1.38 CommandLineOptionTest.verifyOptionValueForSameVM("UseRTMLocking",
1.39 - TestUseRTMLockingOptionOnSupportedConfig.DEFAULT_VALUE,
1.40 - CommandLineOptionTest.UNLOCK_EXPERIMENTAL_VM_OPTIONS);
1.41 + TestUseRTMLockingOptionOnSupportedConfig.DEFAULT_VALUE);
1.42 // verify that we can change UseRTMLocking value
1.43 CommandLineOptionTest.verifyOptionValueForSameVM("UseRTMLocking",
1.44 TestUseRTMLockingOptionOnSupportedConfig.DEFAULT_VALUE,
1.45 - CommandLineOptionTest.UNLOCK_EXPERIMENTAL_VM_OPTIONS,
1.46 "-XX:-UseRTMLocking");
1.47 CommandLineOptionTest.verifyOptionValueForSameVM("UseRTMLocking",
1.48 - "true", CommandLineOptionTest.UNLOCK_EXPERIMENTAL_VM_OPTIONS,
1.49 - "-XX:+UseRTMLocking");
1.50 + "true", "-XX:+UseRTMLocking");
1.51 }
1.52
1.53 public static void main(String args[]) throws Throwable {
