*** old/test/sun/tools/jstatd/jstatdServerName.sh	Mon Sep 19 00:44:33 2011
--- new/test/sun/tools/jstatd/jstatdServerName.sh	Mon Sep 19 00:44:28 2011

*** 1,7 ****
--- 1,7 ----
  #
! # Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
! # Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  #
  # This code is free software; you can redistribute it and/or modify it
  # under the terms of the GNU General Public License version 2 only, as
  # published by the Free Software Foundation.

*** 52,104 ****
--- 52,104 ----
  SERVERNAME="SecondJstatdServer"
  
  JSTATD_1_OUT="jstatd_$$_1.out"
  JSTATD_2_OUT="jstatd_$$_2.out"
  
! ${JSTATD} -J-XX:+UsePerfData -J-Djava.security.policy=${TESTSRC}/all.policy -p ${PORT_1} 2>&1 > ${JSTATD_1_OUT} &
  JSTATD_1_PID=$!
  
  echo "first jstatd started as pid ${JSTATD_1_PID} on port ${PORT_1} with default server name"
  sleep 3
  
! ${JSTATD} -J-XX:+UsePerfData -J-Djava.security.policy=${TESTSRC}/all.policy -p ${PORT_2} -n ${SERVERNAME} 2>&1 > ${JSTATD_2_OUT} &
  JSTATD_2_PID=$!
  
  echo "second jstatd started as pid ${JSTATD_2_PID} on port ${PORT_2} with name ${SERVERNAME}"
  sleep 3
  
! echo "running: ${JPS} -J-XX:+UsePerfData ${HOSTNAME}:${PORT_1}"
! ${JPS} -J-XX:+UsePerfData ${HOSTNAME}:${PORT_1} 2>&1 | awk -f ${TESTSRC}/jpsOutput1.awk
  
  if [ $? -ne 0 ]
  then
      echo "Output of jps differs from expected output. Failed."
      cleanup
      exit 1
  fi
  
! echo "running: ${JPS} -J-XX:+UsePerfData ${HOSTNAME}:${PORT_2}/${SERVERNAME}"
! ${JPS} -J-XX:+UsePerfData ${HOSTNAME}:${PORT_2}/${SERVERNAME} 2>&1 | awk -f ${TESTSRC}/jpsOutput1.awk
  
  if [ $? -ne 0 ]
  then
      echo "Output of jps differs from expected output. Failed."
      cleanup
      exit 1
  fi
  
! echo "running: ${JSTAT} -J-XX:+UsePerfData -gcutil ${JSTATD_1_PID}@${HOSTNAME}:${PORT_1} 250 5"
! ${JSTAT} -J-XX:+UsePerfData -gcutil ${JSTATD_1_PID}@${HOSTNAME}:${PORT_1} 250 5 2>&1 | awk -f ${TESTSRC}/jstatGcutilOutput1.awk
  RC=$?
  
  if [ ${RC} -ne 0 ]
  then
      echo "jstat output differs from expected output"
  fi
  
! echo "running: ${JSTAT} -J-XX:+UsePerfData -gcutil ${JSTATD_1_PID}@${HOSTNAME}:${PORT_2}/${SERVERNAME} 250 5"
! ${JSTAT} -J-XX:+UsePerfData -gcutil ${JSTATD_1_PID}@${HOSTNAME}:${PORT_2}/${SERVERNAME} 250 5 2>&1 | awk -f ${TESTSRC}/jstatGcutilOutput1.awk
  RC=$?
  
  if [ ${RC} -ne 0 ]
  then
      echo "jstat output differs from expected output"