[Ltp-cvs] ltp/testcases/kernel/security/selinux-testsuite/tests/exectrace selinux_exectrace.sh,1.1,1.2 selinux_exectrace_child.c,1.1,1.2

[Martin R. <mr...@us...>]

Update of /cvsroot/ltp/ltp/testcases/kernel/security/selinux-testsuite/tests/exectrace
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7805/tests/exectrace

Modified Files:
	selinux_exectrace.sh selinux_exectrace_child.c 
Log Message:
Updates and testcase cleanup from Joy

Index: selinux_exectrace_child.c
===================================================================
RCS file: /cvsroot/ltp/ltp/testcases/kernel/security/selinux-testsuite/tests/exectrace/selinux_exectrace_child.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** selinux_exectrace_child.c	20 Apr 2005 16:09:09 -0000	1.1
--- selinux_exectrace_child.c	14 Jul 2005 18:21:33 -0000	1.2
***************
*** 9,12 ****
--- 9,14 ----
   */
  
+ #include <stdlib.h>
+ 
  int main(void) 
  {

Index: selinux_exectrace.sh
===================================================================
RCS file: /cvsroot/ltp/ltp/testcases/kernel/security/selinux-testsuite/tests/exectrace/selinux_exectrace.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** selinux_exectrace.sh	20 Apr 2005 16:09:09 -0000	1.1
--- selinux_exectrace.sh	14 Jul 2005 18:21:33 -0000	1.2
***************
*** 14,17 ****
--- 14,20 ----
          export TCID="setup"
          export TST_COUNT=0
+ 	export TST_TOTAL=2
+ 
+ 	# run tests in $LTPROOT/testcases/bin directory
          SAVEPWD=${PWD}
          cd ${LTPROOT}/testcases/bin
***************
*** 31,37 ****
  	if [ $RC -ne 0 ]
          then
!                 echo "Test #1: exectrace failed."
          else
!                 echo "Test #1: exectrace passed."
          fi
          return $RC
--- 34,40 ----
  	if [ $RC -ne 0 ]
          then
!                 tst_resm TFAIL "Test #1: exectrace failed."
          else
!                 tst_resm TPASS "Test #1: exectrace passed."
          fi
          return $RC
***************
*** 51,58 ****
  	if [ $RC -ne 0 ]
          then
!                 echo "Test #2: exectrace passed."
  		RC=0
          else
!                 echo "Test #2: exectrace failed."
  		RC=1
          fi
--- 54,61 ----
  	if [ $RC -ne 0 ]
          then
!                 tst_resm TPASS "Test #2: exectrace passed."
  		RC=0
          else
!                 tst_resm TFAIL "Test #2: exectrace failed."
  		RC=1
          fi
***************
*** 62,65 ****
--- 65,69 ----
  cleanup()
  {
+ 	# return to $LTPROOT directory.
  	cd $SAVEPWD
  }
***************
*** 73,80 ****
  #
  RC=0    # Return value from setup, and test functions.
  
  setup
! test01 || exit $RC
! test02 || exit $RC
  cleanup
! exit 0
--- 77,85 ----
  #
  RC=0    # Return value from setup, and test functions.
+ EXIT_VAL=0
  
  setup
! test01 || EXIT_VAL=$RC
! test02 || EXIT_VAL=$RC
  cleanup
! exit $EXIT_VAL