# HG changeset patch
# User zgu
# Date 1343862973 25200
# Node ID 8e69438de9c69af07cb01f59ddfa868ccb6415d3
# Parent  6acee021f5ac07c114f47ac2469b9d3ce494e17e# Parent  b27675afea119dcf9d7da99be78d4c5f6324b35d
Merge

diff -r b27675afea11 -r 8e69438de9c6 test/compiler/6894807/Test6894807.sh
--- a/test/compiler/6894807/Test6894807.sh	Wed Aug 01 15:00:50 2012 -0700
+++ b/test/compiler/6894807/Test6894807.sh	Wed Aug 01 16:16:13 2012 -0700
@@ -21,7 +21,7 @@
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux )
+  SunOS | Linux | Darwin )
     NULL=/dev/null
     PS=":"
     FS="/"
diff -r b27675afea11 -r 8e69438de9c6 test/gc/6941923/test6941923.sh
--- a/test/gc/6941923/test6941923.sh	Wed Aug 01 15:00:50 2012 -0700
+++ b/test/gc/6941923/test6941923.sh	Wed Aug 01 16:16:13 2012 -0700
@@ -9,7 +9,7 @@
 ## skip on windows
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux )
+  SunOS | Linux | Darwin )
     NULL=/dev/null
     PS=":"
     FS="/"
diff -r b27675afea11 -r 8e69438de9c6 test/runtime/6626217/Test6626217.sh
--- a/test/runtime/6626217/Test6626217.sh	Wed Aug 01 15:00:50 2012 -0700
+++ b/test/runtime/6626217/Test6626217.sh	Wed Aug 01 16:16:13 2012 -0700
@@ -49,7 +49,7 @@
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux )
+  SunOS | Linux | Darwin )
     NULL=/dev/null
     PS=":"
     FS="/"
diff -r b27675afea11 -r 8e69438de9c6 test/runtime/6878713/Test6878713.sh
--- a/test/runtime/6878713/Test6878713.sh	Wed Aug 01 15:00:50 2012 -0700
+++ b/test/runtime/6878713/Test6878713.sh	Wed Aug 01 16:16:13 2012 -0700
@@ -28,7 +28,7 @@
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux )
+  SunOS | Linux | Darwin )
     NULL=/dev/null
     PS=":"
     FS="/"
diff -r b27675afea11 -r 8e69438de9c6 test/runtime/6929067/Test6929067.sh
--- a/test/runtime/6929067/Test6929067.sh	Wed Aug 01 15:00:50 2012 -0700
+++ b/test/runtime/6929067/Test6929067.sh	Wed Aug 01 16:16:13 2012 -0700
@@ -27,17 +27,10 @@
     PS=":"
     FS="/"
     ;;
-  SunOS | Windows_* | *BSD)
-    NULL=NUL
-    PS=";"
-    FS="\\"
+  * )
     echo "Test passed; only valid for Linux"
     exit 0;
     ;;
-  * )
-    echo "Unrecognized system!"
-    exit 1;
-    ;;
 esac
 
 # Choose arch: i386 or amd64 (test is Linux-specific)
diff -r b27675afea11 -r 8e69438de9c6 test/runtime/7051189/Xchecksig.sh
--- a/test/runtime/7051189/Xchecksig.sh	Wed Aug 01 15:00:50 2012 -0700
+++ b/test/runtime/7051189/Xchecksig.sh	Wed Aug 01 16:16:13 2012 -0700
@@ -43,7 +43,7 @@
 
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux )
+  SunOS | Linux | Darwin )
     FS="/"
     ;;
   Windows_* )
diff -r b27675afea11 -r 8e69438de9c6 test/runtime/7110720/Test7110720.sh
--- a/test/runtime/7110720/Test7110720.sh	Wed Aug 01 15:00:50 2012 -0700
+++ b/test/runtime/7110720/Test7110720.sh	Wed Aug 01 16:16:13 2012 -0700
@@ -37,7 +37,7 @@
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux )
+  SunOS | Linux | Darwin )
     FS="/"
     RM=/bin/rm
     CP=/bin/cp
diff -r b27675afea11 -r 8e69438de9c6 test/runtime/7158800/Test7158800.sh
--- a/test/runtime/7158800/Test7158800.sh	Wed Aug 01 15:00:50 2012 -0700
+++ b/test/runtime/7158800/Test7158800.sh	Wed Aug 01 16:16:13 2012 -0700
@@ -46,7 +46,7 @@
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux )
+  SunOS | Linux | Darwin )
     NULL=/dev/null
     PS=":"
     FS="/"
@@ -67,13 +67,13 @@
 
 THIS_DIR=`pwd`
 
-${TESTJAVA}${FS}bin${FS}java -fullversion
+${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} -fullversion
 
 ${TESTJAVA}${FS}bin${FS}javac -d . ${TESTSRC}${FS}InternTest.java
 
 cp ${TESTSRC}${FS}badstrings.txt .
 
-${TESTJAVA}${FS}bin${FS}java -XX:+PrintStringTableStatistics -XX:+TraceSafepointCleanupTime InternTest bad > test.out 2>&1 &
+${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} -XX:+PrintStringTableStatistics -XX:+TraceSafepointCleanupTime InternTest bad > test.out 2>&1 &
 C_PID=$!
 
 sleep 60
diff -r b27675afea11 -r 8e69438de9c6 test/runtime/7158988/TestFieldMonitor.sh
--- a/test/runtime/7158988/TestFieldMonitor.sh	Wed Aug 01 15:00:50 2012 -0700
+++ b/test/runtime/7158988/TestFieldMonitor.sh	Wed Aug 01 16:16:13 2012 -0700
@@ -21,7 +21,7 @@
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux )
+  SunOS | Linux | Darwin)
     NULL=/dev/null
     PS=":"
     FS="/"
@@ -52,30 +52,7 @@
 
 ${TESTJAVA}${FS}bin${FS}javac -classpath .${PS}$TESTJAVA${FS}lib${FS}tools.jar *.java
 
-${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} -classpath .${PS}$TESTJAVA${FS}lib${FS}tools.jar FieldMonitor > test.out 2>&1 &
-
-P_PID=$!
-
-sleep 60
-STATUS=0
-
-case "$OS" in
-    SunOS | Linux )
-        ps -ef | grep $P_PID | grep -v grep > ${NULL}
-        if [ $? = 0 ]; then
-            kill -9 $P_PID
-            STATUS=1
-        fi
-        ;;
-      * )
-        ps | grep -i "FieldMonitor" | grep -v grep > ${NULL}
-        if [ $? = 0 ]; then
-            C_PID=`ps | grep -i "FieldMonitor" | awk '{print $1}'`
-            kill -s 9 $C_PID
-            STATUS=1
-        fi
-        ;;
-esac
+${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} -classpath .${PS}$TESTJAVA${FS}lib${FS}tools.jar FieldMonitor > test.out
 
 grep "A fatal error has been detected" test.out > ${NULL}
 if [ $? = 0 ]; then