diff options
Diffstat (limited to 'java/openjdk8/files/patch-bsd-test')
-rw-r--r-- | java/openjdk8/files/patch-bsd-test | 1503 |
1 files changed, 0 insertions, 1503 deletions
diff --git a/java/openjdk8/files/patch-bsd-test b/java/openjdk8/files/patch-bsd-test deleted file mode 100644 index 607257e67fed..000000000000 --- a/java/openjdk8/files/patch-bsd-test +++ /dev/null @@ -1,1503 +0,0 @@ ---- ./hotspot/test/compiler/5091921/Test7005594.sh Sat Dec 08 11:48:29 2018 +0000 -+++ ./hotspot/test/compiler/5091921/Test7005594.sh Sun Feb 10 09:26:05 2019 -0800 -@@ -60,6 +60,15 @@ - # Windows/MKS - MEM=`"$ROOTDIR/mksnt/sysinf" memory -v | grep "Total Physical Memory: " | sed 's/Total Physical Memory: *//g'` - MEM="$(($machine_memory / 1024))" -+elif [ -x "/sbin/sysctl" ]; then -+ # BSD -+ MEM=`(/sbin/sysctl -n hw.physmem64 2> /dev/null || /sbin/sysctl -n hw.physmem)` -+ if [ -z "$MEM" ]; then -+ echo "Unable to determine amount of physical memory on the machine" -+ MEM=0 -+ else -+ MEM="$(($MEM / 1024 / 1024))" -+ fi - else - echo "Unable to determine amount of physical memory on the machine" - fi ---- ./hotspot/test/compiler/6894807/Test6894807.sh Sat Dec 08 11:48:29 2018 +0000 -+++ ./hotspot/test/compiler/6894807/Test6894807.sh Sun Feb 10 09:26:05 2019 -0800 -@@ -21,7 +21,7 @@ - # set platform-dependent variables - OS=`uname -s` - case "$OS" in -- SunOS | Linux | Darwin ) -+ SunOS | Linux | *BSD | Darwin ) - NULL=/dev/null - PS=":" - FS="/" ---- ./hotspot/test/runtime/7110720/Test7110720.sh Sat Dec 08 11:48:29 2018 +0000 -+++ ./hotspot/test/runtime/7110720/Test7110720.sh Sun Feb 10 09:26:05 2019 -0800 -@@ -28,7 +28,7 @@ - # set platform-dependent variables - OS=`uname -s` - case "$OS" in -- SunOS | Linux | Darwin ) -+ SunOS | Linux | *BSD | Darwin ) - FS="/" - RM=/bin/rm - CP=/bin/cp ---- ./hotspot/test/runtime/XCheckJniJsig/XCheckJSig.java Sat Dec 08 11:48:29 2018 +0000 -+++ ./hotspot/test/runtime/XCheckJniJsig/XCheckJSig.java Sun Feb 10 09:26:05 2019 -0800 -@@ -37,8 +37,8 @@ - public static void main(String args[]) throws Throwable { - - System.out.println("Regression test for bugs 7051189 and 8023393"); -- if (!Platform.isSolaris() && !Platform.isLinux() && !Platform.isOSX()) { -- System.out.println("Test only applicable on Solaris, Linux, and Mac OSX, skipping"); -+ if (!Platform.isSolaris() && !Platform.isLinux() && !Platform.isOSX() && !Platform.isBSD()) { -+ System.out.println("Test only applicable on Solaris, Linux, BSD, and Mac OSX, skipping"); - return; - } - ---- ./hotspot/test/serviceability/dcmd/DynLibDcmdTest.java Sat Dec 08 11:48:29 2018 +0000 -+++ ./hotspot/test/serviceability/dcmd/DynLibDcmdTest.java Sun Feb 10 09:26:05 2019 -0800 -@@ -47,6 +47,8 @@ - osDependentBaseString = "lib%s.dylib"; - } else if (Platform.isLinux()) { - osDependentBaseString = "lib%s.so"; -+ } else if (Platform.isBSD()) { -+ osDependentBaseString = "lib%s.so"; - } - - if (osDependentBaseString == null) { ---- ./hotspot/test/test_env.sh Sat Dec 08 11:48:29 2018 +0000 -+++ ./hotspot/test/test_env.sh Sun Feb 10 09:26:05 2019 -0800 -@@ -53,7 +53,7 @@ - # set platform-dependent variables - OS=`uname -s` - case "$OS" in -- AIX | Darwin | Linux | SunOS ) -+ AIX | *BSD | Darwin | Linux | SunOS ) - NULL=/dev/null - PS=":" - FS="/" ---- ./hotspot/test/testlibrary/com/oracle/java/testlibrary/Platform.java Sat Dec 08 11:48:29 2018 +0000 -+++ ./hotspot/test/testlibrary/com/oracle/java/testlibrary/Platform.java Sun Feb 10 09:26:05 2019 -0800 -@@ -67,6 +67,10 @@ - return isOs("aix"); - } - -+ public static boolean isBSD() { -+ return osName.toLowerCase().endsWith("bsd"); -+ } -+ - public static boolean isLinux() { - return isOs("linux"); - } ---- ./jdk/test/com/sun/corba/5036554/TestCorbaBug.sh Sat Dec 08 11:51:25 2018 +0000 -+++ ./jdk/test/com/sun/corba/5036554/TestCorbaBug.sh Sun Feb 10 09:27:00 2019 -0800 -@@ -48,7 +48,7 @@ - # set platform-dependent variables - OS=`uname -s` - case "$OS" in -- SunOS | Linux | Darwin | AIX ) -+ SunOS | Linux | *BSD | Darwin | AIX ) - PS=":" - FS="/" - ;; ---- ./jdk/test/com/sun/corba/cachedSocket/7056731.sh Sat Dec 08 11:51:25 2018 +0000 -+++ ./jdk/test/com/sun/corba/cachedSocket/7056731.sh Sun Feb 10 09:27:00 2019 -0800 -@@ -31,7 +31,7 @@ - - OS=`uname -s` - case "$OS" in -- SunOS | Linux | Darwin | AIX ) -+ SunOS | Linux | *BSD | Darwin | AIX ) - PS=":" - FS="/" - ;; ---- ./jdk/test/com/sun/jdi/ImmutableResourceTest.sh Sat Dec 08 11:51:25 2018 +0000 -+++ ./jdk/test/com/sun/jdi/ImmutableResourceTest.sh Sun Feb 10 09:27:00 2019 -0800 -@@ -56,7 +56,7 @@ - - OS=`uname -s` - case "$OS" in -- SunOS | Linux | Darwin | AIX ) -+ SunOS | Linux | *BSD | Darwin | AIX ) - PATHSEP=":" - ;; - ---- ./jdk/test/com/sun/jdi/JITDebug.sh Sat Dec 08 11:51:25 2018 +0000 -+++ ./jdk/test/com/sun/jdi/JITDebug.sh Sun Feb 10 09:27:00 2019 -0800 -@@ -63,7 +63,7 @@ - OS=`uname -s` - export TRANSPORT_METHOD - case "$OS" in -- SunOS | Linux | Darwin | AIX ) -+ SunOS | Linux | *BSD | Darwin | AIX ) - PATHSEP=":" - TRANSPORT_METHOD=dt_socket - ;; ---- ./jdk/test/com/sun/jdi/PrivateTransportTest.sh Sat Dec 08 11:51:25 2018 +0000 -+++ ./jdk/test/com/sun/jdi/PrivateTransportTest.sh Sun Feb 10 09:27:00 2019 -0800 -@@ -106,7 +106,7 @@ - xx=`find ${jreloc}/lib -name libdt_socket.so` - libloc=`dirname ${xx}` - ;; -- Darwin) -+ *BSD | Darwin) - libloc=${jreloc}/lib - ;; - Windows*) ---- ./jdk/test/com/sun/jdi/ShellScaffold.sh Sat Dec 08 11:51:25 2018 +0000 -+++ ./jdk/test/com/sun/jdi/ShellScaffold.sh Sun Feb 10 09:27:00 2019 -0800 -@@ -284,7 +284,7 @@ - psCmd=ps - jstack=jstack.exe - ;; -- SunOS | Linux | Darwin | AIX) -+ SunOS | Linux | *BSD | Darwin | AIX) - transport=dt_socket - address= - devnull=/dev/null ---- ./jdk/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh Sat Dec 08 11:51:25 2018 +0000 -+++ ./jdk/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh Sun Feb 10 09:27:00 2019 -0800 -@@ -45,7 +45,7 @@ - - OS=`uname -s` - case "$OS" in -- SunOS | Linux | Darwin | AIX ) -+ SunOS | Linux | *BSD | Darwin | AIX ) - PS=":" - ;; - Windows* | CYGWIN*) ---- ./jdk/test/java/awt/Desktop/DesktopGtkLoadTest/DesktopGtkLoadTest.java Sat Dec 08 11:51:25 2018 +0000 -+++ ./jdk/test/java/awt/Desktop/DesktopGtkLoadTest/DesktopGtkLoadTest.java Sun Feb 10 09:27:00 2019 -0800 -@@ -25,7 +25,7 @@ - * @bug 8157827 - * @summary AWT_Desktop/Automated/Exceptions/BasicTest loads incorrect GTK - * version when jdk.gtk.version=3 -- * @requires (os.family == "linux") -+ * @requires (os.family == "linux") | (os.family == "bsd") - * @run main DesktopGtkLoadTest - */ - ---- ./jdk/test/java/awt/Gtk/GtkVersionTest/GtkVersionTest.java Sat Dec 08 11:51:25 2018 +0000 -+++ ./jdk/test/java/awt/Gtk/GtkVersionTest/GtkVersionTest.java Sun Feb 10 09:27:00 2019 -0800 -@@ -25,7 +25,7 @@ - * @bug 8156121 - * @summary "Fail forward" fails for GTK3 if no GTK2 available - * @modules java.desktop/sun.awt -- * @requires (os.family == "linux") -+ * @requires (os.family == "linux") | (os.family == "bsd") - * @run main GtkVersionTest - */ - ---- ./jdk/test/java/awt/JAWT/JAWT.sh Sat Dec 08 11:51:25 2018 +0000 -+++ ./jdk/test/java/awt/JAWT/JAWT.sh Sun Feb 10 09:27:00 2019 -0800 -@@ -62,6 +62,23 @@ - MAKE="make" - LD_LIBRARY_PATH="." - ;; -+ *BSD ) -+ NULL=/dev/null -+ PS=":" -+ FS="/" -+ ${TESTJAVA}${FS}bin${FS}java -version 2>&1 | grep '64-Bit' > $NULL -+ if [ $? -eq '0' ] -+ then -+ ARCH="amd64" -+ else -+ ARCH="i386" -+ fi -+ SYST="bsd" -+ MAKEFILE="Makefile.unix" -+ CC="cc" -+ MAKE="make" -+ LD_LIBRARY_PATH="." -+ ;; - SunOS ) - NULL=/dev/null - PS=":" -@@ -111,7 +128,7 @@ - MAKE="make" - ;; - Darwin ) -- echo "Test passed. This test is not for MacOS." -+ echo "Test passed. This test is not for MacOS" - exit 0; - ;; - * ) ---- ./jdk/test/java/awt/Toolkit/AutoShutdown/ShowExitTest/ShowExitTest.sh Sat Dec 08 11:51:25 2018 +0000 -+++ ./jdk/test/java/awt/Toolkit/AutoShutdown/ShowExitTest/ShowExitTest.sh Sun Feb 10 09:27:00 2019 -0800 -@@ -86,6 +86,14 @@ - TMP="/tmp" - ;; - -+ *BSD ) -+ VAR="A different value for BSD" -+ DEFAULT_JDK=/usr/local/openjdk8 -+ FILESEP="/" -+ PATHSEP=":" -+ TMP="/tmp" -+ ;; -+ - Windows* ) - VAR="A different value for Win32" - DEFAULT_JDK="C:/Program Files/Java/jdk1.8.0" ---- ./jdk/test/java/awt/Toolkit/Headless/WrappedToolkitTest/WrappedToolkitTest.sh Sat Dec 08 11:51:25 2018 +0000 -+++ ./jdk/test/java/awt/Toolkit/Headless/WrappedToolkitTest/WrappedToolkitTest.sh Sun Feb 10 09:27:00 2019 -0800 -@@ -59,7 +59,7 @@ - # Checking for proper OS - OS=`uname -s` - case "$OS" in -- SunOS | Linux | Darwin | CYGWIN* ) -+ SunOS | Linux | *BSD | Darwin | AIX ) - FILESEP="/" - ;; - ---- ./jdk/test/java/awt/appletviewer/IOExceptionIfEncodedURLTest/IOExceptionIfEncodedURLTest.sh Sat Dec 08 11:51:25 2018 +0000 -+++ ./jdk/test/java/awt/appletviewer/IOExceptionIfEncodedURLTest/IOExceptionIfEncodedURLTest.sh Sun Feb 10 09:27:00 2019 -0800 -@@ -119,6 +119,14 @@ - TMP="/tmp" - ;; - -+ *BSD ) -+ VAR="A different value for BSD" -+ DEFAULT_JDK=/usr/local/openjdk8 -+ FILESEP="/" -+ PATHSEP=":" -+ TMP="/tmp" -+ ;; -+ - Windows* ) - VAR="A different value for Win32" - DEFAULT_JDK="C:/Program Files/Java/jdk1.8.0" ---- ./jdk/test/java/io/File/GetXSpace.java Sat Dec 08 11:51:25 2018 +0000 -+++ ./jdk/test/java/io/File/GetXSpace.java Sun Feb 10 09:27:00 2019 -0800 -@@ -51,7 +51,7 @@ - private static final String dfFormat; - static { - if (name.equals("SunOS") || name.equals("Linux") -- || name.contains("OS X")) { -+ || name.endsWith("BSD") || name.contains("OS X")) { - // FileSystem Total Used Available Use% MountedOn - dfFormat = "([^\\s]+)\\s+(\\d+)\\s+\\d+\\s+(\\d+)\\s+\\d+%\\s+([^\\s]+)"; - } else if (name.startsWith("Windows")) { ---- ./jdk/test/java/io/File/GetXSpace.sh Sat Dec 08 11:51:25 2018 +0000 -+++ ./jdk/test/java/io/File/GetXSpace.sh Sun Feb 10 09:27:00 2019 -0800 -@@ -26,7 +26,7 @@ - # set platform-dependent variable - OS=`uname -s` - case "$OS" in -- SunOS | Linux ) TMP=/tmp ;; -+ SunOS | Linux | *BSD | Darwin ) TMP=/tmp ;; - Windows_98 ) return ;; - Windows* ) SID=`sid`; TMP="c:/temp" ;; - * ) ---- ./jdk/test/java/io/Serializable/evolution/RenamePackage/run.sh Sat Dec 08 11:51:25 2018 +0000 -+++ ./jdk/test/java/io/Serializable/evolution/RenamePackage/run.sh Sun Feb 10 09:27:00 2019 -0800 -@@ -45,7 +45,7 @@ - # Need to determine the classpath separator and filepath separator based on the - # operating system. - case "$OS" in --SunOS | Linux | Darwin | AIX ) -+SunOS | Linux | *BSD | Darwin | AIX ) - PS=":" ;; - Windows* | CYGWIN* ) - PS=";" ;; ---- ./jdk/test/java/io/Serializable/serialver/classpath/run.sh Sat Dec 08 11:51:25 2018 +0000 -+++ ./jdk/test/java/io/Serializable/serialver/classpath/run.sh Sun Feb 10 09:27:00 2019 -0800 -@@ -47,7 +47,7 @@ - # set platform-dependent variables - OS=`uname -s` - case "$OS" in -- SunOS | Linux | Darwin | AIX ) -+ SunOS | Linux | *BSD | Darwin | AIX ) - PS=":" ;; - Windows* | CYGWIN* ) - PS=";" ;; ---- ./jdk/test/java/io/Serializable/serialver/nested/run.sh Sat Dec 08 11:51:25 2018 +0000 -+++ ./jdk/test/java/io/Serializable/serialver/nested/run.sh Sun Feb 10 09:27:00 2019 -0800 -@@ -47,7 +47,7 @@ - # set platform-dependent variables - OS=`uname -s` - case "$OS" in -- SunOS | Linux | Darwin | AIX ) -+ SunOS | Linux | *BSD | Darwin | AIX ) - PS=":" ;; - Windows* | CYGWIN* ) - PS=";" ;; ---- ./jdk/test/java/lang/ClassLoader/Assert.sh Sat Dec 08 11:51:25 2018 +0000 -+++ ./jdk/test/java/lang/ClassLoader/Assert.sh Sun Feb 10 09:27:00 2019 -0800 -@@ -25,7 +25,7 @@ - - OS=`uname -s` - case "$OS" in -- SunOS | Linux | Darwin ) -+ SunOS | Linux | Darwin | *BSD ) - FS="/" - CHMOD="${FS}bin${FS}chmod" - ;; ---- ./jdk/test/java/lang/ClassLoader/deadlock/TestCrossDelegate.sh Sat Dec 08 11:51:25 2018 +0000 -+++ ./jdk/test/java/lang/ClassLoader/deadlock/TestCrossDelegate.sh Sun Feb 10 09:27:00 2019 -0800 -@@ -55,7 +55,7 @@ - Linux ) - FS="/" - ;; -- Darwin ) -+ *BSD | Darwin ) - FS="/" - ;; - AIX ) ---- ./jdk/test/java/lang/ClassLoader/deadlock/TestOneWayDelegate.sh Sat Dec 08 11:51:25 2018 +0000 -+++ ./jdk/test/java/lang/ClassLoader/deadlock/TestOneWayDelegate.sh Sun Feb 10 09:27:00 2019 -0800 -@@ -60,7 +60,7 @@ - Linux ) - FS="/" - ;; -- Darwin ) -+ *BSD | Darwin ) - FS="/" - ;; - AIX ) ---- ./jdk/test/java/lang/ProcessBuilder/DestroyTest.java Sat Dec 08 11:51:25 2018 +0000 -+++ ./jdk/test/java/lang/ProcessBuilder/DestroyTest.java Sun Feb 10 09:27:00 2019 -0800 -@@ -148,6 +148,9 @@ - } else if (osName.startsWith("Linux") == true) { - return new UnixTest( - File.createTempFile("ProcessTrap-", ".sh",null)); -+ } else if (osName.endsWith("BSD")) { -+ return new UnixTest( -+ File.createTempFile("ProcessTrap-", ".sh",null)); - } else if (osName.startsWith("Mac OS")) { - return new MacTest( - File.createTempFile("ProcessTrap-", ".sh",null)); ---- ./jdk/test/java/lang/ProcessBuilder/Zombies.java Sat Dec 08 11:51:25 2018 +0000 -+++ ./jdk/test/java/lang/ProcessBuilder/Zombies.java Sun Feb 10 09:27:00 2019 -0800 -@@ -34,7 +34,7 @@ - - static final String os = System.getProperty("os.name"); - -- static final String TrueCommand = os.contains("OS X")? -+ static final String TrueCommand = (os.endsWith("BSD") || os.contains("OS X")) ? - "/usr/bin/true" : "/bin/true"; - - public static void main(String[] args) throws Throwable { ---- ./jdk/test/java/lang/StringCoding/CheckEncodings.sh Sat Dec 08 11:51:25 2018 +0000 -+++ ./jdk/test/java/lang/StringCoding/CheckEncodings.sh Sun Feb 10 09:27:00 2019 -0800 -@@ -30,7 +30,7 @@ - # set platform-dependent variables - OS=`uname -s` - case "$OS" in -- SunOS | Linux | Darwin | AIX ) ;; -+ SunOS | Linux | *BSD | Darwin | AIX ) ;; - Windows* | CYGWIN* ) - echo "Passed"; exit 0 ;; - * ) echo "Unrecognized system!" ; exit 1 ;; ---- ./jdk/test/java/lang/annotation/loaderLeak/LoaderLeak.sh Sat Dec 08 11:51:25 2018 +0000 -+++ ./jdk/test/java/lang/annotation/loaderLeak/LoaderLeak.sh Sun Feb 10 09:27:00 2019 -0800 -@@ -48,7 +48,7 @@ - # set platform-dependent variables - OS=`uname -s` - case "$OS" in -- SunOS | Linux | Darwin | AIX ) -+ SunOS | Linux | *BSD | Darwin | AIX ) - NULL=/dev/null - PS=":" - FS="/" ---- ./jdk/test/java/lang/instrument/MakeJAR2.sh Sat Dec 08 11:51:25 2018 +0000 -+++ ./jdk/test/java/lang/instrument/MakeJAR2.sh Sun Feb 10 09:27:00 2019 -0800 -@@ -55,7 +55,7 @@ - - OS=`uname -s` - case "$OS" in -- SunOS | Linux ) -+ SunOS | Linux | *BSD | Darwin ) - PATHSEP=":" - ;; - ---- ./jdk/test/java/lang/instrument/appendToClassLoaderSearch/CommonSetup.sh Sat Dec 08 11:51:25 2018 +0000 -+++ ./jdk/test/java/lang/instrument/appendToClassLoaderSearch/CommonSetup.sh Sun Feb 10 09:27:00 2019 -0800 -@@ -43,7 +43,7 @@ - PS=":" - FS="/" - ;; -- Darwin ) -+ *BSD | Darwin ) - PS=":" - FS="/" - ;; ---- ./jdk/test/java/lang/management/OperatingSystemMXBean/GetSystemLoadAverage.java Sat Dec 08 11:51:25 2018 +0000 -+++ ./jdk/test/java/lang/management/OperatingSystemMXBean/GetSystemLoadAverage.java Sun Feb 10 09:27:00 2019 -0800 -@@ -79,8 +79,10 @@ - System.out.println("Test passed."); - } - -+ private static String osName = System.getProperty("os.name"); -+ - private static String LOAD_AVERAGE_TEXT -- = System.getProperty("os.name").contains("OS X") -+ = (osName.endsWith("BSD") || osName.contains("OS X")) - ? "load averages:" - : "load average:"; - -@@ -99,7 +101,7 @@ - System.out.println("Load average returned from uptime = " + output); - System.out.println("getSystemLoadAverage() returned " + loadavg); - -- String[] lavg = System.getProperty("os.name").contains("OS X") -+ String[] lavg = (osName.endsWith("BSD") || osName.contains("OS X")) - ? output.split(" ") - : output.split(","); - double expected = Double.parseDouble(lavg[0]); ---- ./jdk/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh Sat Dec 08 11:51:25 2018 +0000 -+++ ./jdk/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh Sun Feb 10 09:27:00 2019 -0800 -@@ -61,7 +61,7 @@ - while true; do - echo "Run $i: TestSystemLoadAvg" - case `uname -s` in -- SunOS | Linux | Darwin | AIX ) -+ SunOS | Linux | *BSD | Darwin | AIX ) - runOne GetSystemLoadAverage - ;; - * ) ---- ./jdk/test/java/net/Authenticator/B4933582.sh Sat Dec 08 11:51:25 2018 +0000 -+++ ./jdk/test/java/net/Authenticator/B4933582.sh Sun Feb 10 09:27:00 2019 -0800 -@@ -26,7 +26,7 @@ - - OS=`uname -s` - case "$OS" in -- SunOS | Linux | Darwin | AIX ) -+ SunOS | Linux | *BSD | Darwin | AIX ) - PS=":" - FS="/" - ;; ---- ./jdk/test/java/net/DatagramSocket/Send12k.java Sat Dec 08 11:51:25 2018 +0000 -+++ ./jdk/test/java/net/DatagramSocket/Send12k.java Sun Feb 10 09:27:00 2019 -0800 -@@ -36,9 +36,10 @@ - - public static void main(String args[]) throws Exception { - -- int SEND_SIZE=0; -+ String osName = System.getProperty("os.name"); -+ int SEND_SIZE; - -- if(System.getProperty("os.name").contains("Mac")) { -+ if(osName.endsWith("BSD") || osName.contains("Mac")) { - SEND_SIZE = 16 * 576; - } else { - SEND_SIZE = 16 * 1024; ---- ./jdk/test/java/net/DatagramSocket/SendDatagramToBadAddress.java Sat Dec 08 11:51:25 2018 +0000 -+++ ./jdk/test/java/net/DatagramSocket/SendDatagramToBadAddress.java Sun Feb 10 09:27:00 2019 -0800 -@@ -45,6 +45,8 @@ - return (true); - if (p.getProperty ("os.name").equals ("Linux")) - return (true); -+ if (p.getProperty ("os.name").endsWith ("BSD")) -+ return (true); - if (p.getProperty ("os.name").startsWith ("Mac OS")) - return (true); - // Check for specific Solaris version from here ---- ./jdk/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.sh Sat Dec 08 11:51:25 2018 +0000 -+++ ./jdk/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.sh Sun Feb 10 09:27:00 2019 -0800 -@@ -27,11 +27,7 @@ - # set platform-dependent variables - OS=`uname -s` - case "$OS" in -- SunOS | Darwin | AIX ) -- PATHSEP=":" -- FILESEP="/" -- ;; -- Linux ) -+ SunOS | Linux | *BSD | Darwin | AIX ) - PATHSEP=":" - FILESEP="/" - ;; ---- ./jdk/test/java/net/Socket/OldSocketImpl.sh Sat Dec 08 11:51:25 2018 +0000 -+++ ./jdk/test/java/net/Socket/OldSocketImpl.sh Sun Feb 10 09:27:00 2019 -0800 -@@ -28,7 +28,7 @@ - - OS=`uname -s` - case "$OS" in -- SunOS | Linux | Darwin | AIX ) -+ SunOS | Linux | *BSD | Darwin | AIX ) - PS=":" - FS="/" - ;; ---- ./jdk/test/java/net/URL/B5086147.sh Sat Dec 08 11:51:25 2018 +0000 -+++ ./jdk/test/java/net/URL/B5086147.sh Sun Feb 10 09:27:00 2019 -0800 -@@ -26,7 +26,7 @@ - - OS=`uname -s` - case "$OS" in -- SunOS | Linux | Darwin | AIX ) -+ SunOS | Linux | *BSD | Darwin | AIX ) - exit 0 - ;; - CYGWIN* ) ---- ./jdk/test/java/net/URLClassLoader/B5077773.sh Sat Dec 08 11:51:25 2018 +0000 -+++ ./jdk/test/java/net/URLClassLoader/B5077773.sh Sun Feb 10 09:27:00 2019 -0800 -@@ -34,11 +34,7 @@ - - OS=`uname -s` - case "$OS" in -- SunOS | Darwin | AIX ) -- PS=":" -- FS="/" -- ;; -- Linux ) -+ SunOS | Linux | *BSD | Darwin | AIX ) - PS=":" - FS="/" - ;; ---- ./jdk/test/java/net/URLClassLoader/sealing/checksealed.sh Sat Dec 08 11:51:25 2018 +0000 -+++ ./jdk/test/java/net/URLClassLoader/sealing/checksealed.sh Sun Feb 10 09:27:00 2019 -0800 -@@ -27,11 +27,7 @@ - - OS=`uname -s` - case "$OS" in -- SunOS | Darwin | AIX ) -- PS=":" -- FS="/" -- ;; -- Linux ) -+ SunOS | Linux | *BSD | Darwin | AIX ) - PS=":" - FS="/" - ;; ---- ./jdk/test/java/net/URLConnection/6212146/test.sh Sat Dec 08 11:51:25 2018 +0000 -+++ ./jdk/test/java/net/URLConnection/6212146/test.sh Sun Feb 10 09:27:00 2019 -0800 -@@ -33,11 +33,7 @@ - - OS=`uname -s` - case "$OS" in -- SunOS | Darwin | AIX ) -- PS=":" -- FS="/" -- ;; -- Linux ) -+ SunOS | Linux | *BSD | Darwin | AIX ) - PS=":" - FS="/" - ;; ---- ./jdk/test/java/nio/channels/FileChannel/Transfer.java Sat Dec 08 11:51:25 2018 +0000 -+++ ./jdk/test/java/nio/channels/FileChannel/Transfer.java Sun Feb 10 09:27:00 2019 -0800 -@@ -228,7 +228,7 @@ - // Windows and Linux can't handle the really large file sizes for a - // truncate or a positional write required by the test for 4563125 - String osName = System.getProperty("os.name"); -- if (!(osName.startsWith("SunOS") || osName.contains("OS X"))) -+ if (!(osName.startsWith("SunOS") || osName.endsWith("BSD") || osName.contains("OS X"))) - return; - File source = File.createTempFile("blah", null); - source.deleteOnExit(); ---- ./jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/Launcher.c Sat Dec 08 11:51:25 2018 +0000 -+++ ./jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/Launcher.c Sun Feb 10 09:27:00 2019 -0800 -@@ -17,6 +17,12 @@ - - #include "Launcher.h" - -+#ifdef _ALLBSD_SOURCE -+#define FD_DIR "/dev/fd" -+#else -+#define FD_DIR "/proc/self/fd" -+#endif -+ - /* - * Throws the exception of the given class name and detail message - */ -@@ -135,7 +141,7 @@ - } - close(thisFd); - -- if ((dp = opendir("/proc/self/fd")) == NULL) { -+ if ((dp = opendir(FD_DIR)) == NULL) { - _exit(-1); - } - ---- ./jdk/test/java/nio/charset/coders/CheckSJISMappingProp.sh Sat Dec 08 11:51:25 2018 +0000 -+++ ./jdk/test/java/nio/charset/coders/CheckSJISMappingProp.sh Sun Feb 10 09:27:00 2019 -0800 -@@ -34,7 +34,7 @@ - - OS=`uname -s` - case "$OS" in -- SunOS | Linux | Darwin | AIX ) ;; -+ SunOS | Linux | *BSD | Darwin | AIX ) ;; - # Skip locale test for Windows - Windows* | CYGWIN* ) - echo "Passed"; exit 0 ;; ---- ./jdk/test/java/nio/charset/spi/basic.sh Sat Dec 08 11:51:25 2018 +0000 -+++ ./jdk/test/java/nio/charset/spi/basic.sh Sun Feb 10 09:27:00 2019 -0800 -@@ -48,7 +48,7 @@ - - DIR=`pwd` - case `uname` in -- SunOS | Linux | Darwin | AIX ) CPS=':' ;; -+ SunOS | Linux | *BSD | Darwin | AIX ) CPS=':' ;; - Windows* ) CPS=';' ;; - CYGWIN* ) - DIR=`/usr/bin/cygpath -a -s -m $DIR` ---- ./jdk/test/java/nio/file/FileSystem/Basic.java Sat Dec 08 11:51:25 2018 +0000 -+++ ./jdk/test/java/nio/file/FileSystem/Basic.java Sun Feb 10 09:27:00 2019 -0800 -@@ -76,7 +76,7 @@ - checkSupported(fs, "posix", "unix", "owner", "acl", "user"); - if (os.equals("Linux")) - checkSupported(fs, "posix", "unix", "owner", "dos", "user"); -- if (os.contains("OS X")) -+ if (os.endsWith("BSD") || os.contains("OS X")) - checkSupported(fs, "posix", "unix", "owner"); - if (os.equals("Windows")) - checkSupported(fs, "owner", "dos", "acl", "user"); ---- ./jdk/test/java/nio/file/Files/CopyAndMove.java Sat Dec 08 11:51:25 2018 +0000 -+++ ./jdk/test/java/nio/file/Files/CopyAndMove.java Sun Feb 10 09:27:00 2019 -0800 -@@ -651,7 +651,7 @@ - - // check POSIX attributes are copied - String os = System.getProperty("os.name"); -- if ((os.equals("SunOS") || os.equals("Linux")) && -+ if ((os.equals("SunOS") || os.equals("Linux") || os.endsWith("BSD")) && - testPosixAttributes) - { - checkPosixAttributes( -@@ -1155,7 +1155,7 @@ - static void randomizeAttributes(Path file) throws IOException { - String os = System.getProperty("os.name"); - boolean isWindows = os.startsWith("Windows"); -- boolean isUnix = os.equals("SunOS") || os.equals("Linux"); -+ boolean isUnix = os.equals("SunOS") || os.equals("Linux") || os.endsWith("BSD"); - boolean isDirectory = isDirectory(file, NOFOLLOW_LINKS); - - if (isUnix) { ---- ./jdk/test/java/nio/file/Files/probeContentType/ParallelProbes.java Sat Dec 08 11:51:25 2018 +0000 -+++ ./jdk/test/java/nio/file/Files/probeContentType/ParallelProbes.java Sun Feb 10 09:27:00 2019 -0800 -@@ -28,7 +28,7 @@ - - /* @test - * @summary Test probing content type simultaneously from multiple threads. -- * @requires (os.family == "linux") | (os.family == "solaris") -+ * @requires (os.family == "linux") | (os.family == "solaris") | (os.family == "bsd") - * @run main ParallelProbes 10 - */ - public class ParallelProbes { ---- ./jdk/test/java/rmi/activation/Activatable/extLoadedImpl/ext.sh Sat Dec 08 11:51:25 2018 +0000 -+++ ./jdk/test/java/rmi/activation/Activatable/extLoadedImpl/ext.sh Sun Feb 10 09:27:00 2019 -0800 -@@ -33,7 +33,7 @@ - - OS=`uname -s` - case "$OS" in -- SunOS | Linux | Darwin | AIX ) -+ SunOS | Linux | *BSD | Darwin | AIX ) - PS=":" - ;; - Windows* | CYGWIN* ) ---- ./jdk/test/java/rmi/registry/readTest/readTest.sh Sat Dec 08 11:51:25 2018 +0000 -+++ ./jdk/test/java/rmi/registry/readTest/readTest.sh Sun Feb 10 09:27:00 2019 -0800 -@@ -34,7 +34,7 @@ - REGARGS="" - - case "$OS" in -- SunOS | Linux | Darwin | AIX ) -+ SunOS | Linux | *BSD | Darwin | AIX ) - PS=":" - FS="/" - CHMOD="${FS}bin${FS}chmod" ---- ./jdk/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh Sat Dec 08 11:51:25 2018 +0000 -+++ ./jdk/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh Sun Feb 10 09:27:00 2019 -0800 -@@ -58,7 +58,7 @@ - PATHSEP=":" - FILESEP="/" - ;; -- Darwin ) -+ *BSD | Darwin ) - PATHSEP=":" - FILESEP="/" - ;; ---- ./jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh Sat Dec 08 11:51:25 2018 +0000 -+++ ./jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh Sun Feb 10 09:27:00 2019 -0800 -@@ -42,7 +42,7 @@ - PATHSEP=":" - FILESEP="/" - ;; -- Darwin ) -+ *BSD | Darwin ) - PATHSEP=":" - FILESEP="/" - ;; ---- ./jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock2.sh Sat Dec 08 11:51:25 2018 +0000 -+++ ./jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock2.sh Sun Feb 10 09:27:00 2019 -0800 -@@ -66,7 +66,7 @@ - PATHSEP=";" - FILESEP="/" - ;; -- Darwin ) -+ *BSD | Darwin ) - PATHSEP=":" - FILESEP="/" - ;; ---- ./jdk/test/java/security/Security/signedfirst/Dyn.sh Sat Dec 08 11:51:25 2018 +0000 -+++ ./jdk/test/java/security/Security/signedfirst/Dyn.sh Sun Feb 10 09:27:00 2019 -0800 -@@ -58,7 +58,7 @@ - PATHSEP=":" - FILESEP="/" - ;; -- Darwin ) -+ *BSD | Darwin ) - PATHSEP=":" - FILESEP="/" - ;; ---- ./jdk/test/java/security/Security/signedfirst/Static.sh Sat Dec 08 11:51:25 2018 +0000 -+++ ./jdk/test/java/security/Security/signedfirst/Static.sh Sun Feb 10 09:27:00 2019 -0800 -@@ -58,7 +58,7 @@ - PATHSEP=":" - FILESEP="/" - ;; -- Darwin ) -+ *BSD | Darwin ) - PATHSEP=":" - FILESEP="/" - ;; ---- ./jdk/test/java/util/Currency/PropertiesTest.sh Sat Dec 08 11:51:25 2018 +0000 -+++ ./jdk/test/java/util/Currency/PropertiesTest.sh Sun Feb 10 09:27:00 2019 -0800 -@@ -52,7 +52,7 @@ - # set platform-dependent variables - OS=`uname -s` - case "$OS" in -- SunOS | Linux | Darwin | AIX ) -+ SunOS | Linux | *BSD | Darwin | AIX ) - PS=":" - FS="/" - ;; ---- ./jdk/test/java/util/PluggableLocale/ExecTest.sh Sat Dec 08 11:51:25 2018 +0000 -+++ ./jdk/test/java/util/PluggableLocale/ExecTest.sh Sun Feb 10 09:27:00 2019 -0800 -@@ -62,7 +62,7 @@ - # set platform-dependent variables - OS=`uname -s` - case "$OS" in -- SunOS | Linux | Darwin | AIX ) -+ SunOS | Linux | *BSD | Darwin | AIX ) - PS=":" - FS="/" - ;; ---- ./jdk/test/java/util/ResourceBundle/Bug6299235Test.sh Sat Dec 08 11:51:25 2018 +0000 -+++ ./jdk/test/java/util/ResourceBundle/Bug6299235Test.sh Sun Feb 10 09:27:00 2019 -0800 -@@ -31,7 +31,7 @@ - # set platform-dependent variables - OS=`uname -s` - case "$OS" in -- SunOS | Linux | Darwin | AIX ) -+ SunOS | Linux | *BSD | Darwin | AIX ) - PATHSEP=":" - FILESEP="/" - ;; ---- ./jdk/test/java/util/ServiceLoader/basic.sh Sat Dec 08 11:51:25 2018 +0000 -+++ ./jdk/test/java/util/ServiceLoader/basic.sh Sun Feb 10 09:27:00 2019 -0800 -@@ -43,9 +43,7 @@ - - OS=`uname -s` - case "$OS" in -- SunOS | Darwin | AIX ) -- SEP=':' ;; -- Linux ) -+ SunOS | Linux | *BSD | Darwin | AIX ) - SEP=':' ;; - * ) - SEP='\;' ;; ---- ./jdk/test/java/util/prefs/CheckUserPrefsStorage.sh Sat Dec 08 11:51:25 2018 +0000 -+++ ./jdk/test/java/util/prefs/CheckUserPrefsStorage.sh Sun Feb 10 09:27:00 2019 -0800 -@@ -31,7 +31,7 @@ - - OS=`uname -s` - case "$OS" in -- SunOS | Linux | Darwin | AIX ) -+ SunOS | Linux | *BSD | Darwin | AIX ) - PS=":" - FS="/" - ;; ---- ./jdk/test/javax/crypto/SecretKeyFactory/FailOverTest.sh Sat Dec 08 11:51:25 2018 +0000 -+++ ./jdk/test/javax/crypto/SecretKeyFactory/FailOverTest.sh Sun Feb 10 09:27:00 2019 -0800 -@@ -56,7 +56,7 @@ - # set platform-dependent variables - OS=`uname -s` - case "$OS" in -- SunOS | Linux | Darwin | AIX ) -+ SunOS | Linux | *BSD | Darwin | AIX ) - NULL=/dev/null - PS=":" - FS="/" ---- ./jdk/test/javax/imageio/metadata/IIOMetadataFormat/runMetadataFormatTest.sh Sat Dec 08 11:51:25 2018 +0000 -+++ ./jdk/test/javax/imageio/metadata/IIOMetadataFormat/runMetadataFormatTest.sh Sun Feb 10 09:27:00 2019 -0800 -@@ -89,7 +89,7 @@ - FILESEP="/" - ;; - -- Linux | Darwin | AIX ) -+ Linux | *BSD | Darwin | AIX ) - VAR="A different value for Linux" - DEFAULT_JDK=/none - #DEFAULT_JDK=/usr/local/java/jdk1.4/linux-i386 ---- ./jdk/test/javax/imageio/metadata/IIOMetadataFormat/runMetadataFormatThreadTest.sh Sat Dec 08 11:51:25 2018 +0000 -+++ ./jdk/test/javax/imageio/metadata/IIOMetadataFormat/runMetadataFormatThreadTest.sh Sun Feb 10 09:27:00 2019 -0800 -@@ -90,7 +90,7 @@ - FILESEP="/" - ;; - -- Linux | Darwin | AIX ) -+ Linux | *BSD | Darwin | AIX ) - VAR="A different value for Linux" - DEFAULT_JDK=/none - #DEFAULT_JDK=/usr/local/java/jdk1.4/linux-i386 ---- ./jdk/test/javax/imageio/stream/StreamCloserLeak/run_test.sh Sat Dec 08 11:51:25 2018 +0000 -+++ ./jdk/test/javax/imageio/stream/StreamCloserLeak/run_test.sh Sun Feb 10 09:27:00 2019 -0800 -@@ -108,6 +108,14 @@ - TMP="/tmp" - ;; - -+ *BSD ) -+ VAR="A different value for BSD" -+ DEFAULT_JDK=/usr/local/openjdk8 -+ FILESEP="/" -+ PATHSEP=":" -+ TMP="/tmp" -+ ;; -+ - Windows* ) - VAR="A different value for Win32" - DEFAULT_JDK="C:/Program Files/Java/jdk1.8.0" ---- ./jdk/test/javax/script/CommonSetup.sh Sat Dec 08 11:51:25 2018 +0000 -+++ ./jdk/test/javax/script/CommonSetup.sh Sun Feb 10 09:27:00 2019 -0800 -@@ -36,7 +36,7 @@ - - OS=`uname -s` - case "$OS" in -- SunOS | Linux | Darwin | AIX ) -+ SunOS | Linux | *BSD | Darwin | AIX ) - PS=":" - FS="/" - ;; ---- ./jdk/test/javax/security/auth/Subject/doAs/Test.sh Sat Dec 08 11:51:25 2018 +0000 -+++ ./jdk/test/javax/security/auth/Subject/doAs/Test.sh Sun Feb 10 09:27:00 2019 -0800 -@@ -43,7 +43,7 @@ - FS="/" - RM="/bin/rm -f" - ;; -- Darwin ) -+ *BSD | Darwin ) - PS=":" - FS="/" - RM="/bin/rm -f" ---- ./jdk/test/javax/swing/LookAndFeel/8145547/DemandGTK.java Sat Dec 08 11:51:25 2018 +0000 -+++ ./jdk/test/javax/swing/LookAndFeel/8145547/DemandGTK.java Sun Feb 10 09:27:00 2019 -0800 -@@ -26,7 +26,7 @@ - @summary Tests that GTK LaF is supported on solaris - regardless of jdk.gtk.version flag values. - @bug 8156121 -- @requires (os.name == "linux" | os.name == "solaris") -+ @requires (os.family == "linux" | os.family == "solaris" | os.family == "bsd") - @run main/othervm -Djdk.gtk.version=2 DemandGTK - @run main/othervm -Djdk.gtk.version=3 DemandGTK - */ ---- ./jdk/test/lib/security/java.policy/Ext_AllPolicy.sh Sat Dec 08 11:51:25 2018 +0000 -+++ ./jdk/test/lib/security/java.policy/Ext_AllPolicy.sh Sun Feb 10 09:27:00 2019 -0800 -@@ -53,7 +53,7 @@ - # set platform-dependent variables - OS=`uname -s` - case "$OS" in -- SunOS | Linux | Darwin | AIX ) -+ SunOS | Linux | *BSD | Darwin | AIX ) - NULL=/dev/null - PS=":" - FS="/" ---- ./jdk/test/lib/testlibrary/jdk/testlibrary/Platform.java Sat Dec 08 11:51:25 2018 +0000 -+++ ./jdk/test/lib/testlibrary/jdk/testlibrary/Platform.java Sun Feb 10 09:27:00 2019 -0800 -@@ -53,8 +53,13 @@ - return isOs("linux"); - } - -+ public static boolean isBSD() { -+ return isOs("bsd"); -+ } -+ - private static boolean isOs(String osname) { -- return osName.toLowerCase().startsWith(osname.toLowerCase()); -+ return (osName.toLowerCase().startsWith(osname.toLowerCase()) || -+ osName.toLowerCase().endsWith(osname.toLowerCase())); - } - - public static String getOsName() { ---- ./jdk/test/sun/awt/dnd/8024061/bug8024061.java Sat Dec 08 11:51:25 2018 +0000 -+++ ./jdk/test/sun/awt/dnd/8024061/bug8024061.java Sun Feb 10 09:27:00 2019 -0800 -@@ -107,8 +107,8 @@ - - public static void main(String[] args) throws AWTException, InvocationTargetException, InterruptedException { - OSType type = OSInfo.getOSType(); -- if (type != OSType.LINUX && type != OSType.SOLARIS) { -- System.out.println("This test is for Linux and Solaris only... " + -+ if (type != OSType.LINUX && type != OSType.SOLARIS && type != OSType.BSD) { -+ System.out.println("This test is for BSD, Linux and Solaris only... " + - "skipping!"); - return; - } ---- ./jdk/test/sun/management/jmxremote/bootstrap/GeneratePropertyPassword.sh Sat Dec 08 11:51:25 2018 +0000 -+++ ./jdk/test/sun/management/jmxremote/bootstrap/GeneratePropertyPassword.sh Sun Feb 10 09:27:00 2019 -0800 -@@ -42,7 +42,7 @@ - fi - - case $OS in --SunOS | Linux | Darwin | AIX ) -+SunOS | Linux | *BSD | Darwin | AIX ) - PATHSEP=":" - FILESEP="/" - DFILESEP=$FILESEP ---- ./jdk/test/sun/net/ftp/MarkResetTest.sh Sat Dec 08 11:51:25 2018 +0000 -+++ ./jdk/test/sun/net/ftp/MarkResetTest.sh Sun Feb 10 09:27:00 2019 -0800 -@@ -28,7 +28,7 @@ - - OS=`uname -s` - case "$OS" in -- SunOS | Linux | Darwin | AIX ) -+ SunOS | Linux | *BSD | Darwin | AIX ) - PS=":" - FS="/" - ;; ---- ./jdk/test/sun/net/www/http/HttpClient/RetryPost.sh Sat Dec 08 11:51:25 2018 +0000 -+++ ./jdk/test/sun/net/www/http/HttpClient/RetryPost.sh Sun Feb 10 09:27:00 2019 -0800 -@@ -28,7 +28,7 @@ - - OS=`uname -s` - case "$OS" in -- SunOS | Linux | Darwin | AIX ) -+ SunOS | Linux | *BSD | Darwin | AIX ) - PS=":" - FS="/" - ;; ---- ./jdk/test/sun/net/www/protocol/jar/B5105410.sh Sat Dec 08 11:51:25 2018 +0000 -+++ ./jdk/test/sun/net/www/protocol/jar/B5105410.sh Sun Feb 10 09:27:00 2019 -0800 -@@ -31,7 +31,7 @@ - - OS=`uname -s` - case "$OS" in -- SunOS | Linux | Darwin | AIX ) -+ SunOS | Linux | *BSD | Darwin | AIX ) - PS=":" - FS="/" - ;; ---- ./jdk/test/sun/net/www/protocol/jar/jarbug/run.sh Sat Dec 08 11:51:25 2018 +0000 -+++ ./jdk/test/sun/net/www/protocol/jar/jarbug/run.sh Sun Feb 10 09:27:00 2019 -0800 -@@ -31,7 +31,7 @@ - - OS=`uname -s` - case "$OS" in -- SunOS | Linux | Darwin | AIX ) -+ SunOS | Linux | *BSD | Darwin | AIX ) - PS=":" - FS="/" - CHMOD="${FS}bin${FS}chmod" ---- ./jdk/test/sun/nio/ch/SelProvider.java Sat Dec 08 11:51:25 2018 +0000 -+++ ./jdk/test/sun/nio/ch/SelProvider.java Sun Feb 10 09:27:00 2019 -0800 -@@ -39,7 +39,7 @@ - expected = "sun.nio.ch.DevPollSelectorProvider"; - } else if ("Linux".equals(osname)) { - expected = "sun.nio.ch.EPollSelectorProvider"; -- } else if (osname.contains("OS X")) { -+ } else if (osname.endsWith("BSD") || osname.contains("OS X")) { - expected = "sun.nio.ch.KQueueSelectorProvider"; - } else { - return; ---- ./jdk/test/sun/security/krb5/runNameEquals.sh Sat Dec 08 11:51:25 2018 +0000 -+++ ./jdk/test/sun/security/krb5/runNameEquals.sh Sun Feb 10 09:27:00 2019 -0800 -@@ -52,7 +52,7 @@ - # set platform-dependent variables - OS=`uname -s` - case "$OS" in -- SunOS | Linux | Darwin ) -+ SunOS | Linux | *BSD | Darwin ) - PATHSEP=":" - FILESEP="/" - NATIVE=true ---- ./jdk/test/sun/security/mscapi/ShortRSAKey1024.sh Sat Dec 08 11:51:25 2018 +0000 -+++ ./jdk/test/sun/security/mscapi/ShortRSAKey1024.sh Sun Feb 10 09:27:00 2019 -0800 -@@ -50,7 +50,7 @@ - - OS=`uname -s` - case "$OS" in -- SunOS | Linux | Darwin | CYGWIN* ) -+ SunOS | Linux | *BSD | Darwin | CYGWIN* ) - FS="/" - ;; - Windows_* ) ---- ./jdk/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh Sat Dec 08 11:51:25 2018 +0000 -+++ ./jdk/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh Sun Feb 10 09:27:00 2019 -0800 -@@ -66,7 +66,7 @@ - CP="${FS}bin${FS}cp" - CHMOD="${FS}bin${FS}chmod" - ;; -- Darwin ) -+ *BSD | Darwin ) - FS="/" - PS=":" - CP="${FS}bin${FS}cp" ---- ./jdk/test/sun/security/pkcs11/Provider/Login.sh Sat Dec 08 11:51:25 2018 +0000 -+++ ./jdk/test/sun/security/pkcs11/Provider/Login.sh Sun Feb 10 09:27:00 2019 -0800 -@@ -67,7 +67,7 @@ - CP="${FS}bin${FS}cp" - CHMOD="${FS}bin${FS}chmod" - ;; -- Darwin ) -+ *BSD | Darwin ) - FS="/" - PS=":" - CP="${FS}bin${FS}cp" ---- ./jdk/test/sun/security/provider/KeyStore/DKSTest.sh Sat Dec 08 11:51:25 2018 +0000 -+++ ./jdk/test/sun/security/provider/KeyStore/DKSTest.sh Sun Feb 10 09:27:00 2019 -0800 -@@ -50,7 +50,7 @@ - # set platform-dependent variables - OS=`uname -s` - case "$OS" in -- SunOS | Linux | Darwin | AIX) -+ SunOS | Linux | *BSD | Darwin | AIX ) - PS=":" - FS="/" - ;; ---- ./jdk/test/sun/security/provider/PolicyFile/GrantAllPermToExtWhenNoPolicy.sh Sat Dec 08 11:51:25 2018 +0000 -+++ ./jdk/test/sun/security/provider/PolicyFile/GrantAllPermToExtWhenNoPolicy.sh Sun Feb 10 09:27:00 2019 -0800 -@@ -52,7 +52,7 @@ - PATHSEP=":" - FILESEP="/" - ;; -- Linux ) -+ Linux | *BSD | Darwin ) - PATHSEP=":" - FILESEP="/" - ;; ---- ./jdk/test/sun/security/provider/PolicyFile/getinstance/getinstance.sh Sat Dec 08 11:51:25 2018 +0000 -+++ ./jdk/test/sun/security/provider/PolicyFile/getinstance/getinstance.sh Sun Feb 10 09:27:00 2019 -0800 -@@ -59,7 +59,7 @@ - PS=":" - FS="/" - ;; -- Darwin ) -+ *BSD | Darwin ) - PS=":" - FS="/" - ;; ---- ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/EngineArgs/DebugReportsOneExtraByte.sh Sat Dec 08 11:51:25 2018 +0000 -+++ ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/EngineArgs/DebugReportsOneExtraByte.sh Sun Feb 10 09:27:00 2019 -0800 -@@ -33,7 +33,7 @@ - - OS=`uname -s` - case "$OS" in -- SunOS | Linux | Darwin | AIX ) -+ SunOS | Linux | *BSD | Darwin | AIX ) - PS=":" - FS="/" - ;; ---- ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.sh Sat Dec 08 11:51:25 2018 +0000 -+++ ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.sh Sun Feb 10 09:27:00 2019 -0800 -@@ -46,7 +46,7 @@ - - OS=`uname -s` - case "$OS" in -- SunOS | Linux | Darwin | AIX ) -+ SunOS | Linux | *BSD | Darwin | AIX ) - FILESEP="/" - PATHSEP=":" - ;; ---- ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh Sat Dec 08 11:51:25 2018 +0000 -+++ ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh Sun Feb 10 09:27:00 2019 -0800 -@@ -32,7 +32,7 @@ - HOSTNAME=`uname -n` - OS=`uname -s` - case "$OS" in -- SunOS | Linux | Darwin | AIX ) -+ SunOS | Linux | *BSD | Darwin | AIX ) - PS=":" - FS="/" - ;; ---- ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh Sat Dec 08 11:51:25 2018 +0000 -+++ ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh Sun Feb 10 09:27:00 2019 -0800 -@@ -32,7 +32,7 @@ - HOSTNAME=`uname -n` - OS=`uname -s` - case "$OS" in -- SunOS | Linux | Darwin | AIX ) -+ SunOS | Linux | *BSD | Darwin | AIX ) - PS=":" - FS="/" - ;; ---- ./jdk/test/sun/security/tools/jarsigner/AlgOptions.sh Sat Dec 08 11:51:25 2018 +0000 -+++ ./jdk/test/sun/security/tools/jarsigner/AlgOptions.sh Sun Feb 10 09:27:00 2019 -0800 -@@ -46,7 +46,7 @@ - # set platform-dependent variables - OS=`uname -s` - case "$OS" in -- SunOS | Linux | Darwin | AIX ) -+ SunOS | Linux | *BSD | Darwin | AIX ) - NULL=/dev/null - PS=":" - FS="/" ---- ./jdk/test/sun/security/tools/jarsigner/PercentSign.sh Sat Dec 08 11:51:25 2018 +0000 -+++ ./jdk/test/sun/security/tools/jarsigner/PercentSign.sh Sun Feb 10 09:27:00 2019 -0800 -@@ -46,7 +46,7 @@ - # set platform-dependent variables - OS=`uname -s` - case "$OS" in -- SunOS | Linux | Darwin | AIX ) -+ SunOS | Linux | *BSD | Darwin | AIX ) - NULL=/dev/null - PS=":" - FS="/" ---- ./jdk/test/sun/security/tools/jarsigner/diffend.sh Sat Dec 08 11:51:25 2018 +0000 -+++ ./jdk/test/sun/security/tools/jarsigner/diffend.sh Sun Feb 10 09:27:00 2019 -0800 -@@ -47,6 +47,13 @@ - FS="/" - CP="${FS}bin${FS}cp -f" - ;; -+ *BSD ) -+ NULL=/dev/null -+ PS=":" -+ FS="/" -+ PATH="${PATH}${PS}${FS}usr${FS}local${FS}bin" -+ CP="${FS}bin${FS}cp -f" -+ ;; - CYGWIN* ) - NULL=/dev/null - PS=";" ---- ./jdk/test/sun/security/tools/jarsigner/emptymanifest.sh Sat Dec 08 11:51:25 2018 +0000 -+++ ./jdk/test/sun/security/tools/jarsigner/emptymanifest.sh Sun Feb 10 09:27:00 2019 -0800 -@@ -39,6 +39,11 @@ - Windows_* ) - FS="\\" - ;; -+ *BSD ) -+ PS=":" -+ FS="/" -+ PATH="${PATH}${PS}${FS}usr${FS}local${FS}bin" -+ ;; - * ) - FS="/" - ;; ---- ./jdk/test/sun/security/tools/jarsigner/oldsig.sh Sat Dec 08 11:51:25 2018 +0000 -+++ ./jdk/test/sun/security/tools/jarsigner/oldsig.sh Sun Feb 10 09:27:00 2019 -0800 -@@ -42,7 +42,7 @@ - # set platform-dependent variables - OS=`uname -s` - case "$OS" in -- SunOS | Linux | Darwin | AIX ) -+ SunOS | Linux | *BSD | Darwin | AIX ) - NULL=/dev/null - PS=":" - FS="/" ---- ./jdk/test/sun/security/tools/keytool/AltProviderPath.sh Sat Dec 08 11:51:25 2018 +0000 -+++ ./jdk/test/sun/security/tools/keytool/AltProviderPath.sh Sun Feb 10 09:27:00 2019 -0800 -@@ -46,7 +46,7 @@ - # set platform-dependent variables - OS=`uname -s` - case "$OS" in -- SunOS | Linux | Darwin | AIX ) -+ SunOS | Linux | *BSD | Darwin | AIX ) - NULL=/dev/null - PS=":" - FS="/" ---- ./jdk/test/sun/security/tools/keytool/CloneKeyAskPassword.sh Sat Dec 08 11:51:25 2018 +0000 -+++ ./jdk/test/sun/security/tools/keytool/CloneKeyAskPassword.sh Sun Feb 10 09:27:00 2019 -0800 -@@ -55,7 +55,7 @@ - PATHSEP=":" - FILESEP="/" - ;; -- Darwin ) -+ *BSD | Darwin ) - PATHSEP=":" - FILESEP="/" - ;; ---- ./jdk/test/sun/security/tools/keytool/NoExtNPE.sh Sat Dec 08 11:51:25 2018 +0000 -+++ ./jdk/test/sun/security/tools/keytool/NoExtNPE.sh Sun Feb 10 09:27:00 2019 -0800 -@@ -48,7 +48,7 @@ - Linux ) - FILESEP="/" - ;; -- Darwin ) -+ *BSD | Darwin ) - FILESEP="/" - ;; - AIX ) ---- ./jdk/test/sun/security/tools/keytool/SecretKeyKS.sh Sat Dec 08 11:51:25 2018 +0000 -+++ ./jdk/test/sun/security/tools/keytool/SecretKeyKS.sh Sun Feb 10 09:27:00 2019 -0800 -@@ -45,7 +45,7 @@ - # set platform-dependent variables - OS=`uname -s` - case "$OS" in -- SunOS | Linux | Darwin | AIX ) -+ SunOS | Linux | *BSD | Darwin | AIX ) - NULL=/dev/null - PS=":" - FS="/" ---- ./jdk/test/sun/security/tools/keytool/StandardAlgName.sh Sat Dec 08 11:51:25 2018 +0000 -+++ ./jdk/test/sun/security/tools/keytool/StandardAlgName.sh Sun Feb 10 09:27:00 2019 -0800 -@@ -46,7 +46,7 @@ - # set platform-dependent variables - OS=`uname -s` - case "$OS" in -- SunOS | Linux | Darwin | AIX ) -+ SunOS | Linux | *BSD | Darwin | AIX ) - NULL=/dev/null - PS=":" - FS="/" ---- ./jdk/test/sun/security/tools/keytool/StorePasswordsByShell.sh Sat Dec 08 11:51:25 2018 +0000 -+++ ./jdk/test/sun/security/tools/keytool/StorePasswordsByShell.sh Sun Feb 10 09:27:00 2019 -0800 -@@ -46,7 +46,7 @@ - # set platform-dependent variables - OS=`uname -s` - case "$OS" in -- SunOS | Linux | Darwin | AIX) -+ SunOS | Linux | *BSD | Darwin | AIX ) - PATHSEP=":" - FILESEP="/" - ;; ---- ./jdk/test/sun/security/tools/keytool/i18n.sh Sat Dec 08 11:51:25 2018 +0000 -+++ ./jdk/test/sun/security/tools/keytool/i18n.sh Sun Feb 10 09:27:00 2019 -0800 -@@ -46,7 +46,7 @@ - # set platform-dependent variables - OS=`uname -s` - case "$OS" in -- SunOS | Linux ) -+ SunOS | Linux | *BSD ) - NULL=/dev/null - PS=":" - FS="/" ---- ./jdk/test/sun/security/tools/keytool/printssl.sh Sat Dec 08 11:51:25 2018 +0000 -+++ ./jdk/test/sun/security/tools/keytool/printssl.sh Sun Feb 10 09:27:00 2019 -0800 -@@ -40,7 +40,7 @@ - # set platform-dependent variables - OS=`uname -s` - case "$OS" in -- SunOS | Linux | Darwin | AIX ) -+ SunOS | Linux | *BSD | Darwin | AIX ) - FS="/" - ;; - CYGWIN* ) ---- ./jdk/test/sun/security/tools/keytool/resource.sh Sat Dec 08 11:51:25 2018 +0000 -+++ ./jdk/test/sun/security/tools/keytool/resource.sh Sun Feb 10 09:27:00 2019 -0800 -@@ -43,7 +43,7 @@ - # set platform-dependent variables - OS=`uname -s` - case "$OS" in -- SunOS | Linux | Darwin | AIX ) -+ SunOS | Linux | *BSD | Darwin | AIX ) - NULL=/dev/null - FS="/" - ;; ---- ./jdk/test/sun/security/tools/keytool/standard.sh Sat Dec 08 11:51:25 2018 +0000 -+++ ./jdk/test/sun/security/tools/keytool/standard.sh Sun Feb 10 09:27:00 2019 -0800 -@@ -45,7 +45,7 @@ - # set platform-dependent variables - OS=`uname -s` - case "$OS" in -- SunOS | Linux | Darwin | AIX | CYGWIN* ) -+ SunOS | Linux | *BSD | Darwin | AIX ) - FS="/" - ;; - Windows_* ) ---- ./jdk/test/sun/security/tools/policytool/Alias.sh Sat Dec 08 11:51:25 2018 +0000 -+++ ./jdk/test/sun/security/tools/policytool/Alias.sh Sun Feb 10 09:27:00 2019 -0800 -@@ -47,7 +47,7 @@ - # set platform-dependent variables - OS=`uname -s` - case "$OS" in -- SunOS | Linux | Darwin | AIX ) -+ SunOS | Linux | *BSD | Darwin | AIX ) - NULL=/dev/null - PS=":" - FS="/" ---- ./jdk/test/sun/security/tools/policytool/ChangeUI.sh Sat Dec 08 11:51:25 2018 +0000 -+++ ./jdk/test/sun/security/tools/policytool/ChangeUI.sh Sun Feb 10 09:27:00 2019 -0800 -@@ -46,7 +46,7 @@ - # set platform-dependent variables - OS=`uname -s` - case "$OS" in -- SunOS | Linux | Darwin | AIX ) -+ SunOS | Linux | *BSD | Darwin | AIX ) - NULL=/dev/null - PS=":" - FS="/" ---- ./jdk/test/sun/security/tools/policytool/OpenPolicy.sh Sat Dec 08 11:51:25 2018 +0000 -+++ ./jdk/test/sun/security/tools/policytool/OpenPolicy.sh Sun Feb 10 09:27:00 2019 -0800 -@@ -46,7 +46,7 @@ - # set platform-dependent variables - OS=`uname -s` - case "$OS" in -- SunOS | Linux | Darwin | AIX ) -+ SunOS | Linux | *BSD | Darwin | AIX ) - NULL=/dev/null - PS=":" - FS="/" ---- ./jdk/test/sun/security/tools/policytool/SaveAs.sh Sat Dec 08 11:51:25 2018 +0000 -+++ ./jdk/test/sun/security/tools/policytool/SaveAs.sh Sun Feb 10 09:27:00 2019 -0800 -@@ -47,7 +47,7 @@ - # set platform-dependent variables - OS=`uname -s` - case "$OS" in -- SunOS | Linux | Darwin | AIX ) -+ SunOS | Linux | *BSD | Darwin | AIX ) - NULL=/dev/null - PS=":" - FS="/" ---- ./jdk/test/sun/security/tools/policytool/UpdatePermissions.sh Sat Dec 08 11:51:25 2018 +0000 -+++ ./jdk/test/sun/security/tools/policytool/UpdatePermissions.sh Sun Feb 10 09:27:00 2019 -0800 -@@ -47,7 +47,7 @@ - # set platform-dependent variables - OS=`uname -s` - case "$OS" in -- SunOS | Linux | Darwin | AIX ) -+ SunOS | Linux | *BSD | Darwin | AIX ) - NULL=/dev/null - PS=":" - FS="/" ---- ./jdk/test/sun/security/tools/policytool/UsePolicy.sh Sat Dec 08 11:51:25 2018 +0000 -+++ ./jdk/test/sun/security/tools/policytool/UsePolicy.sh Sun Feb 10 09:27:00 2019 -0800 -@@ -46,7 +46,7 @@ - # set platform-dependent variables - OS=`uname -s` - case "$OS" in -- SunOS | Linux | Darwin | AIX ) -+ SunOS | Linux | *BSD | Darwin | AIX ) - NULL=/dev/null - PS=":" - FS="/" ---- ./jdk/test/sun/security/tools/policytool/i18n.sh Sat Dec 08 11:51:25 2018 +0000 -+++ ./jdk/test/sun/security/tools/policytool/i18n.sh Sun Feb 10 09:27:00 2019 -0800 -@@ -49,7 +49,7 @@ - # set platform-dependent variables - OS=`uname -s` - case "$OS" in -- SunOS | Linux | Darwin | AIX ) -+ SunOS | Linux | *BSD | Darwin | AIX ) - NULL=/dev/null - PS=":" - FS="/" ---- ./jdk/test/sun/tools/common/CommonSetup.sh Sat Dec 08 11:51:25 2018 +0000 -+++ ./jdk/test/sun/tools/common/CommonSetup.sh Sun Feb 10 09:27:00 2019 -0800 -@@ -47,6 +47,7 @@ - # isLinux - true if OS is Linux - # isSolaris - true if OS is Solaris - # isWindows - true if OS is Windows -+# isBSD - true if OS is BSD - # isMacos - true if OS is Macos X - # isAIX - true if OS is AIX - -@@ -83,6 +84,7 @@ - isSolaris=false - isUnknownOS=false - isWindows=false -+isBSD=false - isMacos=false - isAIX=false - -@@ -107,6 +109,10 @@ - OS="Linux" - isLinux=true - ;; -+ *BSD ) -+ OS="BSD" -+ isBSD=true -+ ;; - Darwin ) - OS="Mac OS X" - isMacos=true ---- ./jdk/test/sun/tools/jconsole/ResourceCheckTest.sh Sat Dec 08 11:51:25 2018 +0000 -+++ ./jdk/test/sun/tools/jconsole/ResourceCheckTest.sh Sun Feb 10 09:27:00 2019 -0800 -@@ -54,7 +54,7 @@ - - OS=`uname -s` - case "$OS" in -- SunOS | Linux | Darwin | AIX) -+ SunOS | Linux | *BSD | Darwin | AIX) - PATHSEP=":" - ;; - ---- ./jdk/test/sun/tools/native2ascii/resources/ImmutableResourceTest.sh Sat Dec 08 11:51:25 2018 +0000 -+++ ./jdk/test/sun/tools/native2ascii/resources/ImmutableResourceTest.sh Sun Feb 10 09:27:00 2019 -0800 -@@ -56,7 +56,7 @@ - - OS=`uname -s` - case "$OS" in -- SunOS | Linux | Darwin | AIX ) -+ SunOS | Linux | *BSD | Darwin | AIX ) - PATHSEP=":" - ;; - ---- ./jdk/test/tools/launcher/ExecutionEnvironment.java Sat Dec 08 11:51:25 2018 +0000 -+++ ./jdk/test/tools/launcher/ExecutionEnvironment.java Sun Feb 10 09:27:00 2019 -0800 -@@ -194,7 +194,7 @@ - - Map<String, String> env = new HashMap<>(); - -- if (TestHelper.isLinux || TestHelper.isMacOSX || TestHelper.isAIX) { -+ if (TestHelper.isLinux || TestHelper.isBSD || TestHelper.isMacOSX || TestHelper.isAIX) { - for (String x : LD_PATH_STRINGS) { - String pairs[] = x.split("="); - env.put(pairs[0], pairs[1]); ---- ./jdk/test/tools/launcher/RunpathTest.java Sat Dec 08 11:51:25 2018 +0000 -+++ ./jdk/test/tools/launcher/RunpathTest.java Sun Feb 10 09:27:00 2019 -0800 -@@ -69,7 +69,7 @@ - } - - public static void main(String... args) throws Exception { -- if (isSolaris || isLinux) { -+ if (isSolaris || isLinux || isBSD) { - RunpathTest rp = new RunpathTest(); - rp.testRpath(); - } ---- ./jdk/test/tools/launcher/Test7029048.java Sat Dec 08 11:51:25 2018 +0000 -+++ ./jdk/test/tools/launcher/Test7029048.java Sun Feb 10 09:27:00 2019 -0800 -@@ -223,7 +223,7 @@ - } else if (isSolaris && passes < 9) { - throw new Exception("Test7029048: FAIL: " + - "all tests did not run, expected " + 9 + " got " + passes); -- } else if (isLinux && passes < 6) { -+ } else if ((isLinux || isBSD) && passes < 6) { - throw new Exception("Test7029048: FAIL: " + - "all tests did not run, expected " + 6 + " got " + passes); - } else { ---- ./jdk/test/tools/launcher/TestHelper.java Sat Dec 08 11:51:25 2018 +0000 -+++ ./jdk/test/tools/launcher/TestHelper.java Sun Feb 10 09:27:00 2019 -0800 -@@ -94,6 +94,8 @@ - System.getProperty("os.name", "unknown").startsWith("Linux"); - static final boolean isAIX = - System.getProperty("os.name", "unknown").startsWith("AIX"); -+ static final boolean isBSD = -+ System.getProperty("os.name", "unknown").endsWith("BSD"); - static final String LIBJVM = isWindows - ? "jvm.dll" - : "libjvm" + (isMacOSX ? ".dylib" : ".so"); ---- ./langtools/test/Makefile Sat Dec 08 11:52:50 2018 +0000 -+++ ./langtools/test/Makefile Fri Feb 08 17:44:17 2019 -0800 -@@ -34,6 +34,14 @@ - ARCH=i586 - endif - endif -+ifneq ($(findstring BSD, $(OSNAME)), ) -+ PLATFORM = bsd -+ JT_PLATFORM = linux -+ ARCH = $(shell uname -p) -+ ifeq ($(ARCH), i386) -+ ARCH=i586 -+ endif -+endif - ifeq ($(OSNAME), Darwin) - PLATFORM = bsd - ARCH = $(shell uname -m) ---- ./langtools/test/tools/javah/ReadOldClass.sh Sat Dec 08 11:52:50 2018 +0000 -+++ ./langtools/test/tools/javah/ReadOldClass.sh Fri Feb 08 17:44:17 2019 -0800 -@@ -43,7 +43,7 @@ - # set platform-dependent variables - OS=`uname -s` - case "$OS" in -- SunOS | Linux | Darwin | CYGWIN* ) -+ SunOS | Linux | *BSD | Darwin | CYGWIN* ) - PS=":" - FS="/" - ;; ---- ./nashorn/test/script/jfx.js Sat Dec 08 11:53:10 2018 +0000 -+++ ./nashorn/test/script/jfx.js Fri Feb 08 17:44:19 2019 -0800 -@@ -93,6 +93,8 @@ - f2 = new File(sb.append(fsep + "linux.png").toString()); - } else if (OSInfo.getOSType() == OSType.MACOSX) { - f2 = new File(sb.append(fsep + "macosx.png").toString()); -+ } else if (OSInfo.getOSType() == OSType.BSD) { -+ f2 = new File(sb.append(fsep + "bsd.png").toString()); - } - if (f1.exists() && f2.exists()) { - var image1 = new AWTImage(PNGDecoder.decode(f1.getAbsolutePath())); |