1.1 --- a/test/compiler/rtm/cli/TestUseRTMLockingOptionWithBiasedLocking.java Mon Aug 11 11:43:22 2014 -0700
1.2 +++ b/test/compiler/rtm/cli/TestUseRTMLockingOptionWithBiasedLocking.java Mon Aug 11 19:19:47 2014 +0400
1.3 @@ -53,22 +53,18 @@
1.4 // verify that we will not get a warning
1.5 CommandLineOptionTest.verifySameJVMStartup(null,
1.6 new String[] { warningMessage }, ExitCode.OK,
1.7 - CommandLineOptionTest.UNLOCK_EXPERIMENTAL_VM_OPTIONS,
1.8 "-XX:+UseRTMLocking", "-XX:-UseBiasedLocking");
1.9 // verify that we will get a warning
1.10 CommandLineOptionTest.verifySameJVMStartup(
1.11 new String[] { warningMessage }, null, ExitCode.OK,
1.12 - CommandLineOptionTest.UNLOCK_EXPERIMENTAL_VM_OPTIONS,
1.13 "-XX:+UseRTMLocking", "-XX:+UseBiasedLocking");
1.14 // verify that UseBiasedLocking is false when we use rtm locking
1.15 CommandLineOptionTest.verifyOptionValueForSameVM("UseBiasedLocking",
1.16 - "false", CommandLineOptionTest.UNLOCK_EXPERIMENTAL_VM_OPTIONS,
1.17 - "-XX:+UseRTMLocking");
1.18 + "false", "-XX:+UseRTMLocking");
1.19 // verify that we can't turn on biased locking when
1.20 // using rtm locking
1.21 CommandLineOptionTest.verifyOptionValueForSameVM("UseBiasedLocking",
1.22 - "false", CommandLineOptionTest.UNLOCK_EXPERIMENTAL_VM_OPTIONS,
1.23 - "-XX:+UseRTMLocking", "-XX:+UseBiasedLocking");
1.24 + "false", "-XX:+UseRTMLocking", "-XX:+UseBiasedLocking");
1.25 }
1.26
1.27 public static void main(String args[]) throws Throwable {
