infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-02-25 09:40:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

8173679: Disable ProfileTrap code and UseRTMLocking in emulated client Win32

Browse Source 
Made emulatedVM related changes in cli verfiy*SameVM.

Reviewed-by: kvn
This commit is contained in:
Jamsheed Mohammed C M 2017-02-03 19:26:48 -08:00
parent efed5b0145
commit 1d2bf95b12
1 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
test/lib/jdk/test/lib/cli/CommandLineOptionTest.java
View File

@ -199,6 +199,10 @@ public abstract class CommandLineOptionTest {
throws Throwable {
List<String> finalOptions = new ArrayList<>();
finalOptions.add(CommandLineOptionTest.getVMTypeOption());
String extraFlagForEmulated = CommandLineOptionTest.getVMTypeOptionForEmulated();
if (extraFlagForEmulated != null) {
finalOptions.add(extraFlagForEmulated);
}
Collections.addAll(finalOptions, options);
CommandLineOptionTest.verifyJVMStartup(expectedMessages,
@ -390,6 +394,10 @@ public abstract class CommandLineOptionTest {
String... additionalVMOpts) throws Throwable {
List<String> finalOptions = new ArrayList<>();
finalOptions.add(CommandLineOptionTest.getVMTypeOption());
String extraFlagForEmulated = CommandLineOptionTest.getVMTypeOptionForEmulated();
if (extraFlagForEmulated != null) {
finalOptions.add(extraFlagForEmulated);
}
Collections.addAll(finalOptions, additionalVMOpts);
CommandLineOptionTest.verifyOptionValue(optionName, expectedValue,
@ -497,6 +505,18 @@ public abstract class CommandLineOptionTest {
throw new RuntimeException("Unknown VM mode.");
}
/**
* @return addtional VMoptions(Emulated related) required to start a new VM with the same type as current.
*/
private static String getVMTypeOptionForEmulated() {
if (Platform.isServer() && !Platform.isEmulatedClient()) {
return "-XX:-NeverActAsServerClassMachine";
} else if (Platform.isEmulatedClient()) {
return "-XX:+NeverActAsServerClassMachine";
}
return null;
}
private final BooleanSupplier predicate;
/**