From: Martin R. <mr...@us...> - 2005-07-14 18:22:12
|
Update of /cvsroot/ltp/ltp/testcases/kernel/security/selinux-testsuite/tests/dyntrans In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7805/tests/dyntrans Modified Files: selinux_dyntrans.sh Log Message: Updates and testcase cleanup from Joy Index: selinux_dyntrans.sh =================================================================== RCS file: /cvsroot/ltp/ltp/testcases/kernel/security/selinux-testsuite/tests/dyntrans/selinux_dyntrans.sh,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** selinux_dyntrans.sh 20 Apr 2005 16:09:08 -0000 1.1 --- selinux_dyntrans.sh 14 Jul 2005 18:21:33 -0000 1.2 *************** *** 10,13 **** --- 10,21 ---- # + setup() + { + LTPTMP="/tmp/selinux" + export TCID="setup" + export TST_COUNT=0 + export TST_TOTAL=2 + } + test01() { *************** *** 22,29 **** if [ $RC -ne 0 ] # we expect this to fail then ! echo "Test #1: dyntrans passed." RC=0 else ! echo "Test #1: dynstrans failed." RC=1 fi --- 30,37 ---- if [ $RC -ne 0 ] # we expect this to fail then ! tst_resm TPASS "Test #1: dyntrans passed." RC=0 else ! tst_resm TFAIL "Test #1: dynstrans failed." RC=1 fi *************** *** 42,48 **** if [ $RC -eq 0 ] then ! echo "Test #2: dyntrans passed." else ! echo "Test #2: dynstrans failed." fi return $RC --- 50,56 ---- if [ $RC -eq 0 ] then ! tst_resm TPASS "Test #2: dyntrans passed." else ! tst_resm TFAIL "Test #2: dynstrans failed." fi return $RC *************** *** 57,62 **** # RC=0 # Return value from setup, and test functions. ! test01 || exit $RC ! test02 || exit $RC ! exit 0 --- 65,72 ---- # RC=0 # Return value from setup, and test functions. + EXIT_VAL=0 ! setup ! test01 || EXIT_VAL=$RC ! test02 || EXIT_VAL=$RC ! exit $EXIT_VAL |