# HG changeset patch
# User minqi
# Date 1376018025 25200
# Node ID 205af4cce7fd00778f879d0f75fb7b2c88911d1b
# Parent  2bd33030dd6d874cd60bd05eb823f0268a7ca9e0# Parent  96095ec2872b966f1d541d2cac4d1f12b8497c80
Merge

diff -r 2bd33030dd6d -r 205af4cce7fd hotspot/test/runtime/7107135/Test7107135.sh
--- a/hotspot/test/runtime/7107135/Test7107135.sh	Thu Aug 08 14:45:56 2013 -0700
+++ b/hotspot/test/runtime/7107135/Test7107135.sh	Thu Aug 08 20:13:45 2013 -0700
@@ -53,9 +53,6 @@
     fi
     ;;
   *)
-    NULL=NUL
-    PS=";"
-    FS="\\"
     echo "Test passed; only valid for Linux"
     exit 0;
     ;;
@@ -87,14 +84,16 @@
 
 echo
 echo Test changing of stack protection:
-echo ${TESTJAVA}${FS}bin${FS}java -cp ${THIS_DIR} Test test-rw
+echo ${TESTJAVA}${FS}bin${FS}java -cp ${THIS_DIR} Test test-rwx
 ${TESTJAVA}${FS}bin${FS}java -cp ${THIS_DIR} Test test-rwx
+JAVA_RETVAL=$?
 
-if [ "$?" == "0" ]
+if [ "$JAVA_RETVAL" == "0" ]
 then
   echo
   echo ${TESTJAVA}${FS}bin${FS}java -cp ${THIS_DIR} TestMT test-rwx
   ${TESTJAVA}${FS}bin${FS}java -cp ${THIS_DIR} TestMT test-rwx
+  JAVA_RETVAL=$?
 fi
 
-exit $?
+exit $JAVA_RETVAL