test/java/lang/ClassLoader/deadlock/TestCrossDelegate.sh

*** 40,49 ****
--- 40,53 ----
      echo "TESTJAVA not set.  Test cannot execute."
      echo "FAILED!!!"
      exit 1
  fi
  
+ if [ "${COMPILEJAVA}" = "" ] ; then
+     COMPILEJAVA="${TESTJAVA}"
+ fi
+ 
  # set platform-specific variables
  OS=`uname -s`
  case "$OS" in
    SunOS )
      FS="/"
*** 67,88 ****
  echo TESTCLASSES=${TESTCLASSES}
  echo TESTJAVA=${TESTJAVA}
  echo ""
  
  # compile test
! ${TESTJAVA}${FS}bin${FS}javac \
          -d ${TESTCLASSES} \
          ${TESTSRC}${FS}Starter.java ${TESTSRC}${FS}DelegatingLoader.java
  
  STATUS=$?
  if [ ${STATUS} -ne 0 ]
  then
      exit ${STATUS}
  fi
  
  # set up test
! ${TESTJAVA}${FS}bin${FS}javac \
          -d ${TESTCLASSES}${FS} \
          ${TESTSRC}${FS}Alice.java ${TESTSRC}${FS}SupBob.java \
          ${TESTSRC}${FS}Bob.java ${TESTSRC}${FS}SupAlice.java
  
  cd ${TESTCLASSES}
--- 71,92 ----
  echo TESTCLASSES=${TESTCLASSES}
  echo TESTJAVA=${TESTJAVA}
  echo ""
  
  # compile test
! ${COMPILEJAVA}${FS}bin${FS}javac ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} \
          -d ${TESTCLASSES} \
          ${TESTSRC}${FS}Starter.java ${TESTSRC}${FS}DelegatingLoader.java
  
  STATUS=$?
  if [ ${STATUS} -ne 0 ]
  then
      exit ${STATUS}
  fi
  
  # set up test
! ${COMPILEJAVA}${FS}bin${FS}javac ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} \
          -d ${TESTCLASSES}${FS} \
          ${TESTSRC}${FS}Alice.java ${TESTSRC}${FS}SupBob.java \
          ${TESTSRC}${FS}Bob.java ${TESTSRC}${FS}SupAlice.java
  
  cd ${TESTCLASSES}