From: Rishi k. K R. <ris...@li...> - 2010-03-23 15:12:26
|
The branch, next, has been updated via 391e757d43b3ac33a4a435e319ee77b1daa6da76 (commit) via 008f0d2c45d52af059d7981685921fc53d7354bf (commit) via 7ad24180d690306e129b84d49806f9f176a28d57 (commit) via 2df915dc1da7c5d92e03856095d3f66601178e58 (commit) from c65b70531c8d383a957654ad5179cb302b405a3b (commit) - Log ----------------------------------------------------------------- commit 391e757d43b3ac33a4a435e319ee77b1daa6da76 Author: Rishikesh K Rajak <ris...@li...> Date: Tue Mar 23 20:07:34 2010 +0530 Fix the proper return for testcase. Reported By: Srinivasa R Chamarthy <sch...@li...> Signed-off By: Rishikesh K Rajak <ris...@li...> commit 008f0d2c45d52af059d7981685921fc53d7354bf Author: Rishikesh K Rajak <ris...@li...> Date: Tue Mar 23 20:05:26 2010 +0530 These warning will appear when HAVE_LIBCAP is not defined. c.c: In function âmainâ: c.c:28: warning: unused variable âretâ c.c:27: warning: unused variable âcaps2â c.c:27: warning: unused variable âcapsâ Signed-off By: Rishikesh K Rajak<ris...@li...> commit 7ad24180d690306e129b84d49806f9f176a28d57 Author: Rishikesh K Rajak <ris...@li...> Date: Tue Mar 23 14:19:01 2010 +0530 while running i found some unwanted messages and fixed those. You can Ack if it is correct fix. ===== error log ===== Running in: cp: cannot stat `/opt/ltp/testcases/bin/print_caps': No such file or directory mkfifo: cannot create fifo `caps_fifo': File exists cap_sys_admin tests ==== error log ====== Signed-off-by: Rishikesh K Rajak <ris...@li...> commit 2df915dc1da7c5d92e03856095d3f66601178e58 Author: Rishikesh K Rajak <ris...@li...> Date: Mon Mar 22 13:50:11 2010 +0530 Revert "I have found abnormal behavior of sem_post/8-1.c test case under posix." This reverts commit d40fd32af0d0ad7713b0cf6cd23daf1ee639d479. Signed-off-by: Rishikesh K Rajak <ris...@li...> ----------------------------------------------------------------------- Summary of changes: .gitignore | 3 +++ .../controllers/cgroup_fj/run_cgroup_test_fj.sh | 2 +- testcases/kernel/security/filecaps/c.c | 3 ++- testcases/kernel/security/filecaps/filecapstest.sh | 5 +++-- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index e0ba857..660f345 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,6 @@ lib*.a /include/stamp-h1 /m4/Makefile /m4/Makefile.in +.gitattributes +.pc/ +patches/ diff --git a/testcases/kernel/controllers/cgroup_fj/run_cgroup_test_fj.sh b/testcases/kernel/controllers/cgroup_fj/run_cgroup_test_fj.sh index 7445725..672f37c 100755 --- a/testcases/kernel/controllers/cgroup_fj/run_cgroup_test_fj.sh +++ b/testcases/kernel/controllers/cgroup_fj/run_cgroup_test_fj.sh @@ -129,4 +129,4 @@ do fi done -exit 0; +exit $ret; diff --git a/testcases/kernel/security/filecaps/c.c b/testcases/kernel/security/filecaps/c.c index ee6cf05..5e1696c 100644 --- a/testcases/kernel/security/filecaps/c.c +++ b/testcases/kernel/security/filecaps/c.c @@ -24,10 +24,11 @@ int main() { + +#ifdef HAVE_LIBCAP cap_t caps, caps2; int ret; -#ifdef HAVE_LIBCAP caps = cap_from_text("cap_setpcap+ep"); caps2 = cap_from_text("cap_setpcap+ep"); ret = cap_set_proc(caps); diff --git a/testcases/kernel/security/filecaps/filecapstest.sh b/testcases/kernel/security/filecaps/filecapstest.sh index 9025b58..43582dc 100755 --- a/testcases/kernel/security/filecaps/filecapstest.sh +++ b/testcases/kernel/security/filecaps/filecapstest.sh @@ -20,8 +20,8 @@ ################################################################################ echo "Running in:" -rm -f print_caps -cp $LTPROOT/testcases/bin/print_caps . +#rm -f print_caps +#cp $LTPROOT/testcases/bin/print_caps . mkfifo caps_fifo chmod 777 caps_fifo exit_code=0 @@ -46,4 +46,5 @@ if [ $tmp -ne 0 ]; then exit_code=$tmp fi +unlink caps_fifo exit $exit_code hooks/post-receive -- ltp |