提交 a06aa29d 编写于 作者: A alanb

7132247: java/rmi/registry/readTest/readTest.sh failing with Cygwin

Reviewed-by: alanb
Contributed-by: NEric Wang <yiming.wang@oracle.com>
上级 116a092a
...@@ -253,8 +253,6 @@ java/nio/channels/Selector/OutOfBand.java macosx-all ...@@ -253,8 +253,6 @@ java/nio/channels/Selector/OutOfBand.java macosx-all
# 7146541 # 7146541
java/rmi/transport/rapidExportUnexport/RapidExportUnexport.java linux-all java/rmi/transport/rapidExportUnexport/RapidExportUnexport.java linux-all
# 7132247
java/rmi/registry/readTest/readTest.sh windows-all
############################################################################ ############################################################################
# jdk_security # jdk_security
......
...@@ -35,18 +35,23 @@ case "$OS" in ...@@ -35,18 +35,23 @@ case "$OS" in
FS="/" FS="/"
FILEURL="file:" FILEURL="file:"
;; ;;
Windows* | CYGWIN* ) Windows* )
PS=";" PS=";"
FS="\\" FS="\\"
FILEURL="file:/" FILEURL="file:/"
;; ;;
CYGWIN* )
PS=";"
FS="/"
FILEURL="file:/"
;;
* ) * )
echo "Unrecognized system!" echo "Unrecognized system!"
exit 1; exit 1;
;; ;;
esac esac
TEST_CLASSPATH=.:$TESTCLASSES TEST_CLASSPATH=.$PS$TESTCLASSES
cp -r ${TESTSRC}${FS}* . cp -r ${TESTSRC}${FS}* .
${TESTJAVA}${FS}bin${FS}javac testPkg${FS}*java ${TESTJAVA}${FS}bin${FS}javac testPkg${FS}*java
${TESTJAVA}${FS}bin${FS}javac -cp $TEST_CLASSPATH readTest.java ${TESTJAVA}${FS}bin${FS}javac -cp $TEST_CLASSPATH readTest.java
...@@ -62,8 +67,16 @@ RMIREG_PID=$! ...@@ -62,8 +67,16 @@ RMIREG_PID=$!
sleep 3 sleep 3
cd .. cd ..
case "$OS" in
CYGWIN* )
CODEBASE=`cygpath -w $PWD`
;;
* )
CODEBASE=`pwd`
;;
esac
# trailing / after code base is important for rmi codebase property. # trailing / after code base is important for rmi codebase property.
${TESTJAVA}${FS}bin${FS}java -cp $TEST_CLASSPATH -Djava.rmi.server.codebase=${FILEURL}`pwd`/ readTest > OUT.TXT 2>&1 & ${TESTJAVA}${FS}bin${FS}java -cp $TEST_CLASSPATH -Djava.rmi.server.codebase=${FILEURL}$CODEBASE/ readTest > OUT.TXT 2>&1 &
TEST_PID=$! TEST_PID=$!
#bulk of testcase - let it run for a while #bulk of testcase - let it run for a while
sleep 5 sleep 5
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册