From 95b27154a11bf5d3712cbc31679d22ebaf9290f8 Mon Sep 17 00:00:00 2001
From: minqi <unknown>
Date: Thu, 8 Aug 2013 15:19:12 -0700
Subject: [PATCH] 8019583: [TESTBUG] runtime/7107135 always passes Summary: If
 java test return none zero, the value will be override by 'if' statement, the
 exit value will always '0' and pass. Fix by recording the result in a
 variable. Reviewed-by: coleenp, dholmes, iklam Contributed-by:
 yumin.qi@oracle.com

---
 test/runtime/7107135/Test7107135.sh | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/test/runtime/7107135/Test7107135.sh b/test/runtime/7107135/Test7107135.sh
index d8ccbad19..742c71c1c 100644
--- a/test/runtime/7107135/Test7107135.sh
+++ b/test/runtime/7107135/Test7107135.sh
@@ -53,9 +53,6 @@ case "$OS" in
     fi
     ;;
   *)
-    NULL=NUL
-    PS=";"
-    FS="\\"
     echo "Test passed; only valid for Linux"
     exit 0;
     ;;
@@ -87,14 +84,16 @@ ${TESTJAVA}${FS}bin${FS}java -cp ${THIS_DIR} Test test-rw
 
 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
-- 
GitLab