1.1 --- a/test/compiler/7068051/Test7068051.sh Sat Mar 23 14:59:02 2013 -0400
1.2 +++ b/test/compiler/7068051/Test7068051.sh Wed Mar 27 09:49:51 2013 -0700
1.3 @@ -22,28 +22,24 @@
1.4 # questions.
1.5 #
1.6 #
1.7 -
1.8 +## some tests require path to find test source dir
1.9 if [ "${TESTSRC}" = "" ]
1.10 then
1.11 - echo "TESTSRC not set. Test cannot execute. Failed."
1.12 - exit 1
1.13 + TESTSRC=${PWD}
1.14 + echo "TESTSRC not set. Using "${TESTSRC}" as default"
1.15 fi
1.16 echo "TESTSRC=${TESTSRC}"
1.17 -if [ "${TESTJAVA}" = "" ]
1.18 -then
1.19 - echo "TESTJAVA not set. Test cannot execute. Failed."
1.20 - exit 1
1.21 -fi
1.22 -echo "TESTJAVA=${TESTJAVA}"
1.23 +## Adding common setup Variables for running shell tests.
1.24 +. ${TESTSRC}/../../test_env.sh
1.25
1.26 set -x
1.27
1.28 -${TESTJAVA}/bin/jar xf ${TESTJAVA}/jre/lib/javaws.jar
1.29 -${TESTJAVA}/bin/jar cf foo.jar *
1.30 +${COMPILEJAVA}/bin/jar xf ${COMPILEJAVA}/jre/lib/javaws.jar
1.31 +${COMPILEJAVA}/bin/jar cf foo.jar *
1.32 cp ${TESTSRC}/Test7068051.java ./
1.33 -${TESTJAVA}/bin/jar -uf0 foo.jar Test7068051.java
1.34 +${COMPILEJAVA}/bin/jar -uf0 foo.jar Test7068051.java
1.35
1.36 -${TESTJAVA}/bin/javac -d . Test7068051.java
1.37 +${COMPILEJAVA}/bin/javac ${TESTJAVACOPTS} -d . Test7068051.java
1.38
1.39 ${TESTJAVA}/bin/java ${TESTVMOPTS} -showversion -Xbatch Test7068051 foo.jar
1.40
