*** old/test/sun/tools/jmap/Basic.sh	Tue Sep 20 21:32:35 2011
--- new/test/sun/tools/jmap/Basic.sh	Tue Sep 20 21:32:30 2011

*** 1,9 ****
--- 1,9 ----
  #!/bin/sh
  
  #
! # Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
! # Copyright (c) 2005, 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.

*** 43,61 ****
--- 43,61 ----
  set +e
  
  failed=0
  
  # -histo[:live] option
! ${JMAP} -J-XX:+UsePerfData -histo $appJavaPid
  if [ $? != 0 ]; then failed=1; fi
  
! ${JMAP} -J-XX:+UsePerfData -histo:live $appJavaPid
  if [ $? != 0 ]; then failed=1; fi
  
  # -dump option
  DUMPFILE="java_pid${appJavaPid}.hprof"
! ${JMAP} -J-XX:+UsePerfData -dump:format=b,file=${DUMPFILE} $appJavaPid
  if [ $? != 0 ]; then failed=1; fi
  
  # check that heap dump is parsable
  ${JHAT} -parseonly true ${DUMPFILE}
  if [ $? != 0 ]; then failed=1; fi

*** 62,72 ****
--- 62,72 ----
  
  # dump file is large so remove it
  rm ${DUMPFILE}
  
  # -dump:live option
! ${JMAP} -J-XX:+UsePerfData -dump:live,format=b,file=${DUMPFILE} $appJavaPid
  if [ $? != 0 ]; then failed=1; fi
  
  # check that heap dump is parsable
  ${JHAT} -parseonly true ${DUMPFILE}
  if [ $? != 0 ]; then failed=1; fi