1berry/openjdk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Reviewed-by: rriggs
This commit is contained in:
Christoph Langer 2021-02-16 12:57:59 +00:00
parent 16bd7d381f
commit 8ba390d1e2
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
test/jdk/java/lang/System/OsVersionTest.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2015 SAP SE. All rights reserved.
* Copyright (c) 2015, 2021, SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -24,6 +24,7 @@
import jdk.test.lib.Platform;
import jdk.test.lib.process.OutputAnalyzer;
import jdk.test.lib.process.ProcessTools;
import jtreg.SkippedException;
/*
* @test
@ -49,8 +50,14 @@ public class OsVersionTest {
}
else if (Platform.isOSX()) {
OutputAnalyzer output = ProcessTools.executeProcess("sw_vers", "-productVersion");
if (!osVersion.equals(output.getOutput().trim())) {
throw new Error(osVersion + " != " + output.getOutput().trim());
String swVersOutput = output.getOutput().trim();
if (!osVersion.equals(swVersOutput)) {
// This section can be removed if minimum build SDK is xcode 12+
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);
}
}
else if (Platform.isAix()) {