Mercurial > hg > openjdk > bsd-port > jdk
changeset 8490:feb3ead5c0a5
8077953: [TEST_BUG] com/sun/management/OperatingSystemMXBean/TestTotalSwap.java Compilation failed after JDK-8077387
Reviewed-by: sla, dholmes
author | jbachorik |
---|---|
date | Fri, 14 Oct 2016 17:18:07 +0100 |
parents | f0d6bb6a4fed |
children | 390481d72f95 |
files | test/lib/testlibrary/jdk/testlibrary/OSInfo.java test/lib/testlibrary/jdk/testlibrary/OutputAnalyzer.java test/lib/testlibrary/jdk/testlibrary/ProcessTools.java |
diffstat | 3 files changed, 269 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/lib/testlibrary/jdk/testlibrary/OSInfo.java Fri Oct 14 17:18:07 2016 +0100 @@ -0,0 +1,191 @@ +/* + * Copyright (c) 1997, 2015, Oracle and/or its affiliates. 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 + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +package jdk.testlibrary; + +import java.security.PrivilegedAction; +import java.util.HashMap; +import java.util.Map; + +import static jdk.testlibrary.OSInfo.OSType.*; + +/** + * @author Pavel Porvatov + * copied to testlibrary by yan + */ +public class OSInfo { + public static enum OSType { + WINDOWS, + LINUX, + SOLARIS, + MACOSX, + UNKNOWN + } + + /* + The map windowsVersionMap must contain all windows version constants except WINDOWS_UNKNOWN, + and so the method getWindowsVersion() will return the constant for known OS. + It allows compare objects by "==" instead of "equals". + */ + public static final WindowsVersion WINDOWS_UNKNOWN = new WindowsVersion(-1, -1); + public static final WindowsVersion WINDOWS_95 = new WindowsVersion(4, 0); + public static final WindowsVersion WINDOWS_98 = new WindowsVersion(4, 10); + public static final WindowsVersion WINDOWS_ME = new WindowsVersion(4, 90); + public static final WindowsVersion WINDOWS_2000 = new WindowsVersion(5, 0); + public static final WindowsVersion WINDOWS_XP = new WindowsVersion(5, 1); + public static final WindowsVersion WINDOWS_2003 = new WindowsVersion(5, 2); + public static final WindowsVersion WINDOWS_VISTA = new WindowsVersion(6, 0); + + private static final String OS_NAME = "os.name"; + private static final String OS_VERSION = "os.version"; + + private final static Map<String, WindowsVersion> windowsVersionMap = new HashMap<String, OSInfo.WindowsVersion>(); + + static { + windowsVersionMap.put(WINDOWS_95.toString(), WINDOWS_95); + windowsVersionMap.put(WINDOWS_98.toString(), WINDOWS_98); + windowsVersionMap.put(WINDOWS_ME.toString(), WINDOWS_ME); + windowsVersionMap.put(WINDOWS_2000.toString(), WINDOWS_2000); + windowsVersionMap.put(WINDOWS_XP.toString(), WINDOWS_XP); + windowsVersionMap.put(WINDOWS_2003.toString(), WINDOWS_2003); + windowsVersionMap.put(WINDOWS_VISTA.toString(), WINDOWS_VISTA); + } + + private static final PrivilegedAction<OSType> osTypeAction = new PrivilegedAction<OSType>() { + public OSType run() { + return getOSType(); + } + }; + + private OSInfo() { + // Don't allow to create instances + } + + /** + * Returns type of operating system. + */ + public static OSType getOSType() throws SecurityException { + String osName = System.getProperty(OS_NAME); + + if (osName != null) { + if (osName.contains("Windows")) { + return WINDOWS; + } + + if (osName.contains("Linux")) { + return LINUX; + } + + if (osName.contains("Solaris") || osName.contains("SunOS")) { + return SOLARIS; + } + + if (osName.contains("OS X")) { + return MACOSX; + } + + // determine another OS here + } + + return UNKNOWN; + } + + public static PrivilegedAction<OSType> getOSTypeAction() { + return osTypeAction; + } + + public static WindowsVersion getWindowsVersion() throws SecurityException { + String osVersion = System.getProperty(OS_VERSION); + + if (osVersion == null) { + return WINDOWS_UNKNOWN; + } + + synchronized (windowsVersionMap) { + WindowsVersion result = windowsVersionMap.get(osVersion); + + if (result == null) { + // Try parse version and put object into windowsVersionMap + String[] arr = osVersion.split("\\."); + + if (arr.length == 2) { + try { + result = new WindowsVersion(Integer.parseInt(arr[0]), Integer.parseInt(arr[1])); + } catch (NumberFormatException e) { + return WINDOWS_UNKNOWN; + } + } else { + return WINDOWS_UNKNOWN; + } + + windowsVersionMap.put(osVersion, result); + } + + return result; + } + } + + public static class WindowsVersion implements Comparable<WindowsVersion> { + private final int major; + + private final int minor; + + private WindowsVersion(int major, int minor) { + this.major = major; + this.minor = minor; + } + + public int getMajor() { + return major; + } + + public int getMinor() { + return minor; + } + + public int compareTo(WindowsVersion o) { + int result = major - o.getMajor(); + + if (result == 0) { + result = minor - o.getMinor(); + } + + return result; + } + + public boolean equals(Object obj) { + return obj instanceof WindowsVersion && compareTo((WindowsVersion) obj) == 0; + } + + public int hashCode() { + return 31 * major + minor; + } + + public String toString() { + return major + "." + minor; + } + } +} +
--- a/test/lib/testlibrary/jdk/testlibrary/OutputAnalyzer.java Fri Oct 14 15:02:51 2016 +0100 +++ b/test/lib/testlibrary/jdk/testlibrary/OutputAnalyzer.java Fri Oct 14 17:18:07 2016 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2015 Oracle and/or its affiliates. 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,8 @@ package jdk.testlibrary; import java.io.IOException; +import java.util.ArrayList; +import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -394,4 +396,23 @@ public int getExitValue() { return exitValue; } + + /** + * Get the contents of the output buffer (stdout and stderr) as list of strings. + * Output will be split by system property 'line.separator'. + * + * @return Contents of the output buffer as list of strings + */ + public List<String> asLines() { + return asLines(getOutput()); + } + + private List<String> asLines(String buffer) { + List<String> l = new ArrayList<>(); + String[] a = buffer.split(Utils.NEW_LINE); + for (String string : a) { + l.add(string); + } + return l; + } }
--- a/test/lib/testlibrary/jdk/testlibrary/ProcessTools.java Fri Oct 14 15:02:51 2016 +0100 +++ b/test/lib/testlibrary/jdk/testlibrary/ProcessTools.java Fri Oct 14 17:18:07 2016 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2015, Oracle and/or its affiliates. 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 @@ -31,7 +31,9 @@ import java.lang.reflect.Field; import java.lang.reflect.Method; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collections; +import java.util.Iterator; import java.util.Map; import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; @@ -319,4 +321,57 @@ } return cmd.toString().trim(); } + + /** + * Executes a process, waits for it to finish, prints the process output + * to stdout, and returns the process output. + * + * The process will have exited before this method returns. + * + * @param cmds The command line to execute. + * @return The {@linkplain OutputAnalyzer} instance wrapping the process. + */ + public static OutputAnalyzer executeCommand(String... cmds) + throws Throwable { + String cmdLine = ""; + if (cmds.length > 0) { + StringBuilder cmdLineBuf = new StringBuilder(cmds[0]); + for (int a = 1; a < cmds.length; ++a) { + cmdLineBuf.append(" "); + cmdLineBuf.append(cmds[a]); + } + cmdLine = cmdLineBuf.toString(); + } + System.out.println("Command line: [" + cmdLine + "]"); + OutputAnalyzer analyzer = ProcessTools.executeProcess(cmds); + System.out.println(analyzer.getOutput()); + return analyzer; + } + + /** + * Executes a process, waits for it to finish, prints the process output + * to stdout and returns the process output. + * + * The process will have exited before this method returns. + * + * @param pb The ProcessBuilder to execute. + * @return The {@linkplain OutputAnalyzer} instance wrapping the process. + */ + public static OutputAnalyzer executeCommand(ProcessBuilder pb) + throws Throwable { + Iterator<String> cmds = pb.command().iterator(); + String cmdLine = ""; + if (cmds.hasNext()) { + StringBuilder cmdLineBuf = new StringBuilder(cmds.next()); + while (cmds.hasNext()) { + cmdLineBuf.append(" "); + cmdLineBuf.append(cmds.next()); + } + cmdLine = cmdLineBuf.toString(); + } + System.out.println("Command line: [" + cmdLine + "]"); + OutputAnalyzer analyzer = ProcessTools.executeProcess(pb); + System.out.println(analyzer.getOutput()); + return analyzer; + } }