test/sun/tools/jstack/Basic.sh

*** 1,9 ****
  #!/bin/sh
  
  #
! # Copyright (c) 2005, 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) 2005, 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,56 ****
  # @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
  
  # normal
! $JSTACK $pid 2>&1
  if [ $? != 0 ]; then failed=1; fi
  
  # long
! $JSTACK -l $pid 2>&1
  if [ $? != 0 ]; then failed=1; fi
  
! stopApplication ShutdownSimpleApplication "${PORTFILE}"
   
! exit $failed
  
--- 33,60 ----
  # @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
  
  # normal
! $JSTACK $appJavaPid 2>&1
  if [ $? != 0 ]; then failed=1; fi
  
  # long
! $JSTACK -l $appJavaPid 2>&1
  if [ $? != 0 ]; then failed=1; fi
  
! set -e
  
! stopApplication "${PORTFILE}"
! waitForApplication
   
+ exit $failed