diff -r 73ab0b128918 -r 22a040cbf0e0 test/tools/javac/versions/check.sh --- a/test/tools/javac/versions/check.sh Mon Jan 24 16:17:33 2011 -0800 +++ b/test/tools/javac/versions/check.sh Mon Jan 24 16:34:25 2011 -0800 @@ -32,7 +32,7 @@ J="$TESTJAVA/bin/java" JC="$TESTJAVA/bin/javac" -CFV="$J ${TESTVMOPTS} -cp $TC CheckClassFileVersion" +CFV="${TESTVMOPTS} -cp $TC CheckClassFileVersion" rm -f $TC/X.java $TC/X.java echo 'public class X { }' > $TC/X.java @@ -44,7 +44,7 @@ check() { V=$1; shift echo "+ javac $* [$V]" - $JC ${TESTTOOLVMOPTS} -d $TC $* $TC/X.java && $CFV $TC/X.class $V || exit 2 + "$JC" ${TESTTOOLVMOPTS} -d $TC $* $TC/X.java && "$J" $CFV $TC/X.class $V || exit 2 } check 48.0 -source 1.4 @@ -73,7 +73,7 @@ fail() { echo "+ javac $*" - if $JC ${TESTTOOLVMOPTS} -d $TC $*; then + if "$JC" ${TESTTOOLVMOPTS} -d $TC $*; then echo "-- did not fail as expected" exit 3 else @@ -83,7 +83,7 @@ pass() { echo "+ javac $*" - if $JC ${TESTTOOLVMOPTS} -d $TC $*; then + if "$JC" ${TESTTOOLVMOPTS} -d $TC $*; then echo "-- passed" else echo "-- failed"