test/sun/tools/jstatd/jstatdExternalRegistry.sh

*** 42,52 ****
  JSTATD="${TESTJAVA}/bin/jstatd"
  JPS="${TESTJAVA}/bin/jps"
  JSTAT="${TESTJAVA}/bin/jstat"
  
  HOSTNAME=`uname -n`
! PORT=2099
  
  RMIREGISTRY_OUT="rmiregistry_$$.out"
  JSTATD_OUT="jstatd_$$.out"
  
  ${RMIREGISTRY} ${PORT} > ${RMIREGISTRY_OUT} 2>&1 &
--- 42,56 ----
  JSTATD="${TESTJAVA}/bin/jstatd"
  JPS="${TESTJAVA}/bin/jps"
  JSTAT="${TESTJAVA}/bin/jstat"
  
  HOSTNAME=`uname -n`
! PORT=`freePort`
! if [ "${PORT}" = "0" ] ; then
!   echo "Cannot get free port"
!   exit 1
! fi
  
  RMIREGISTRY_OUT="rmiregistry_$$.out"
  JSTATD_OUT="jstatd_$$.out"
  
  ${RMIREGISTRY} ${PORT} > ${RMIREGISTRY_OUT} 2>&1 &
*** 67,82 ****
  then
      echo "Output of jps differs from expected output. Failed."
      exit 1
  fi
  
! # get the process id for the target app (jstatd). note, don't rely
! # on JSTATD_PID as mks interposes a shell when starting a process in
! # the background
! TARGET_PID=`${JPS} | grep "Jstatd" | cut -d" " -f1`
! 
! ${JSTAT} -gcutil ${TARGET_PID}@${HOSTNAME}:${PORT} 250 5 2>&1 | awk -f ${TESTSRC}/jstatGcutilOutput1.awk
  RC=$?
  
  if [ ${RC} -ne 0 ]
  then
      echo "jstat output differs from expected output"
--- 71,81 ----
  then
      echo "Output of jps differs from expected output. Failed."
      exit 1
  fi
  
! ${JSTAT} -gcutil ${JSTATD_PID}@${HOSTNAME}:${PORT} 250 5 2>&1 | awk -f ${TESTSRC}/jstatGcutilOutput1.awk
  RC=$?
  
  if [ ${RC} -ne 0 ]
  then
      echo "jstat output differs from expected output"