test/tools/javac/versions/check.sh

changeset 838
22a040cbf0e0
parent 554
9d9f26857129
child 962
0ff2bbd38f10
     1.1 --- a/test/tools/javac/versions/check.sh	Mon Jan 24 16:17:33 2011 -0800
     1.2 +++ b/test/tools/javac/versions/check.sh	Mon Jan 24 16:34:25 2011 -0800
     1.3 @@ -32,7 +32,7 @@
     1.4  
     1.5  J="$TESTJAVA/bin/java" 
     1.6  JC="$TESTJAVA/bin/javac" 
     1.7 -CFV="$J ${TESTVMOPTS} -cp $TC CheckClassFileVersion"
     1.8 +CFV="${TESTVMOPTS} -cp $TC CheckClassFileVersion"
     1.9  
    1.10  rm -f $TC/X.java $TC/X.java
    1.11  echo 'public class X { }' > $TC/X.java
    1.12 @@ -44,7 +44,7 @@
    1.13  check() {
    1.14    V=$1; shift
    1.15    echo "+ javac $* [$V]"
    1.16 -  $JC ${TESTTOOLVMOPTS} -d $TC $* $TC/X.java && $CFV $TC/X.class $V || exit 2
    1.17 +  "$JC" ${TESTTOOLVMOPTS} -d $TC $* $TC/X.java && "$J" $CFV $TC/X.class $V || exit 2
    1.18  }
    1.19  
    1.20  check 48.0 -source 1.4
    1.21 @@ -73,7 +73,7 @@
    1.22  
    1.23  fail() {
    1.24    echo "+ javac $*"
    1.25 -  if $JC ${TESTTOOLVMOPTS} -d $TC $*; then
    1.26 +  if "$JC" ${TESTTOOLVMOPTS} -d $TC $*; then
    1.27      echo "-- did not fail as expected"
    1.28      exit 3
    1.29    else
    1.30 @@ -83,7 +83,7 @@
    1.31  
    1.32  pass() {
    1.33    echo "+ javac $*"
    1.34 -  if $JC ${TESTTOOLVMOPTS} -d $TC $*; then
    1.35 +  if "$JC" ${TESTTOOLVMOPTS} -d $TC $*; then
    1.36      echo "-- passed"
    1.37    else
    1.38      echo "-- failed"

mercurial