lkml.org 
[lkml]   [2015]   [Mar]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH] selftests/kcmp: exit with non-zero code in a fail case (v2)
On 03/13/2015 09:55 AM, Andrey Vagin wrote:
> Currently this test always returs zero code and a child process returns
> non-zero code only if the last testcase failed.
>
> v2: don't forget to return smth from ksft_exit()

Please check patch subject. It is phrased:
[PATCH v2] selftests/kcmp: exit with non-zero code in a fail case

Could you please resend. I don't want v2 ending up in the commit.

-- Shuah

>
> Cc: Michael Ellerman <mpe@ellerman.id.au>
> Cc: Shuah Khan <shuahkh@osg.samsung.com>
> Cc: Cyrill Gorcunov <gorcunov@openvz.org>
> Signed-off-by: Andrey Vagin <avagin@openvz.org>
> ---
> tools/testing/selftests/kcmp/kcmp_test.c | 16 ++++++++++------
> tools/testing/selftests/kselftest.h | 18 ++++++++++++++++++
> 2 files changed, 28 insertions(+), 6 deletions(-)
>
> diff --git a/tools/testing/selftests/kcmp/kcmp_test.c b/tools/testing/selftests/kcmp/kcmp_test.c
> index a5a4da8..42a40c6 100644
> --- a/tools/testing/selftests/kcmp/kcmp_test.c
> +++ b/tools/testing/selftests/kcmp/kcmp_test.c
> @@ -97,13 +97,17 @@ int main(int argc, char **argv)
>
> ksft_print_cnts();
>
> - if (ret)
> - ksft_exit_fail();
> - else
> - ksft_exit_pass();
> + return ksft_exit();
> + }
> +
> + status = -1;
> + if (waitpid(pid2, &status, 0) != pid2) {
> + perror("Unable to wait the child\n");
> + return ksft_exit_fail();
> }
>
> - waitpid(pid2, &status, P_ALL);
> + if (WIFEXITED(status))
> + return WEXITSTATUS(status);
>
> - return ksft_exit_pass();
> + return ksft_exit_fail();
> }
> diff --git a/tools/testing/selftests/kselftest.h b/tools/testing/selftests/kselftest.h
> index 572c888..f23e56c 100644
> --- a/tools/testing/selftests/kselftest.h
> +++ b/tools/testing/selftests/kselftest.h
> @@ -59,4 +59,22 @@ static inline int ksft_exit_skip(void)
> exit(4);
> }
>
> +static inline int ksft_exit(void)
> +{
> + /* in order of disruptiveness from bad to good */
> + if (ksft_cnt.ksft_fail)
> + return ksft_exit_fail();
> + if (ksft_cnt.ksft_xpass)
> + return ksft_exit_xpass();
> + if (ksft_cnt.ksft_xskip)
> + return ksft_exit_skip();
> + if (ksft_cnt.ksft_xfail)
> + return ksft_exit_xfail();
> + if (ksft_cnt.ksft_pass)
> + return ksft_exit_pass();
> +
> + /* A test must do something */
> + return ksft_exit_fail();
> +}
> +
> #endif /* __KSELFTEST_H */
>


--
Shuah Khan
Sr. Linux Kernel Developer
Open Source Innovation Group
Samsung Research America (Silicon Valley)
shuahkh@osg.samsung.com | (970) 217-8978


\
 
 \ /
  Last update: 2015-03-13 17:21    [W:0.120 / U:0.008 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site