test/sun/security/pkcs11/KeyStore/Solaris.sh

*** 51,63 ****
--- 51,67 ----
  
  # if running by hand on windows, change this to appropriate value
  if [ "${TESTJAVA}" = "" ] ; then
      TESTJAVA="/net/radiant/export1/charlie/mustang/build/solaris-sparc"
  fi
+ if [ "${COMPILEJAVA}" = "" ]; then
+   COMPILEJAVA="${TESTJAVA}"
+ fi
  echo TESTSRC=${TESTSRC}
  echo TESTCLASSES=${TESTCLASSES}
  echo TESTJAVA=${TESTJAVA}
+ echo COMPILEJAVA=${COMPILEJAVA}
  echo ""
  
  # get command from input args -
  # default to 'solaris basic'
  
*** 131,141 ****
  # compile test
  
  if [ "${RECOMPILE}" = "yes" ] ; then
      cd ${TESTCLASSES}
      ${RM} *.class
!     ${TESTJAVA}${FS}bin${FS}javac \
          -classpath ${TESTSRC}${FS}..${PS}${TESTSRC}${FS}loader.jar \
          -d ${TESTCLASSES} \
          ${TESTSRC}${FS}Basic.java
  fi
  
--- 135,145 ----
  # compile test
  
  if [ "${RECOMPILE}" = "yes" ] ; then
      cd ${TESTCLASSES}
      ${RM} *.class
!     ${COMPILEJAVA}${FS}bin${FS}javac ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} \
          -classpath ${TESTSRC}${FS}..${PS}${TESTSRC}${FS}loader.jar \
          -d ${TESTCLASSES} \
          ${TESTSRC}${FS}Basic.java
  fi