Skip to content
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.

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

8261753: Test java/lang/System/OsVersionTest.java still failing on BigSur patch versions after JDK-8253702 #2576

Closed
wants to merge 3 commits into from
Closed
Changes from 1 commit
Commits
File filter
Filter file types
Jump to
Jump to file
Failed to load files.

Always

Just for now

@@ -53,14 +53,9 @@ else if (Platform.isOSX()) {
String swVersOutput = output.getOutput().trim();
if (!osVersion.equals(swVersOutput)) {
// This section can be removed if minimum build SDK is xcode 12+
String[] swVersParts = swVersOutput.split("\\.");
String[] osVersParts = osVersion.split("\\.");
if (swVersParts.length >= 2 &&
osVersParts.length >= 2 &&
swVersParts[0].equals(osVersParts[0]) &&
swVersParts[1].equals(osVersParts[1])) {
throw new SkippedException("MacOS version only matches in parts, this is expected when " +
"JDK was built with Xcode < 12 and MacOS version patch is > 0");
if (swVersOutput.startsWith(osVersion)) {
throw new SkippedException("MacOS version only matches in parts, this is expected when " +
"JDK was built with Xcode < 12 and MacOS version patch is > 0");
}
throw new Error(osVersion + " != " + swVersOutput);
}
ProTip! Use n and p to navigate between commits in a pull request.