8024492: [TESTBUG] Test library class Platform.java needs to include methods for missing OS's and architectures

Added methods for 32bit, arm, ppc, x64 and x86

Reviewed-by: zgu, hseigel, mseledtsov
This commit is contained in:
Christian Tornqvist 2013-09-25 17:47:51 +02:00
parent 81505a6a57
commit 18550f7774

View file

@ -24,50 +24,80 @@
package com.oracle.java.testlibrary; package com.oracle.java.testlibrary;
public class Platform { public class Platform {
private static final String osName = System.getProperty("os.name"); private static final String osName = System.getProperty("os.name");
private static final String dataModel = System.getProperty("sun.arch.data.model"); private static final String dataModel = System.getProperty("sun.arch.data.model");
private static final String vmVersion = System.getProperty("java.vm.version"); private static final String vmVersion = System.getProperty("java.vm.version");
private static final String osArch = System.getProperty("os.arch"); private static final String osArch = System.getProperty("os.arch");
public static boolean is64bit() { public static boolean is32bit() {
return dataModel.equals("64"); return dataModel.equals("32");
} }
public static boolean isSolaris() { public static boolean is64bit() {
return osName.toLowerCase().startsWith("sunos"); return dataModel.equals("64");
} }
public static boolean isWindows() { public static boolean isSolaris() {
return osName.toLowerCase().startsWith("win"); return isOs("sunos");
} }
public static boolean isOSX() { public static boolean isWindows() {
return osName.toLowerCase().startsWith("mac"); return isOs("win");
} }
public static boolean isLinux() { public static boolean isOSX() {
return osName.toLowerCase().startsWith("linux"); return isOs("mac");
} }
public static String getOsName() { public static boolean isLinux() {
return osName; return isOs("linux");
} }
public static boolean isDebugBuild() { private static boolean isOs(String osname) {
return vmVersion.toLowerCase().contains("debug"); return osName.toLowerCase().startsWith(osname.toLowerCase());
} }
public static String getVMVersion() { public static String getOsName() {
return vmVersion; return osName;
} }
// Returns true for sparc and sparcv9. public static boolean isDebugBuild() {
public static boolean isSparc() { return vmVersion.toLowerCase().contains("debug");
return osArch.toLowerCase().startsWith("sparc"); }
}
public static String getOsArch() { public static String getVMVersion() {
return osArch; return vmVersion;
} }
// Returns true for sparc and sparcv9.
public static boolean isSparc() {
return isArch("sparc");
}
public static boolean isARM() {
return isArch("arm");
}
public static boolean isPPC() {
return isArch("ppc");
}
public static boolean isX86() {
// On Linux it's 'i386', Windows 'x86'
return (isArch("i386") || isArch("x86"));
}
public static boolean isX64() {
// On OSX it's 'x86_64' and on other (Linux, Windows and Solaris) platforms it's 'amd64'
return (isArch("amd64") || isArch("x86_64"));
}
private static boolean isArch(String archname) {
return osArch.toLowerCase().startsWith(archname.toLowerCase());
}
public static String getOsArch() {
return osArch;
}
} }