diff -r 378aa3362868 -r 320a714614e9 jdk/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh
--- a/jdk/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh	Tue Mar 06 10:25:45 2012 +0800
+++ b/jdk/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh	Tue Mar 06 20:34:38 2012 +0000
@@ -54,6 +54,10 @@
     PATHSEP=":"
     FILESEP="/"
     ;;
+  Darwin )
+    PATHSEP=":"
+    FILESEP="/"
+    ;;
   CYGWIN* )
     PATHSEP=";"
     FILESEP="/"
@@ -75,17 +79,18 @@
 
 # compile the test program
 ${TESTJAVA}${FILESEP}bin${FILESEP}javac \
-	-d ${TESTCLASSES}${FILESEP} \
-	${TESTSRC}${FILESEP}ClassLoaderDeadlock.java
+        -d ${TESTCLASSES}${FILESEP} \
+        ${TESTSRC}${FILESEP}ClassLoaderDeadlock.java
 
 ${TESTJAVA}${FILESEP}bin${FILESEP}javac \
-	-d ${TESTCLASSES}${FILESEP}provider${FILESEP} \
-	${TESTSRC}${FILESEP}provider${FILESEP}HashProvider.java
+        -d ${TESTCLASSES}${FILESEP}provider${FILESEP} \
+        ${TESTSRC}${FILESEP}provider${FILESEP}HashProvider.java
 
 # run the test
 ${TESTJAVA}${FILESEP}bin${FILESEP}java \
-	-classpath "${TESTCLASSES}${PATHSEP}${TESTSRC}${FILESEP}Deadlock.jar" \
-	ClassLoaderDeadlock
+        -classpath "${TESTCLASSES}${PATHSEP}${TESTSRC}${FILESEP}Deadlock.jar" \
+	-Djava.awt.headless=true \
+        ClassLoaderDeadlock
 
 STATUS=$?