stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8165235: [TESTBUG] RTM tests must check OS version

Browse Source 
Reviewed-by: simonis, fzhinkin
This commit is contained in:
Goetz Lindenmaier 2016-09-01 16:46:59 +02:00
parent 2ea9e88218
commit 7f3eef9f4d
2 changed files with 41 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
test/lib/jdk/test/lib/Platform.java
View File

@ -28,6 +28,9 @@ import java.util.regex.Pattern;
public class Platform {
public static final String vmName = System.getProperty("java.vm.name");
public static final String vmInfo = System.getProperty("java.vm.info");
private static final String osVersion = System.getProperty("os.version");
private static int osVersionMajor = -1;
private static int osVersionMinor = -1;
private static final String osName = System.getProperty("os.name");
private static final String dataModel = System.getProperty("sun.arch.data.model");
private static final String vmVersion = System.getProperty("java.vm.version");
@ -112,6 +115,35 @@ public class Platform {
return osName;
}
// Os version support.
private static void init_version() {
try {
final String[] tokens = osVersion.split("\\.");
if (tokens.length > 0) {
osVersionMajor = Integer.parseInt(tokens[0]);
if (tokens.length > 1) {
osVersionMinor = Integer.parseInt(tokens[1]);
}
}
} catch (NumberFormatException e) {
osVersionMajor = osVersionMinor = 0;
}
}
// Returns major version number from os.version system property.
// E.g. 5 on Solaris 10 and 3 on SLES 11.3 (for the linux kernel version).
public static int getOsVersionMajor() {
if (osVersionMajor == -1) init_version();
return osVersionMajor;
}
// Returns minor version number from os.version system property.
// E.g. 10 on Solaris 10 and 0 on SLES 11.3 (for the linux kernel version).
public static int getOsVersionMinor() {
if (osVersionMinor == -1) init_version();
return osVersionMinor;
}
public static boolean isDebugBuild() {
return (jdkDebug.toLowerCase().contains("debug"));
}

10
test/lib/jdk/test/lib/cli/predicate/AndPredicate.java
View File

@ -28,14 +28,22 @@ import java.util.function.BooleanSupplier;
public class AndPredicate implements BooleanSupplier {
private final BooleanSupplier a;
private final BooleanSupplier b;
private final BooleanSupplier c;
public AndPredicate(BooleanSupplier a, BooleanSupplier b) {
this.a = a;
this.b = b;
this.c = () -> true; // Boolean.TRUE::booleanValue
}
public AndPredicate(BooleanSupplier a, BooleanSupplier b, BooleanSupplier c) {
this.a = a;
this.b = b;
this.c = c;
}
@Override
public boolean getAsBoolean() {
return a.getAsBoolean() && b.getAsBoolean();
return a.getAsBoolean() && b.getAsBoolean() && c.getAsBoolean();
}
}