From 3d3513e6b0495b16a67532fcd5686fdf3592bb67 Mon Sep 17 00:00:00 2001
From: mchung <unknown>
Date: Tue, 31 Aug 2010 09:15:34 -0700
Subject: [PATCH] 6981005: TEST BUG: java/lang/ClassLoader/TestCrossDelegate.sh
 timeout on windows Summary: Increase timeout value Reviewed-by: alanb

---
 test/ProblemList.txt                            |  3 ---
 .../ClassLoader/deadlock/TestCrossDelegate.sh   | 17 +++++++++++------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/test/ProblemList.txt b/test/ProblemList.txt
index ab70ed9de..831b3a190 100644
--- a/test/ProblemList.txt
+++ b/test/ProblemList.txt
@@ -201,9 +201,6 @@ java/lang/ThreadLocal/MemoryLeak.java			 	solaris-all
 # 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
diff --git a/test/java/lang/ClassLoader/deadlock/TestCrossDelegate.sh b/test/java/lang/ClassLoader/deadlock/TestCrossDelegate.sh
index 71e07441c..1c7d56574 100644
--- a/test/java/lang/ClassLoader/deadlock/TestCrossDelegate.sh
+++ b/test/java/lang/ClassLoader/deadlock/TestCrossDelegate.sh
@@ -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 @@ if [ "${TESTJAVA}" = "" ] ; then
     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 @@ case "$OS" in
   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} \
-- 
GitLab