test/sun/security/validator/samedn.sh

*** 31,40 ****
--- 31,41 ----
    TESTSRC="."
  fi
  if [ "${TESTJAVA}" = "" ] ; then
    JAVAC_CMD=`which javac`
    TESTJAVA=`dirname $JAVAC_CMD`/..
+   COMPILEJAVA="${TESTJAVA}"
  fi
  
  # set platform-dependent variables
  OS=`uname -s`
  case "$OS" in
*** 46,56 ****
      ;;
  esac
  
  KT="$TESTJAVA${FS}bin${FS}keytool -storepass changeit \
      -keypass changeit -keystore samedn.jks"
! JAVAC=$TESTJAVA${FS}bin${FS}javac
  JAVA=$TESTJAVA${FS}bin${FS}java
  
  rm -rf samedn.jks 2> /dev/null
  
  # 1. Generate 3 aliases in a keystore: ca1, ca2, user. The CAs' startdate
--- 47,57 ----
      ;;
  esac
  
  KT="$TESTJAVA${FS}bin${FS}keytool -storepass changeit \
      -keypass changeit -keystore samedn.jks"
! JAVAC=$COMPILEJAVA${FS}bin${FS}javac
  JAVA=$TESTJAVA${FS}bin${FS}java
  
  rm -rf samedn.jks 2> /dev/null
  
  # 1. Generate 3 aliases in a keystore: ca1, ca2, user. The CAs' startdate
*** 75,82 ****
  $KT -delete -alias user
  
  # 5. Build and run test. Make sure the CA certs are ignored for validity check.
  # Check both, one of them might be dropped out of map in old codes.
  
! $JAVAC -d . ${TESTSRC}${FS}CertReplace.java
  $JAVA ${TESTVMOPTS} CertReplace samedn.jks samedn1.certs || exit 1
  $JAVA ${TESTVMOPTS} CertReplace samedn.jks samedn2.certs || exit 2
--- 76,83 ----
  $KT -delete -alias user
  
  # 5. Build and run test. Make sure the CA certs are ignored for validity check.
  # Check both, one of them might be dropped out of map in old codes.
  
! $JAVAC ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} -d . ${TESTSRC}${FS}CertReplace.java
  $JAVA ${TESTVMOPTS} CertReplace samedn.jks samedn1.certs || exit 1
  $JAVA ${TESTVMOPTS} CertReplace samedn.jks samedn2.certs || exit 2