--- a/jdk/test/ProblemList.txt	Mon Aug 30 14:37:43 2010 +0800
+++ b/jdk/test/ProblemList.txt	Tue Aug 31 09:15:34 2010 -0700
@@ -201,9 +201,6 @@
 # Windows X64, RuntimeException: MyThread expected to have RUNNABLE but got WAITING
 java/lang/Thread/ThreadStateTest.java				generic-all
 
-# Timeout on windows 64bit 
-java/lang/ClassLoader/deadlock/TestCrossDelegate.sh		generic-all
-
 ############################################################################
 
 # jdk_management

--- a/jdk/test/java/lang/ClassLoader/deadlock/TestCrossDelegate.sh	Mon Aug 30 14:37:43 2010 +0800
+++ b/jdk/test/java/lang/ClassLoader/deadlock/TestCrossDelegate.sh	Tue Aug 31 09:15:34 2010 -0700
@@ -25,7 +25,7 @@
 # @summary (cl) ClassLoader.loadClass locks all instances in chain 
 #          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 [ "${TESTSRC}" = "" ] ; then
@@ -41,10 +41,6 @@
     echo "FAILED!!!"
     exit 1
 fi
-echo TESTSRC=${TESTSRC}
-echo TESTCLASSES=${TESTCLASSES}
-echo TESTJAVA=${TESTJAVA}
-echo ""
 
 # set platform-specific variables
 OS=`uname -s`
@@ -55,11 +51,20 @@
   Linux )
     FS="/"
     ;;
-  Windows* | CYGWIN* )
+  Windows*)
     FS="\\"
     ;;
+  CYGWIN* )
+    FS="\\"
+    TESTCLASSES=`/usr/bin/cygpath -a -s -m ${TESTCLASSES}`
+    ;;
 esac
 
+echo TESTSRC=${TESTSRC}
+echo TESTCLASSES=${TESTCLASSES}
+echo TESTJAVA=${TESTJAVA}
+echo ""
+
 # compile test
 ${TESTJAVA}${FS}bin${FS}javac \
         -d ${TESTCLASSES} \