提交 3d3513e6 编写于 作者: M mchung

6981005: TEST BUG: java/lang/ClassLoader/TestCrossDelegate.sh timeout on windows

Summary: Increase timeout value
Reviewed-by: alanb
上级 a748f118
...@@ -201,9 +201,6 @@ java/lang/ThreadLocal/MemoryLeak.java solaris-all ...@@ -201,9 +201,6 @@ java/lang/ThreadLocal/MemoryLeak.java solaris-all
# Windows X64, RuntimeException: MyThread expected to have RUNNABLE but got WAITING # Windows X64, RuntimeException: MyThread expected to have RUNNABLE but got WAITING
java/lang/Thread/ThreadStateTest.java generic-all java/lang/Thread/ThreadStateTest.java generic-all
# Timeout on windows 64bit
java/lang/ClassLoader/deadlock/TestCrossDelegate.sh generic-all
############################################################################ ############################################################################
# jdk_management # jdk_management
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
# @summary (cl) ClassLoader.loadClass locks all instances in chain # @summary (cl) ClassLoader.loadClass locks all instances in chain
# when delegating # when delegating
# #
# @run shell/timeout=10 TestCrossDelegate.sh # @run shell/timeout=300 TestCrossDelegate.sh
# if running by hand on windows, change TESTSRC and TESTCLASSES to "." # if running by hand on windows, change TESTSRC and TESTCLASSES to "."
if [ "${TESTSRC}" = "" ] ; then if [ "${TESTSRC}" = "" ] ; then
...@@ -41,10 +41,6 @@ if [ "${TESTJAVA}" = "" ] ; then ...@@ -41,10 +41,6 @@ if [ "${TESTJAVA}" = "" ] ; then
echo "FAILED!!!" echo "FAILED!!!"
exit 1 exit 1
fi fi
echo TESTSRC=${TESTSRC}
echo TESTCLASSES=${TESTCLASSES}
echo TESTJAVA=${TESTJAVA}
echo ""
# set platform-specific variables # set platform-specific variables
OS=`uname -s` OS=`uname -s`
...@@ -55,11 +51,20 @@ case "$OS" in ...@@ -55,11 +51,20 @@ case "$OS" in
Linux ) Linux )
FS="/" FS="/"
;; ;;
Windows* | CYGWIN* ) Windows*)
FS="\\"
;;
CYGWIN* )
FS="\\" FS="\\"
TESTCLASSES=`/usr/bin/cygpath -a -s -m ${TESTCLASSES}`
;; ;;
esac esac
echo TESTSRC=${TESTSRC}
echo TESTCLASSES=${TESTCLASSES}
echo TESTJAVA=${TESTJAVA}
echo ""
# compile test # compile test
${TESTJAVA}${FS}bin${FS}javac \ ${TESTJAVA}${FS}bin${FS}javac \
-d ${TESTCLASSES} \ -d ${TESTCLASSES} \
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册