From: Rishi k. K R. <ris...@li...> - 2010-04-15 06:50:50
|
The branch, next, has been updated via c150e9b196b1267beeefdaec4dde9933503448f3 (commit) via eaf73222df286c200475aadac78122b182b5f388 (commit) via cc7c7035a60b40f9a417b5e437ca6ea43ebfd783 (commit) via 2a276cf8bb5b94259482ec039edc2ae7fbaf953e (commit) via a9d5600c78943e9e7e1b52c5ec81e9772a47b44f (commit) from aabf191024aacc91784593b0d3f8d5fa37434b25 (commit) - Log ----------------------------------------------------------------- commit c150e9b196b1267beeefdaec4dde9933503448f3 Author: Rishikesh K Rajak <ris...@li...> Date: Thu Apr 15 12:17:56 2010 +0530 I tried "eventfd01" test in my system. This test failed with TWARN (return code:4) : ------------ eventfd01 1 TCONF : 2.6.22 or greater kernel required eventfd01 2 TCONF : Remaining cases not appropriate for configuration eventfd01 3 TCONF : Remaining cases not appropriate for configuration eventfd01 4 TCONF : Remaining cases not appropriate for configuration eventfd01 5 TCONF : Remaining cases not appropriate for configuration eventfd01 6 TCONF : Remaining cases not appropriate for configuration eventfd01 7 TCONF : Remaining cases not appropriate for configuration eventfd01 8 TCONF : Remaining cases not appropriate for configuration eventfd01 9 TCONF : Remaining cases not appropriate for configuration eventfd01 10 TCONF : Remaining cases not appropriate for configuration eventfd01 11 TCONF : Remaining cases not appropriate for configuration eventfd01 12 TCONF : Remaining cases not appropriate for configuration eventfd01 13 TCONF : Remaining cases not appropriate for configuration eventfd01 14 TCONF : Remaining cases not appropriate for configuration eventfd01 15 TCONF : Remaining cases not appropriate for configuration eventfd01 0 TWARN : tst_rmdir(): TESTDIR was NULL; no removal attempted ------------ Signed-off-by: Tomonori Mitani <mi...@ry...> Signed-off-by: Rishikesh K Rajak <ris...@li...> commit eaf73222df286c200475aadac78122b182b5f388 Author: Rishikesh K Rajak <ris...@li...> Date: Thu Apr 15 12:14:19 2010 +0530 I found out that "-)20" test of "ar01" failed once in a while. Its code is as follows: ------------ ... rm -rf $TCtmp/lib.a;cd $TCdat ar -cr $TCtmp/lib.a file0.in file2.in crtest File1time=`ar -tv $TCtmp/lib.a | grep file0.in | cut -f2 -d: | cut -f1 -d" "` File2time=`ar -tv $TCtmp/lib.a | grep file2.in | cut -f2 -d: | cut -f1 -d" "` touch -c -t 201503030303.55 file0.in ar -ru $TCtmp/lib.a file0.in file2.in 2>&1 1>/dev/null File1time1=`ar -tv $TCtmp/lib.a | grep file0.in | cut -f2 -d: | cut -f1 -d" "` File2time2=`ar -tv $TCtmp/lib.a | grep file2.in | cut -f2 -d: | cut -f1 -d" "` if [ $File2time = $File2time2 ] then if [ $File1time = $File1time1 ] then TCRESULT echo "FAIL - ar with -u flag failed" else echo "-)20" fi else TCRESULT echo "FAIL - ar with -u flag failed" fi touch file0.in ... ------------ "file0.in" and "file2.in" are offered with "ar01" source, and they are copied when "make install" is executed. In this code, "File1time" and "File1time1" are times of before and after time-stamp changing of "file0.in" by "touch -c -t ..." command. But "File1time" and "File1time1" are only minute numbers. It's problem, I think. If installation is at 2010.04.06 XX:03 accidentally, both of "File1time" and "File1time1" are "03". And this code ends as "FAIL". This happens with a one-60th probability. Signed-off-by: Tomonori Mitani <mi...@ry...> Signed-off-by: Rishikesh K Rajak <ris...@li...> commit cc7c7035a60b40f9a417b5e437ca6ea43ebfd783 Author: Rishikesh K Rajak <ris...@li...> Date: Thu Apr 15 12:08:07 2010 +0530 I tried to build by using yesterday's git in my system (RHEL4.8 x86). (ltp-dev-4837fee8a7c2de6a83c8927a574c792ca6dabe4e.tar.gz) But build failed in "cap_bset_inh_bounds.c" with following message. This is different from "cap_bounds_r.c"'s problem (another thread), I think ------------ gcc -g -O2 -g -O2 -fno-strict-aliasing -pipe -Wall -I/home/LTP/ltp-dev-20100401-3/testcases/kernel/include -I../../../../include -I../../../../include -L../../../../lib cap_bset_inh_bounds.c -lltp -lcap -o cap_bset_inh_bounds cap_bset_inh_bounds.c:124: error: syntax error before numeric constant cap_bset_inh_bounds.c:124: warning: type defaults to `int' in declaration of `tst_resm' cap_bset_inh_bounds.c:124: error: conflicting types for 'tst_resm' ../../../../include/test.h:192: error: previous declaration of 'tst_resm' was here cap_bset_inh_bounds.c:124: error: conflicting types for 'tst_resm' ../../../../include/test.h:192: error: previous declaration of 'tst_resm' was here cap_bset_inh_bounds.c:124: warning: data definition has no type or storage class cap_bset_inh_bounds.c:129: warning: type defaults to `int' in declaration of `tst_exit' cap_bset_inh_bounds.c:129: error: conflicting types for 'tst_exit' ../../../../include/test.h:203: error: previous declaration of 'tst_exit' was here cap_bset_inh_bounds.c:129: error: conflicting types for 'tst_exit' ../../../../include/test.h:203: error: previous declaration of 'tst_exit' was here cap_bset_inh_bounds.c:129: warning: data definition has no type or storage class cap_bset_inh_bounds.c:130: error: syntax error before '}' token ------------ In this source, the pair of "ifdef" start/end and the pair of main() function's "parenthesis" are alternate, I think. Acked-by: Serge Hallyn <se...@us...> Signed-off-by : Tomonori Mitani <mi...@ry...> Signed-off-by: Rishikesh K Rajak <ris...@li...> commit 2a276cf8bb5b94259482ec039edc2ae7fbaf953e Author: Rishikesh K Rajak <ris...@li...> Date: Thu Apr 15 12:06:23 2010 +0530 I found two problems in mail test. (${LTPROOT}/testcases/commands/mail/mail_tests.sh) They are simple mistakes, I think. 1) About judgment for making a user name In line 80 of "mail_tests.sh", there is following sentence. ------------ if id -u mail_test >/dev/null 2>&1; then ------------ This control sentence is going to judge whether the result of "id -u mail_test" command is normal or not, I think. But this sentence is not effective. Therefore the user name "make_test" cannot be made when this user name isn't exist. 2) About "blind carbon copy" option In "mail_tests.sh", there are 5 tests about mail. 5th is "blind carbon copy" test. However, this test doesn't use "-b" option but uses "-c" option. Signed-off-by: Tomonori Mitani <mi...@ry...> Signed-off-by: Rishikesh K Rajak <ris...@li...> commit a9d5600c78943e9e7e1b52c5ec81e9772a47b44f Author: Rishikesh K Rajak <ris...@li...> Date: Thu Apr 15 12:04:09 2010 +0530 I tried "hugemmap", "hugeshmat", "hugeshmctl", "hugeshmdt" and "hugeshmget" tests. And I found several fails in them: ------------<at "${LTPROOT}/testcases/kernel/mem/hugetlb/" directory> - ./hugemmap/ 1) hugemmap04 : return code = 2 - ./hugeshmat/ 2) hugeshmat01 : return code = 6 3) hugeshmat02 : return code = 6 4) hugeshmat03 : return code = 2 - ./hugeshmctl/ 5) hugeshmctl01 : return code = 6 6) hugeshmctl02 : return code = 6 7) hugeshmctl03 : return code = 2 - ./hugeshmdt/ 8) hugeshmdt01 : return code = 6 - ./hugeshmget/ 9) hugeshmget01 : return code = 2 10) hugeshmget02 : return code = 6 11) hugeshmget03 : return code = 6 12) hugeshmget05 : return code = 2 ------------ These tests output following messages: ------------ a) All tests: "TBROK : Test cannot be continued owning to sufficient availability of Hugepages on the system" b) 2), 3), 5), 6), 8), 10), 11) tests: "TWARN : tst_rmdir(): TESTDIR was NULL; no removal attempted" ------------ Both case a) and case b) are caused by the same reason. All of case a) failures occured at the following points (for example hugemmap04): ------------<hugemmap04.c - main()> /* Check number of hugepages */ if (get_no_of_hugepages() <= 0 || hugepages_size() <= 0) tst_brkm(TBROK, cleanup, "Test cannot be continued owning to \ sufficient availability of Hugepages on the system"); ------------ I found out that "HugePages_Total" parameter of "/proc/meminfo" file is set to "0". This caused above TBROK failure. It is environment problem. But, in this case, tests must not return with TBROK, but with TCONF, I think. And, in case b), these tests try to delete "TESTDIR" directory by calling "tst_rmdir()" function in "cleanup()" function. But, "TESTDIR" never set if "tst_tmpdir()" function isn't called. I think that case b)'s tests must not call cleanup() function. I want to suggest following patch. Signed-off-by: Tomonori Mitani <mi...@ry...> Signed-off-by: Rishikesh K Rajak <ris...@li...> ----------------------------------------------------------------------- Summary of changes: testcases/commands/ade/ar/ar01 | 12 ++++++------ testcases/commands/mail/mail_tests.sh | 9 +++++---- testcases/kernel/mem/hugetlb/hugemmap/hugemmap04.c | 3 +-- .../kernel/mem/hugetlb/hugeshmat/hugeshmat01.c | 2 +- .../kernel/mem/hugetlb/hugeshmat/hugeshmat02.c | 2 +- .../kernel/mem/hugetlb/hugeshmat/hugeshmat03.c | 2 +- .../kernel/mem/hugetlb/hugeshmctl/hugeshmctl01.c | 2 +- .../kernel/mem/hugetlb/hugeshmctl/hugeshmctl02.c | 2 +- .../kernel/mem/hugetlb/hugeshmctl/hugeshmctl03.c | 2 +- .../kernel/mem/hugetlb/hugeshmdt/hugeshmdt01.c | 2 +- .../kernel/mem/hugetlb/hugeshmget/hugeshmget01.c | 2 +- .../kernel/mem/hugetlb/hugeshmget/hugeshmget02.c | 2 +- .../kernel/mem/hugetlb/hugeshmget/hugeshmget03.c | 2 +- .../kernel/mem/hugetlb/hugeshmget/hugeshmget05.c | 2 +- .../security/cap_bound/cap_bset_inh_bounds.c | 4 ++-- testcases/kernel/syscalls/eventfd/eventfd01.c | 2 +- 16 files changed, 26 insertions(+), 26 deletions(-) diff --git a/testcases/commands/ade/ar/ar01 b/testcases/commands/ade/ar/ar01 index c90faf9..55363dc 100755 --- a/testcases/commands/ade/ar/ar01 +++ b/testcases/commands/ade/ar/ar01 @@ -519,19 +519,19 @@ echo "-)19 SKIPPED due to binutils ar automatically adds a symbol." rm -rf $TCtmp/lib.a;cd $TCdat ar -cr $TCtmp/lib.a file0.in file2.in crtest -File1time=`ar -tv $TCtmp/lib.a | grep file0.in | cut -f2 -d: | cut -f1 -d" "` -File2time=`ar -tv $TCtmp/lib.a | grep file2.in | cut -f2 -d: | cut -f1 -d" "` +File1time=`ar -tv $TCtmp/lib.a | grep file0.in` +File2time=`ar -tv $TCtmp/lib.a | grep file2.in` #sleep 5 touch -c -t 201503030303.55 file0.in ar -ru $TCtmp/lib.a file0.in file2.in 2>&1 1>/dev/null -File1time1=`ar -tv $TCtmp/lib.a | grep file0.in | cut -f2 -d: | cut -f1 -d" "` -File2time2=`ar -tv $TCtmp/lib.a | grep file2.in | cut -f2 -d: | cut -f1 -d" "` +File1time1=`ar -tv $TCtmp/lib.a | grep file0.in` +File2time2=`ar -tv $TCtmp/lib.a | grep file2.in` -if [ $File2time = $File2time2 ] +if [ "$File2time" = "$File2time2" ] then - if [ $File1time = $File1time1 ] + if [ "$File1time" = "$File1time1" ] then TCRESULT=20 echo "FAIL - ar with -u flag failed" diff --git a/testcases/commands/mail/mail_tests.sh b/testcases/commands/mail/mail_tests.sh index 790cdd6..ff4540c 100755 --- a/testcases/commands/mail/mail_tests.sh +++ b/testcases/commands/mail/mail_tests.sh @@ -77,7 +77,8 @@ fi # check if the user mail_test exists on this system. # if not add that user mail_test, will removed before exiting test. -if id -u mail_test >/dev/null 2>&1; then +id -u mail_test >/dev/null 2>&1 +if [ $? -ne 0 ] ; then tst_resm TINFO "INIT: Adding temporary user mail_test" useradd -m -s /sbin/nologin mail_test > $LTPTMP/tst_mail.out 2>&1 if [ $? -ne 0 ]; then @@ -327,7 +328,7 @@ tst_resm TINFO "Test #5: Test that mail -b user@domain will" tst_resm TINFO "Test #5: blind carbon copy user@domain" # send mail to root and carbon copy mail_test -mail -s "Test" root@localhost -c mail_test@localhost < \ +mail -s "Test" root@localhost -b mail_test@localhost < \ $LTPTMP/tst_mail.in > $LTPTMP/tst_mail.out 2>&1 if [ $? -ne 0 ]; then tst_res TFAIL $LTPTMP/tst_mail.out \ @@ -344,10 +345,10 @@ else if [ "x$RC1" != x0 -a "x$RC2" != x0 ]; then tst_resm TPASS \ - "Test #5: Mail was carbon copied to user mail_test" + "Test #5: Mail was blind carbon copied to user mail_test" else tst_res TFAIL $LTPTMP/tst_mail.res \ - "Test #5: mail failed to carbon copy user mail_test. Reason:" + "Test #5: mail failed to blind carbon copy user mail_test. Reason:" : $(( TFAILCNT += 1 )) fi diff --git a/testcases/kernel/mem/hugetlb/hugemmap/hugemmap04.c b/testcases/kernel/mem/hugetlb/hugemmap/hugemmap04.c index e67e43c..485b465 100644 --- a/testcases/kernel/mem/hugetlb/hugemmap/hugemmap04.c +++ b/testcases/kernel/mem/hugetlb/hugemmap/hugemmap04.c @@ -127,8 +127,7 @@ main(int ac, char **av) /* Check number of hugepages */ if (get_no_of_hugepages() <= 0 || hugepages_size() <= 0) - tst_brkm(TBROK, cleanup, "Test cannot be continued owning to \ - sufficient availability of Hugepages on the system"); + tst_brkm(TCONF, cleanup, "Not enough available Hugepages"); /* Perform global setup for test */ setup(); diff --git a/testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat01.c b/testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat01.c index b30afef..229b929 100644 --- a/testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat01.c +++ b/testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat01.c @@ -105,7 +105,7 @@ int main(int ac, char **av) } if ( get_no_of_hugepages() <= 0 || hugepages_size() <= 0 ) - tst_brkm(TBROK, cleanup, "Test cannot be continued owning to sufficient availability of Hugepages on the system"); + tst_brkm(TCONF, tst_exit, "Not enough available Hugepages"); else huge_pages_shm_to_be_allocated = ( get_no_of_hugepages() * hugepages_size() * 1024) / 2 ; diff --git a/testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat02.c b/testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat02.c index 431c1e3..2f56127 100644 --- a/testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat02.c +++ b/testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat02.c @@ -102,7 +102,7 @@ int main(int ac, char **av) } if ( get_no_of_hugepages() <= 0 || hugepages_size() <= 0 ) - tst_brkm(TBROK, cleanup, "Test cannot be continued owning to sufficient availability of Hugepages on the system"); + tst_brkm(TCONF, tst_exit, "Not enough available Hugepages"); else huge_pages_shm_to_be_allocated = ( get_no_of_hugepages() * hugepages_size() * 1024) / 2 ; diff --git a/testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat03.c b/testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat03.c index f892799..a106976 100644 --- a/testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat03.c +++ b/testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat03.c @@ -86,7 +86,7 @@ int main(int ac, char **av) } if ( get_no_of_hugepages() <= 0 || hugepages_size() <= 0 ) - tst_brkm(TBROK, cleanup, "Test cannot be continued owning to sufficient availability of Hugepages on the system"); + tst_brkm(TCONF, cleanup, "Not enough available Hugepages"); else huge_pages_shm_to_be_allocated = ( get_no_of_hugepages() * hugepages_size() * 1024) / 2 ; diff --git a/testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl01.c b/testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl01.c index baff476..e40123d 100644 --- a/testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl01.c +++ b/testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl01.c @@ -130,7 +130,7 @@ int main(int ac, char **av) } if ( get_no_of_hugepages() <= 0 || hugepages_size() <= 0 ) - tst_brkm(TBROK, cleanup, "Test cannot be continued owning to sufficient availability of Hugepages on the system"); + tst_brkm(TCONF, tst_exit, "Not enough available Hugepages"); else huge_pages_shm_to_be_allocated = ( get_no_of_hugepages() * hugepages_size() * 1024) / 2 ; diff --git a/testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl02.c b/testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl02.c index 928f76a..e434082 100644 --- a/testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl02.c +++ b/testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl02.c @@ -102,7 +102,7 @@ int main(int ac, char **av) } if ( get_no_of_hugepages() <= 0 || hugepages_size() <= 0 ) - tst_brkm(TBROK, cleanup, "Test cannot be continued owning to sufficient availability of Hugepages on the system"); + tst_brkm(TCONF, tst_exit, "Not enough available Hugepages"); else huge_pages_shm_to_be_allocated = ( get_no_of_hugepages() * hugepages_size() * 1024) / 2 ; diff --git a/testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl03.c b/testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl03.c index 7d039e6..5a7e02a 100644 --- a/testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl03.c +++ b/testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl03.c @@ -105,7 +105,7 @@ int main(int ac, char **av) } if ( get_no_of_hugepages() <= 0 || hugepages_size() <= 0 ) - tst_brkm(TBROK, cleanup, "Test cannot be continued owning to sufficient availability of Hugepages on the system"); + tst_brkm(TCONF, cleanup, "Not enough available Hugepages"); else huge_pages_shm_to_be_allocated = ( get_no_of_hugepages() * hugepages_size() * 1024) / 2 ; diff --git a/testcases/kernel/mem/hugetlb/hugeshmdt/hugeshmdt01.c b/testcases/kernel/mem/hugetlb/hugeshmdt/hugeshmdt01.c index 7c0cec5..bb5480e 100644 --- a/testcases/kernel/mem/hugetlb/hugeshmdt/hugeshmdt01.c +++ b/testcases/kernel/mem/hugetlb/hugeshmdt/hugeshmdt01.c @@ -87,7 +87,7 @@ int main(int ac, char **av) } if ( get_no_of_hugepages() <= 0 || hugepages_size() <= 0 ) - tst_brkm(TBROK, cleanup, "Test cannot be continued owning to sufficient availability of Hugepages on the system"); + tst_brkm(TCONF, tst_exit, "Not enough available Hugepages"); else huge_pages_shm_to_be_allocated = ( get_no_of_hugepages() * hugepages_size() * 1024) / 2 ; diff --git a/testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget01.c b/testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget01.c index 10f29d3..6fa02ab 100644 --- a/testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget01.c +++ b/testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget01.c @@ -82,7 +82,7 @@ int main(int ac, char **av) /* The following loop checks looping state if -i option given */ if ( get_no_of_hugepages() <= 0 || hugepages_size() <= 0 ) - tst_brkm(TBROK, cleanup, "Test cannot be continued owning to sufficient availability of Hugepages on the system"); + tst_brkm(TCONF, cleanup, "Not enough available Hugepages"); else huge_pages_shm_to_be_allocated = ( get_no_of_hugepages() * hugepages_size() * 1024) / 2 ; diff --git a/testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget02.c b/testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget02.c index 9066f45..80d3a2b 100644 --- a/testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget02.c +++ b/testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget02.c @@ -84,7 +84,7 @@ int main(int ac, char **av) { } if ( get_no_of_hugepages() <= 0 || hugepages_size() <= 0 ) - tst_brkm(TBROK, cleanup, "Test cannot be continued owning to sufficient availability of Hugepages on the system"); + tst_brkm(TCONF, tst_exit, "Not enough available Hugepages"); else huge_pages_shm_to_be_allocated = ( get_no_of_hugepages() * hugepages_size() * 1024) / 2 ; diff --git a/testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget03.c b/testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget03.c index aa76097..fc78b45 100644 --- a/testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget03.c +++ b/testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget03.c @@ -85,7 +85,7 @@ int main(int ac, char **av) /* The following loop checks looping state if -i option given */ if ( get_no_of_hugepages() <= 0 || hugepages_size() <= 0 ) - tst_brkm(TBROK, cleanup, "Test cannot be continued owning to sufficient availability of Hugepages on the system"); + tst_brkm(TCONF, tst_exit, "Not enough available Hugepages"); else huge_pages_shm_to_be_allocated = ( get_no_of_hugepages() * hugepages_size() * 1024) / 2 ; diff --git a/testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget05.c b/testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget05.c index de9ab46..bc4bd2c 100644 --- a/testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget05.c +++ b/testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget05.c @@ -86,7 +86,7 @@ int main(int ac, char **av) } if ( get_no_of_hugepages() <= 0 || hugepages_size() <= 0 ) - tst_brkm(TBROK, cleanup, "Test cannot be continued owning to sufficient availability of Hugepages on the system"); + tst_brkm(TCONF, cleanup, "Not enough available Hugepages"); else huge_pages_shm_to_be_allocated = ( get_no_of_hugepages() * hugepages_size() * 1024) / 2 ; diff --git a/testcases/kernel/security/cap_bound/cap_bset_inh_bounds.c b/testcases/kernel/security/cap_bound/cap_bset_inh_bounds.c index c6c34c0..7033a37 100644 --- a/testcases/kernel/security/cap_bound/cap_bset_inh_bounds.c +++ b/testcases/kernel/security/cap_bound/cap_bset_inh_bounds.c @@ -39,11 +39,11 @@ int TST_TOTAL=2; int errno; +int main(int argc, char *argv[]) +{ #if HAVE_SYS_CAPABILITY_H #if HAVE_DECL_PR_CAPBSET_READ && HAVE_DECL_PR_CAPBSET_DROP #ifdef HAVE_LIBCAP -int main(int argc, char *argv[]) -{ int ret = 1; cap_value_t v[1]; cap_flag_value_t f; diff --git a/testcases/kernel/syscalls/eventfd/eventfd01.c b/testcases/kernel/syscalls/eventfd/eventfd01.c index 05acc1b..83eb86e 100644 --- a/testcases/kernel/syscalls/eventfd/eventfd01.c +++ b/testcases/kernel/syscalls/eventfd/eventfd01.c @@ -729,7 +729,7 @@ static void setup(void) tst_sig(FORK, DEF_HANDLER, cleanup); if (tst_kvercmp(2, 6, 22) < 0) - tst_brkm(TCONF, cleanup, "2.6.22 or greater kernel required"); + tst_brkm(TCONF, tst_exit, "2.6.22 or greater kernel required"); /* Create a temporary directory & chdir there */ tst_tmpdir(); hooks/post-receive -- ltp |