1.1 --- a/test/compiler/rtm/cli/TestUseRTMDeoptOptionOnUnsupportedConfig.java Mon Aug 11 11:43:22 2014 -0700
1.2 +++ b/test/compiler/rtm/cli/TestUseRTMDeoptOptionOnUnsupportedConfig.java Mon Aug 11 19:19:47 2014 +0400
1.3 @@ -48,7 +48,7 @@
1.4 private TestUseRTMDeoptOptionOnUnsupportedConfig() {
1.5 super(new NotPredicate(new AndPredicate(new SupportedCPU(),
1.6 new SupportedVM())),
1.7 - "UseRTMDeopt", true, true,
1.8 + "UseRTMDeopt", true, false,
1.9 TestUseRTMDeoptOptionOnUnsupportedConfig.DEFAULT_VALUE, "true");
1.10 }
1.11
1.12 @@ -57,14 +57,11 @@
1.13 super.verifyJVMStartup();
1.14 // verify default value
1.15 CommandLineOptionTest.verifyOptionValueForSameVM(optionName,
1.16 - defaultValue,
1.17 - CommandLineOptionTest.UNLOCK_EXPERIMENTAL_VM_OPTIONS);
1.18 + defaultValue);
1.19 // verify that until RTMLocking is not used, value
1.20 // will be set to default false.
1.21 CommandLineOptionTest.verifyOptionValueForSameVM(optionName,
1.22 - defaultValue,
1.23 - CommandLineOptionTest.UNLOCK_EXPERIMENTAL_VM_OPTIONS,
1.24 - "-XX:+UseRTMDeopt");
1.25 + defaultValue, "-XX:+UseRTMDeopt");
1.26 }
1.27
1.28 public static void main(String args[]) throws Throwable {
