Skip to content

cvm/overlay: Make test infra recognize CVM as server VM #134

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
duanyangjing wants to merge 1 commit into
base: jdk17u-target8
Choose a base branch
from
Open

cvm/overlay: Make test infra recognize CVM as server VM #134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion cvm/conf/jtreg_hotspot8_excludes_aarch64.list
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ compiler/jsr292/methodHandleExceptions/TestAMEnotNPE.java
compiler/jsr292/RedefineMethodUsedByMultipleMethodHandles.java
compiler/intrinsics/sha/sanity/TestSHA512MultiBlockIntrinsics.java
compiler/profiling/spectrapredefineclass/Launcher.java
compiler/rtm/cli/TestPrintPreciseRTMLockingStatisticsOptionOnUnsupportedConfig.java
compiler/rtm/cli/TestRTMAbortRatioOptionOnUnsupportedConfig.java
compiler/rtm/cli/TestRTMAbortThresholdOption.java
compiler/rtm/cli/TestRTMLockingCalculationDelayOption.java
Expand Down
3 changes: 0 additions & 3 deletions cvm/conf/jtreg_hotspot8_excludes_x64.list
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,8 @@ compiler/jsr292/methodHandleExceptions/TestAMEnotNPE.java
compiler/jsr292/RedefineMethodUsedByMultipleMethodHandles.java
compiler/intrinsics/sha/sanity/TestSHA512MultiBlockIntrinsics.java
compiler/profiling/spectrapredefineclass/Launcher.java
compiler/rtm/cli/TestPrintPreciseRTMLockingStatisticsOptionOnUnsupportedConfig.java
compiler/rtm/cli/TestRTMAbortRatioOptionOnUnsupportedConfig.java
compiler/rtm/cli/TestRTMTotalCountIncrRateOptionOnUnsupportedConfig.java
compiler/rtm/cli/TestUseRTMDeoptOptionOnUnsupportedConfig.java
compiler/rtm/cli/TestUseRTMForStackLocksOptionOnUnsupportedConfig.java
compiler/stable/TestStableBoolean.java
compiler/stable/TestStableChar.java
compiler/stable/TestStableByte.java
Expand Down
2 changes: 1 addition & 1 deletion cvm/overlay/jdk8u/hotspot/test/testlibrary/com/oracle/java/testlibrary/Platform.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ public static boolean isClient() {
}

public static boolean isServer() {
return vmName.endsWith(" Server VM");
return vmName.endsWith(" Server VM") || isCVM();
}

public static boolean isCVM() {
Expand Down
6 changes: 3 additions & 3 deletions ...jdk8u/hotspot/test/testlibrary/com/oracle/java/testlibrary/cli/CommandLineOptionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,16 +293,16 @@ public static String getDiagnosticOptionErrorMessage(String optionName) {
* @throws RuntimeException when VM type is unknown.
*/
private static String getVMTypeOption() {
if (Platform.isServer()) {
if (Platform.isCVM()) {
return "-cvm";
} else if (Platform.isServer()) {
return "-server";
} else if (Platform.isClient()) {
return "-client";
} else if (Platform.isMinimal()) {
return "-minimal";
} else if (Platform.isGraal()) {
return "-graal";
} else if (Platform.isCVM()) {
return "-cvm";
}
throw new RuntimeException("Unknown VM mode.");
}
Expand Down
Loading