Merge

Thu, 08 Aug 2013 20:13:45 -0700

author
minqi
date
Thu, 08 Aug 2013 20:13:45 -0700
changeset 5503
6222a021d582
parent 5501
c661fa2e5189
parent 5502
57ac7245594c
child 5504
98aa538fd97e
child 5505
ed7c17e7d45b

Merge

     1.1 --- a/test/runtime/7107135/Test7107135.sh	Thu Aug 08 14:45:56 2013 -0700
     1.2 +++ b/test/runtime/7107135/Test7107135.sh	Thu Aug 08 20:13:45 2013 -0700
     1.3 @@ -53,9 +53,6 @@
     1.4      fi
     1.5      ;;
     1.6    *)
     1.7 -    NULL=NUL
     1.8 -    PS=";"
     1.9 -    FS="\\"
    1.10      echo "Test passed; only valid for Linux"
    1.11      exit 0;
    1.12      ;;
    1.13 @@ -87,14 +84,16 @@
    1.14  
    1.15  echo
    1.16  echo Test changing of stack protection:
    1.17 -echo ${TESTJAVA}${FS}bin${FS}java -cp ${THIS_DIR} Test test-rw
    1.18 +echo ${TESTJAVA}${FS}bin${FS}java -cp ${THIS_DIR} Test test-rwx
    1.19  ${TESTJAVA}${FS}bin${FS}java -cp ${THIS_DIR} Test test-rwx
    1.20 +JAVA_RETVAL=$?
    1.21  
    1.22 -if [ "$?" == "0" ]
    1.23 +if [ "$JAVA_RETVAL" == "0" ]
    1.24  then
    1.25    echo
    1.26    echo ${TESTJAVA}${FS}bin${FS}java -cp ${THIS_DIR} TestMT test-rwx
    1.27    ${TESTJAVA}${FS}bin${FS}java -cp ${THIS_DIR} TestMT test-rwx
    1.28 +  JAVA_RETVAL=$?
    1.29  fi
    1.30  
    1.31 -exit $?
    1.32 +exit $JAVA_RETVAL

mercurial