infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-05-23 20:07:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

8028060: test/java/net/URLPermission/nstest/lookup.sh failing (win)

Browse Source 
Reviewed-by: alanb
This commit is contained in:
Michael McMahon 2013-11-11 16:06:16 +00:00
parent c10719362e
commit 536e058b8b
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jdk/test/java/net/URLPermission/nstest/LookupTest.java
View File

@ -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");

17
jdk/test/java/net/URLPermission/nstest/lookup.sh
View File

@ -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}