1.1 --- a/test/runtime/6878713/Test6878713.sh Sat Mar 23 14:59:02 2013 -0400
1.2 +++ b/test/runtime/6878713/Test6878713.sh Wed Mar 27 09:49:51 2013 -0700
1.3 @@ -6,57 +6,17 @@
1.4 ## @summary Verifier heap corruption, relating to backward jsrs
1.5 ## @run shell/timeout=120 Test6878713.sh
1.6 ##
1.7 +## some tests require path to find test source dir
1.8 +if [ "${TESTSRC}" = "" ]
1.9 +then
1.10 + TESTSRC=${PWD}
1.11 + echo "TESTSRC not set. Using "${TESTSRC}" as default"
1.12 +fi
1.13 +echo "TESTSRC=${TESTSRC}"
1.14 +## Adding common setup Variables for running shell tests.
1.15 +. ${TESTSRC}/../../test_env.sh
1.16
1.17 -if [ "${TESTSRC}" = "" ]
1.18 -then TESTSRC=.
1.19 -fi
1.20 -
1.21 -if [ "${TESTJAVA}" = "" ]
1.22 -then
1.23 - PARENT=`dirname \`which java\``
1.24 - TESTJAVA=`dirname ${PARENT}`
1.25 - echo "TESTJAVA not set, selecting " ${TESTJAVA}
1.26 - echo "If this is incorrect, try setting the variable manually."
1.27 -fi
1.28 -
1.29 -if [ "${TESTCLASSES}" = "" ]
1.30 -then
1.31 - echo "TESTCLASSES not set. Test cannot execute. Failed."
1.32 - exit 1
1.33 -fi
1.34 -
1.35 -# set platform-dependent variables
1.36 -OS=`uname -s`
1.37 -case "$OS" in
1.38 - SunOS | Linux | Darwin )
1.39 - NULL=/dev/null
1.40 - PS=":"
1.41 - FS="/"
1.42 - ;;
1.43 - Windows_* )
1.44 - NULL=NUL
1.45 - PS=";"
1.46 - FS="\\"
1.47 - ;;
1.48 - CYGWIN_* )
1.49 - NULL=/dev/null
1.50 - PS=";"
1.51 - FS="/"
1.52 - ;;
1.53 - * )
1.54 - echo "Unrecognized system!"
1.55 - exit 1;
1.56 - ;;
1.57 -esac
1.58 -
1.59 -JEMMYPATH=${CPAPPEND}
1.60 -CLASSPATH=.${PS}${TESTCLASSES}${PS}${JEMMYPATH} ; export CLASSPATH
1.61 -
1.62 -THIS_DIR=`pwd`
1.63 -
1.64 -${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} -version
1.65 -
1.66 -${TESTJAVA}${FS}bin${FS}jar xvf ${TESTSRC}${FS}testcase.jar
1.67 +${COMPILEJAVA}${FS}bin${FS}jar xvf ${TESTSRC}${FS}testcase.jar
1.68
1.69 ${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} OOMCrashClass1960_2 > test.out 2>&1
1.70
