test/java/lang/ClassLoader/Assert.sh

*** 33,42 ****
--- 33,46 ----
  then
    echo "TESTJAVA not set.  Test cannot execute.  Failed."
    exit 1
  fi
  echo "TESTJAVA=${TESTJAVA}"
+ if [ "${COMPILEJAVA}" = "" ]; then
+   COMPILEJAVA="${TESTJAVA}"
+ fi
+ echo "COMPILEJAVA=${COMPILEJAVA}"
  if [ "${TESTCLASSES}" = "" ]
  then
    echo "TESTCLASSES not set.  Test cannot execute.  Failed."
    exit 1
  fi
*** 45,55 ****
  
  cp ${TESTSRC}/Assert.java .
  cp -R ${TESTSRC}/package1 .
  cp -R ${TESTSRC}/package2 .
  
! ${TESTJAVA}/bin/javac Assert.java 
  
  ${TESTJAVA}/bin/java ${TESTVMOPTS} Assert
  
  result=$?
  if [ $result -eq 0 ]
--- 49,59 ----
  
  cp ${TESTSRC}/Assert.java .
  cp -R ${TESTSRC}/package1 .
  cp -R ${TESTSRC}/package2 .
  
! ${COMPILEJAVA}/bin/javac ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} Assert.java 
  
  ${TESTJAVA}/bin/java ${TESTVMOPTS} Assert
  
  result=$?
  if [ $result -eq 0 ]