test/sun/tools/jinfo/Basic.sh

*** 1,9 ****
  #!/bin/sh
  
  #
! # Copyright (c) 2006, 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.
--- 1,9 ----
  #!/bin/sh
  
  #
! # Copyright (c) 2006, 2010, 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.
*** 33,87 ****
  # @run shell Basic.sh
  
  . ${TESTSRC}/../common/CommonSetup.sh
  . ${TESTSRC}/../common/ApplicationSetup.sh
  
! # Start application (send output to shutdown.port)
  PORTFILE="${TESTCLASSES}"/shutdown.port
! startApplication \
!     -classpath "${TESTCLASSES}" SimpleApplication "${PORTFILE}"
  
  failed=0
  
! if [ "$OS" != "Windows" ]; then
      # -sysprops option
!     ${JINFO} -sysprops $pid
      if [ $? != 0 ]; then failed=1; fi
  
      # -flags option
!     ${JINFO} -flags $pid
      if [ $? != 0 ]; then failed=1; fi
  
      # no option
!     ${JINFO} $pid
      if [ $? != 0 ]; then failed=1; fi
  
  fi
  
  
  # -flag option
! ${JINFO} -flag +PrintGC $pid
  if [ $? != 0 ]; then failed=1; fi 
  
! ${JINFO} -flag -PrintGC $pid
  if [ $? != 0 ]; then failed=1; fi
  
! ${JINFO} -flag PrintGC $pid
  if [ $? != 0 ]; then failed=1; fi
  
! if [ "$OS" = "SunOS" ]; then
  
!     ${JINFO} -flag +ExtendedDTraceProbes $pid
      if [ $? != 0 ]; then failed=1; fi
  
!     ${JINFO} -flag -ExtendedDTraceProbes $pid
      if [ $? != 0 ]; then failed=1; fi
  
!     ${JINFO} -flag ExtendedDTraceProbes $pid
      if [ $? != 0 ]; then failed=1; fi
  
  fi
  
! stopApplication ShutdownSimpleApplication "${PORTFILE}"
  
! exit $failed
  
--- 33,91 ----
  # @run shell Basic.sh
  
  . ${TESTSRC}/../common/CommonSetup.sh
  . ${TESTSRC}/../common/ApplicationSetup.sh
  
! # Start application and use PORTFILE for coordination
  PORTFILE="${TESTCLASSES}"/shutdown.port
! startApplication SimpleApplication "${PORTFILE}"
  
+ # all return statuses are checked in this test
+ set +e
+ 
  failed=0
  
! if [ $isWindows = false ]; then
      # -sysprops option
!     ${JINFO} -sysprops $appJavaPid
      if [ $? != 0 ]; then failed=1; fi
  
      # -flags option
!     ${JINFO} -flags $appJavaPid
      if [ $? != 0 ]; then failed=1; fi
  
      # no option
!     ${JINFO} $appJavaPid
      if [ $? != 0 ]; then failed=1; fi
  
  fi
  
  
  # -flag option
! ${JINFO} -flag +PrintGC $appJavaPid
  if [ $? != 0 ]; then failed=1; fi 
  
! ${JINFO} -flag -PrintGC $appJavaPid
  if [ $? != 0 ]; then failed=1; fi
  
! ${JINFO} -flag PrintGC $appJavaPid
  if [ $? != 0 ]; then failed=1; fi
  
! if $isSolaris; then
  
!     ${JINFO} -flag +ExtendedDTraceProbes $appJavaPid
      if [ $? != 0 ]; then failed=1; fi
  
!     ${JINFO} -flag -ExtendedDTraceProbes $appJavaPid
      if [ $? != 0 ]; then failed=1; fi
  
!     ${JINFO} -flag ExtendedDTraceProbes $appJavaPid
      if [ $? != 0 ]; then failed=1; fi
  
  fi
  
! set -e
  
! stopApplication "${PORTFILE}"
! waitForApplication
  
+ exit $failed