Skip to content

Commit c3cb940

Browse files
toddjonkerPaul Hohensee
authored andcommitted
8342765: [21u] RTM tests assume UnlockExperimentalVMOptions is disabled by default
Reviewed-by: phh
1 parent fa58ee0 commit c3cb940

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

test/hotspot/jtreg/compiler/rtm/cli/RTMGenericCommandLineOptionTest.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,9 @@ protected void verifyJVMStartup() throws Throwable {
145145
CommandLineOptionTest.verifySameJVMStartup(
146146
new String[] { experimentalOptionError },
147147
new String[] { errorMessage }, shouldFailMessage,
148-
shouldFailMessage, ExitCode.FAIL, optionValue);
148+
shouldFailMessage, ExitCode.FAIL,
149+
"-XX:-UnlockExperimentalVMOptions",
150+
optionValue);
149151
// verify that it could be passed if experimental options
150152
// are unlocked
151153
CommandLineOptionTest.verifySameJVMStartup(null,

test/hotspot/jtreg/compiler/rtm/cli/TestUseRTMForStackLocksOptionOnUnsupportedConfig.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,14 @@ protected void runX86SupportedVMTestCases() throws Throwable {
6060
new String[] { experimentalOptionError }, null,
6161
shouldFailMessage, shouldFailMessage + "%nError message "
6262
+ "should be shown", ExitCode.FAIL,
63+
"-XX:-UnlockExperimentalVMOptions",
6364
prepareOptionValue("true"));
6465

6566
CommandLineOptionTest.verifySameJVMStartup(
6667
new String[]{ experimentalOptionError }, null,
6768
shouldFailMessage, shouldFailMessage + "%nError message "
6869
+ "should be shown", ExitCode.FAIL,
70+
"-XX:-UnlockExperimentalVMOptions",
6971
prepareOptionValue("false"));
7072

7173
String shouldPassMessage = String.format("VM option '%s' is "

0 commit comments

Comments
 (0)