Mercurial > hg > openjdk > jdk6 > jdk
changeset 1542:4fd0d817f510
7132247: java/rmi/registry/readTest/readTest.sh failing with Cygwin
Reviewed-by: alanb, dmocek, smarks
Contributed-by: Eric Wang <yiming.wang@oracle.com>
author | alanb |
---|---|
date | Tue, 20 Dec 2016 04:03:45 +0000 |
parents | 89ef904fe25c |
children | c4d485564741 |
files | test/java/rmi/registry/readTest/readTest.sh |
diffstat | 1 files changed, 16 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/test/java/rmi/registry/readTest/readTest.sh Tue Dec 20 04:02:01 2016 +0000 +++ b/test/java/rmi/registry/readTest/readTest.sh Tue Dec 20 04:03:45 2016 +0000 @@ -35,18 +35,23 @@ FS="/" FILEURL="file:" ;; - Windows* | CYGWIN* ) + Windows* ) PS=";" FS="\\" FILEURL="file:/" ;; + CYGWIN* ) + PS=";" + FS="/" + FILEURL="file:/" + ;; * ) echo "Unrecognized system!" exit 1; ;; esac -TEST_CLASSPATH=.:$TESTCLASSES +TEST_CLASSPATH=.$PS$TESTCLASSES cp -r ${TESTSRC}${FS}* . ${TESTJAVA}${FS}bin${FS}javac testPkg${FS}*java ${TESTJAVA}${FS}bin${FS}javac -cp $TEST_CLASSPATH readTest.java @@ -62,8 +67,16 @@ sleep 3 cd .. +case "$OS" in + CYGWIN* ) + CODEBASE=`cygpath -w $PWD` + ;; + * ) + CODEBASE=`pwd` + ;; +esac # trailing / after code base is important for rmi codebase property. -${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} -cp $TEST_CLASSPATH -Djava.rmi.server.codebase=${FILEURL}`pwd`/ readTest > OUT.TXT 2>&1 & +${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} -cp $TEST_CLASSPATH -Djava.rmi.server.codebase=${FILEURL}$CODEBASE/ readTest > OUT.TXT 2>&1 & TEST_PID=$! #bulk of testcase - let it run for a while sleep 5