test/java/io/Serializable/packageAccess/run.sh

*** 31,49 ****
  then
          echo "TESTJAVA not set.  Test cannot execute.  Failed."
  exit 1
  fi
  
  if [ "${TESTSRC}" = "" ]
  then
          TESTSRC="."
  fi
  
  set -ex
  
! ${TESTJAVA}/bin/javac -d . ${TESTSRC}/A.java ${TESTSRC}/B.java \
!     ${TESTSRC}/C.java ${TESTSRC}/D.java ${TESTSRC}/Test.java
! ${TESTJAVA}/bin/jar cf foo.jar B.class D.class
  rm -f B.class D.class
  
  ${TESTJAVA}/bin/java ${TESTVMOPTS} Test
  rm -f *.class *.jar
--- 31,54 ----
  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
  
! ${COMPILEJAVA}/bin/javac ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} -d . \
!     ${TESTSRC}/A.java ${TESTSRC}/B.java ${TESTSRC}/C.java ${TESTSRC}/D.java \
!     ${TESTSRC}/Test.java
! ${COMPILEJAVA}/bin/jar ${TESTTOOLVMOPTS} cf foo.jar B.class D.class
  rm -f B.class D.class
  
  ${TESTJAVA}/bin/java ${TESTVMOPTS} Test
  rm -f *.class *.jar