Mercurial > jdk8-mips64-public > langtools / changeset

     1.1 --- a/test/tools/javac/ClassPathTest/ClassPathTest.sh	Mon Jan 24 16:17:33 2011 -0800
     1.2 +++ b/test/tools/javac/ClassPathTest/ClassPathTest.sh	Mon Jan 24 16:34:25 2011 -0800
     1.3 @@ -100,7 +100,7 @@
     1.4  	expectedResult="$1"; shift
     1.5  	cleanup
     1.6  	echo $javac ${TESTTOOLVMOPTS} "$@"
     1.7 -	$javac ${TESTTOOLVMOPTS} "$@"
     1.8 +	"$javac" ${TESTTOOLVMOPTS} "$@"
     1.9  	report $expectedResult $?
    1.10  }
    1.11  

     2.1 --- a/test/tools/javac/ExtDirs/ExtDirs.sh	Mon Jan 24 16:17:33 2011 -0800
     2.2 +++ b/test/tools/javac/ExtDirs/ExtDirs.sh	Mon Jan 24 16:34:25 2011 -0800
     2.3 @@ -85,15 +85,15 @@
     2.4  done
     2.5  
     2.6  echo "Test 1"
     2.7 -$javac ${TESTTOOLVMOPTS} -d . -extdirs ext1 "${TESTSRC}${FS}ExtDirTest_1.java"
     2.8 +"$javac" ${TESTTOOLVMOPTS} -d . -extdirs ext1 "${TESTSRC}${FS}ExtDirTest_1.java"
     2.9  if [ $? -ne 0 ] ; then fail ; fi
    2.10  
    2.11  echo "Test 2"
    2.12 -$javac ${TESTTOOLVMOPTS} -d . -extdirs ext1${PS}ext2 "${TESTSRC}${FS}ExtDirTest_2.java"
    2.13 +"$javac" ${TESTTOOLVMOPTS} -d . -extdirs ext1${PS}ext2 "${TESTSRC}${FS}ExtDirTest_2.java"
    2.14  if [ $? -ne 0 ] ; then fail ; fi
    2.15  
    2.16  echo "Test 3"
    2.17 -$javac ${TESTTOOLVMOPTS} -d . -extdirs ext3 "${TESTSRC}${FS}ExtDirTest_3.java"
    2.18 +"$javac" ${TESTTOOLVMOPTS} -d . -extdirs ext3 "${TESTSRC}${FS}ExtDirTest_3.java"
    2.19  if [ $? -ne 0 ] ; then fail ; fi
    2.20  
    2.21  echo PASS: all tests gave expected results

     3.1 --- a/test/tools/javac/Paths/Help.sh	Mon Jan 24 16:17:33 2011 -0800
     3.2 +++ b/test/tools/javac/Paths/Help.sh	Mon Jan 24 16:34:25 2011 -0800
     3.3 @@ -40,8 +40,8 @@
     3.4  
     3.5  DiagnosticsInEnglishPlease
     3.6  
     3.7 -HELP="`$javac ${TESTTOOLVMOPTS} -help 2>&1`"
     3.8 -XHELP="`$javac ${TESTTOOLVMOPTS} -X 2>&1`"
     3.9 +HELP="`\"$javac\" ${TESTTOOLVMOPTS} -help 2>&1`"
    3.10 +XHELP="`\"$javac\" ${TESTTOOLVMOPTS} -X 2>&1`"
    3.11  
    3.12  #----------------------------------------------------------------
    3.13  # Standard options

     4.1 --- a/test/tools/javac/javazip/Test.sh	Mon Jan 24 16:17:33 2011 -0800
     4.2 +++ b/test/tools/javac/javazip/Test.sh	Mon Jan 24 16:34:25 2011 -0800
     4.3 @@ -66,8 +66,8 @@
     4.4      # clean old classes
     4.5      rm -f ${TC}${FS}*.class 
     4.6  
     4.7 -    echo "$*"
     4.8 -    if $* 2>&1 ; then
     4.9 +    echo "$@"
    4.10 +    if "$@" 2>&1 ; then
    4.11        actual=ok
    4.12      else
    4.13        actual=err

     5.1 --- a/test/tools/javac/versions/check.sh	Mon Jan 24 16:17:33 2011 -0800
     5.2 +++ b/test/tools/javac/versions/check.sh	Mon Jan 24 16:34:25 2011 -0800
     5.3 @@ -32,7 +32,7 @@
     5.4  
     5.5  J="$TESTJAVA/bin/java" 
     5.6  JC="$TESTJAVA/bin/javac" 
     5.7 -CFV="$J ${TESTVMOPTS} -cp $TC CheckClassFileVersion"
     5.8 +CFV="${TESTVMOPTS} -cp $TC CheckClassFileVersion"
     5.9  
    5.10  rm -f $TC/X.java $TC/X.java
    5.11  echo 'public class X { }' > $TC/X.java
    5.12 @@ -44,7 +44,7 @@
    5.13  check() {
    5.14    V=$1; shift
    5.15    echo "+ javac $* [$V]"
    5.16 -  $JC ${TESTTOOLVMOPTS} -d $TC $* $TC/X.java && $CFV $TC/X.class $V || exit 2
    5.17 +  "$JC" ${TESTTOOLVMOPTS} -d $TC $* $TC/X.java && "$J" $CFV $TC/X.class $V || exit 2
    5.18  }
    5.19  
    5.20  check 48.0 -source 1.4
    5.21 @@ -73,7 +73,7 @@
    5.22  
    5.23  fail() {
    5.24    echo "+ javac $*"
    5.25 -  if $JC ${TESTTOOLVMOPTS} -d $TC $*; then
    5.26 +  if "$JC" ${TESTTOOLVMOPTS} -d $TC $*; then
    5.27      echo "-- did not fail as expected"
    5.28      exit 3
    5.29    else
    5.30 @@ -83,7 +83,7 @@
    5.31  
    5.32  pass() {
    5.33    echo "+ javac $*"
    5.34 -  if $JC ${TESTTOOLVMOPTS} -d $TC $*; then
    5.35 +  if "$JC" ${TESTTOOLVMOPTS} -d $TC $*; then
    5.36      echo "-- passed"
    5.37    else
    5.38      echo "-- failed"