From: Martin R. <mr...@us...> - 2005-07-14 18:22:16
|
Update of /cvsroot/ltp/ltp/testcases/kernel/security/selinux-testsuite/tests/open In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7805/tests/open Modified Files: selinux_append2write.c selinux_fopen.c selinux_open.sh Log Message: Updates and testcase cleanup from Joy Index: selinux_append2write.c =================================================================== RCS file: /cvsroot/ltp/ltp/testcases/kernel/security/selinux-testsuite/tests/open/selinux_append2write.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** selinux_append2write.c 20 Apr 2005 16:09:11 -0000 1.1 --- selinux_append2write.c 14 Jul 2005 18:21:35 -0000 1.2 *************** *** 14,17 **** --- 14,18 ---- #include <unistd.h> #include <stdio.h> + #include <stdlib.h> int main(int argc, char **argv) Index: selinux_open.sh =================================================================== RCS file: /cvsroot/ltp/ltp/testcases/kernel/security/selinux-testsuite/tests/open/selinux_open.sh,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** selinux_open.sh 20 Apr 2005 16:09:12 -0000 1.1 --- selinux_open.sh 14 Jul 2005 18:21:35 -0000 1.2 *************** *** 15,18 **** --- 15,19 ---- export TCID="setup" export TST_COUNT=0 + export TST_TOTAL=8 # Remove any leftover test directories from prior failed runs. *************** *** 35,41 **** if [ $RC -eq 0 ] then ! echo "Test #1: open passed." else ! echo "Test #1: open failed." fi return $RC --- 36,42 ---- if [ $RC -eq 0 ] then ! tst_resm TPASS "Test #1: open passed." else ! tst_resm TFAIL "Test #1: open failed." fi return $RC *************** *** 54,61 **** if [ $RC -ne 0 ] then ! echo "Test #2: open passed." RC=0 else ! echo "Test #2: open failed." RC=1 fi --- 55,62 ---- if [ $RC -ne 0 ] then ! tst_resm TPASS "Test #2: open passed." RC=0 else ! tst_resm TFAIL "Test #2: open failed." RC=1 fi *************** *** 72,79 **** if [ $RC -ne 0 ] then ! echo "Test #3: open passed." RC=0 else ! echo "Test #3: open failed." RC=1 fi --- 73,80 ---- if [ $RC -ne 0 ] then ! tst_resm TPASS "Test #3: open passed." RC=0 else ! tst_resm TFAIL "Test #3: open failed." RC=1 fi *************** *** 91,98 **** if [ $RC -ne 0 ] then ! echo "Test #4: open passed." RC=0 else ! echo "Test #4: open failed." RC=1 fi --- 92,99 ---- if [ $RC -ne 0 ] then ! tst_resm TPASS "Test #4: open passed." RC=0 else ! tst_resm TFAIL "Test #4: open failed." RC=1 fi *************** *** 112,119 **** if [ $RC -ne 0 ] then ! echo "Test #5: open passed." RC=0 else ! echo "Test #5: open failed." RC=1 fi --- 113,120 ---- if [ $RC -ne 0 ] then ! tst_resm TPASS "Test #5: open passed." RC=0 else ! tst_resm TFAIL "Test #5: open failed." RC=1 fi *************** *** 132,138 **** if [ $RC -eq 0 ] then ! echo "Test #6: open passed." else ! echo "Test #6: open failed." fi return $RC --- 133,139 ---- if [ $RC -eq 0 ] then ! tst_resm TPASS "Test #6: open passed." else ! tst_resm TFAIL "Test #6: open failed." fi return $RC *************** *** 151,158 **** if [ $RC -ne 0 ] then ! echo "Test #7: open passed." RC=0 else ! echo "Test #7: open failed." RC=1 fi --- 152,159 ---- if [ $RC -ne 0 ] then ! tst_resm TPASS "Test #7: open passed." RC=0 else ! tst_resm TFAIL "Test #7: open failed." RC=1 fi *************** *** 172,178 **** if [ $RC -eq 0 ] then ! echo "Test #8: open passed." else ! echo "Test #8: open failed." fi return $RC --- 173,179 ---- if [ $RC -eq 0 ] then ! tst_resm TPASS "Test #8: open passed." else ! tst_resm TFAIL "Test #8: open failed." fi return $RC *************** *** 193,206 **** # RC=0 # Return value from setup, and test functions. setup ! test01 || exit $RC ! test02 || exit $RC ! test03 || exit $RC ! test04 || exit $RC ! test05 || exit $RC ! test06 || exit $RC ! test07 || exit $RC ! test08 || exit $RC cleanup ! exit 0 --- 194,208 ---- # RC=0 # Return value from setup, and test functions. + EXIT_VAL=0 setup ! test01 || EXIT_VAL=$RC ! test02 || EXIT_VAL=$RC ! test03 || EXIT_VAL=$RC ! test04 || EXIT_VAL=$RC ! test05 || EXIT_VAL=$RC ! test06 || EXIT_VAL=$RC ! test07 || EXIT_VAL=$RC ! test08 || EXIT_VAL=$RC cleanup ! exit $EXIT_VAL Index: selinux_fopen.c =================================================================== RCS file: /cvsroot/ltp/ltp/testcases/kernel/security/selinux-testsuite/tests/open/selinux_fopen.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** selinux_fopen.c 20 Apr 2005 16:09:12 -0000 1.1 --- selinux_fopen.c 14 Jul 2005 18:21:35 -0000 1.2 *************** *** 14,17 **** --- 14,18 ---- #include <unistd.h> #include <stdio.h> + #include <stdlib.h> int main(int argc, char **argv) |