From 536e058b8b32097c7bee62c2b8b6beea5c084719 Mon Sep 17 00:00:00 2001
From: Michael McMahon <michaelm@openjdk.org>
Date: Mon, 11 Nov 2013 16:06:16 +0000
Subject: [PATCH] 8028060: test/java/net/URLPermission/nstest/lookup.sh failing
 (win)

Reviewed-by: alanb
---
 .../net/URLPermission/nstest/LookupTest.java    |  2 +-
 .../java/net/URLPermission/nstest/lookup.sh     | 17 ++++++++++++++---
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/jdk/test/java/net/URLPermission/nstest/LookupTest.java b/jdk/test/java/net/URLPermission/nstest/LookupTest.java
index fb31e7dcda5..57309213f65 100644
--- a/jdk/test/java/net/URLPermission/nstest/LookupTest.java
+++ b/jdk/test/java/net/URLPermission/nstest/LookupTest.java
@@ -66,7 +66,7 @@ public class LookupTest {
         String cmd = args[0];
         if (cmd.equals("-getport")) {
             port = Utils.getFreePort();
-            System.out.println(port);
+            System.out.print(port);
         } else if (cmd.equals("-runtest")) {
             port = Integer.parseInt(args[1]);
             SimpleNameService.put("allowedAndFound.com", "127.0.0.1");
diff --git a/jdk/test/java/net/URLPermission/nstest/lookup.sh b/jdk/test/java/net/URLPermission/nstest/lookup.sh
index b9ebb06a9ac..89cfd101d21 100644
--- a/jdk/test/java/net/URLPermission/nstest/lookup.sh
+++ b/jdk/test/java/net/URLPermission/nstest/lookup.sh
@@ -1,5 +1,4 @@
 #!/bin/sh
-
 #
 # Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -29,7 +28,19 @@
 #            LookupTest.java SimpleNameServiceDescriptor.java
 # @run shell/timeout=50 lookup.sh
 #
-DIR=`pwd`
+
+OS=`uname -s`
+case ${OS} in
+Windows_* | CYGWIN*)
+    PS=";"
+    FS="\\"
+    ;;
+*)
+    PS=":"
+    FS="/"
+    ;;
+esac
+
 
 port=`${TESTJAVA}/bin/java -cp ${TESTCLASSES} LookupTest -getport`
 
@@ -45,4 +56,4 @@ grant {
 };
 POLICY
 
-${TESTJAVA}/bin/java -Djava.security.policy=file://${DIR}/policy -Dsun.net.spi.nameservice.provider.1=simple,sun -cp ${TESTCLASSES}:${TESTSRC} LookupTest -runtest $port
+${TESTJAVA}/bin/java -Djava.security.policy=file:./policy -Dsun.net.spi.nameservice.provider.1=simple,sun -cp ${TESTCLASSES}${PS}${TESTSRC} LookupTest -runtest ${port}