test/java/io/Serializable/resolveClass/consTest/run.sh

*** 30,48 ****
  then
          echo "TESTJAVA not set.  Test cannot execute.  Failed."
  exit 1
  fi
  
  if [ "${TESTSRC}" = "" ]
  then
          TESTSRC="."
  fi
  
  set -ex
  
  rm -f *.class *.jar
! ${TESTJAVA}/bin/javac -d . ${TESTSRC}/Boot.java
! ${TESTJAVA}/bin/jar cf boot.jar *.class
  rm -f *.class
! ${TESTJAVA}/bin/javac -classpath boot.jar -d . ${TESTSRC}/Test.java
  ${TESTJAVA}/bin/java ${TESTVMOPTS} -Xbootclasspath/a:boot.jar Test
  rm -f *.class *.jar
--- 30,53 ----
  then
      echo "TESTJAVA not set.  Test cannot execute.  Failed."
  exit 1
  fi
  
+ if [ "${COMPILEJAVA}" = "" ] ; then
+     COMPILEJAVA="${TESTJAVA}"
+ fi
+ 
  if [ "${TESTSRC}" = "" ]
  then
      TESTSRC="."
  fi
  
  set -ex
  
  rm -f *.class *.jar
! ${COMPILEJAVA}/bin/javac ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} -d . ${TESTSRC}/Boot.java
! ${COMPILEJAVA}/bin/jar ${TESTTOOLVMOPTS} cf boot.jar *.class
  rm -f *.class
! ${COMPILEJAVA}/bin/javac ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} -classpath boot.jar -d . \
!     ${TESTSRC}/Test.java
  ${TESTJAVA}/bin/java ${TESTVMOPTS} -Xbootclasspath/a:boot.jar Test
  rm -f *.class *.jar