test/sun/security/tools/keytool/autotest.sh

@@ -38,10 +38,13 @@
 if [ "${TESTJAVA}" = "" ] ; then
   echo "TESTJAVA not set.  Test cannot execute."
   echo "FAILED!!!"
   exit 1
 fi
+if [ "${COMPILEJAVA}" = "" ]; then
+  COMPILEJAVA="${TESTJAVA}"
+fi
 
 find_one() {
   for TARGET_FILE in $@; do
     if [ -e "$TARGET_FILE" ]; then
       echo $TARGET_FILE

@@ -80,11 +83,11 @@
 if [ "$LIBNAME" = "" ]; then
   echo "Cannot find libsoftokn3.so"
   exit 1
 fi
 
-${TESTJAVA}${FS}bin${FS}javac -d . -XDignore.symbol.file \
+${COMPILEJAVA}${FS}bin${FS}javac ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} -d . -XDignore.symbol.file \
         ${TESTSRC}${FS}KeyToolTest.java || exit 10
 
 NSS=${TESTSRC}${FS}..${FS}..${FS}pkcs11${FS}nss
 
 cp ${TESTSRC}${FS}p11-nss.txt .