7113349: Initial changeset for Macosx port to jdk

Reviewed-by: jjh, alanb, dholmes, anthony, ohrstrom, ksrini, jrose, weijun, smarks
Contributed-by: Alan Bateman <alan.bateman@oracle.com>, Alexander Potochkin <alexander.potochkin@oracle.com>, Alexander Zuev <alexander.zuev@oracle.com>, Andrew Brygin <andrew.brygin@oracle.com>, Artem Ananiev <artem.ananiev@oracle.com>, Alex Strange <astrange@apple.com>, Bino George <bino@apple.com>, Christine Lu <christine.lu@oracle.com>, David Katleman <david.katleman@oracle.com>, David Durrence <david_durrence@apple.com>, Dmitry Cherepanov <dmitry.cherepanov@oracle.com>, Greg Lewis <glewis@eyesbeyond.com>, Kevin Miller <kevin_m_miller@apple.com>, Kurt Miller <kurt@intricatesoftware.com>, Landon Fuller <landonf@plausiblelabs.com>, Leonid Romanov <leonid.romanov@oracle.com>, Loefty Walkowiak <loefty@apple.com>, Mark Reinhold <mark.reinhold@oracle.com>, Naoto Sato <naoto.sato@oracle.com>, Philip Race <philip.race@oracle.com>, Roger Hoover <rhoover@apple.com>, Scott Kovatch <scott.kovatch@oracle.com>, Sergey ByloKhov <sergey.bylokhov@oracle.com>, Mike Swingler <swingler@apple.com>, Tomas Hurka <tomas.hurka@oracle.com>

3 files changed, 2 insertions, 10 deletions

diff --git a/test/java/nio/channels/DatagramChannel/Refused.java b/test/java/nio/channels/DatagramChannel/Refused.java
index c44dd37f6..62788043e 100644
--- a/test/java/nio/channels/DatagramChannel/Refused.java
+++ b/test/java/nio/channels/DatagramChannel/Refused.java
@@ -104,16 +104,9 @@ public class Refused {
             Thread.sleep(2000);
             inBuf.clear();
             server.read(inBuf);
-            if (onSolarisOrLinux())
-                throw new Exception("Expected PUE not thrown");
         } catch (PortUnreachableException pue) {
             System.err.println("received PUE");
         }
         server.close();
     }
-
-    static boolean onSolarisOrLinux() {
-        String osName = System.getProperty("os.name");
-        return osName.startsWith("SunOS") || osName.startsWith("Linux");
-    }
 }
diff --git a/test/java/nio/channels/FileChannel/Size.java b/test/java/nio/channels/FileChannel/Size.java
index 09f9eb166..ffa0720b9 100644
--- a/test/java/nio/channels/FileChannel/Size.java
+++ b/test/java/nio/channels/FileChannel/Size.java
@@ -69,7 +69,7 @@ public class Size {
         // 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")) {
+        if (osName.startsWith("SunOS") || osName.startsWith("Mac OS")) {
             blah = File.createTempFile("blah", null);
             long testSize = ((long)Integer.MAX_VALUE) * 2;
             initTestFile(blah, 10);
diff --git a/test/java/nio/channels/FileChannel/Transfer.java b/test/java/nio/channels/FileChannel/Transfer.java
index 0807ead8d..0e18f54d7 100644
--- a/test/java/nio/channels/FileChannel/Transfer.java
+++ b/test/java/nio/channels/FileChannel/Transfer.java
@@ -228,9 +228,8 @@ public class Transfer {
         // 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"))
+        if (!(osName.startsWith("SunOS") || osName.startsWith("Mac OS")))
             return;
-
         File source = File.createTempFile("blah", null);
         source.deleteOnExit();
         long testSize = ((long)Integer.MAX_VALUE) * 2;