From: Yang Xu <xuyang2018.jy@cn.fujitsu.com>
To: ltp@lists.linux.it
Subject: [LTP] [PATCH 03/19] Unify error handling in lib/tst_safe_timerfd.c
Date: Sat, 7 Nov 2020 08:22:46 +0800 [thread overview]
Message-ID: <5FA5E8D6.4040401@cn.fujitsu.com> (raw)
In-Reply-To: <20201106173545.GA30641@pevik>
Hi Petr, Martin
> Hi Martin, Xu,
>
>>> diff --git a/lib/tst_safe_timerfd.c b/lib/tst_safe_timerfd.c
>>> index ffe7b2ef7..4c36a309c 100644
>>> --- a/lib/tst_safe_timerfd.c
>>> +++ b/lib/tst_safe_timerfd.c
>>> @@ -17,9 +17,14 @@ int safe_timerfd_create(const char *file, const int lineno,
>>> int fd;
>
>>> fd = timerfd_create(clockid, flags);
>>> - if (fd< 0) {
>>> - tst_brk(TTYPE | TERRNO, "%s:%d timerfd_create(%s) failed",
>>> - file, lineno, tst_clock_name(clockid));
>>> +
>>> + if (fd == -1) {
>>> + tst_brk_(file, lineno, TTYPE | TERRNO,
>>> + "timerfd_create(%s) failed", tst_clock_name(clockid));
>>> + } else if (fd< 0) {
> nit: fd< 0 => fd< 0
Sorry, It is my email format problem, on patchwork[1], the format is right.
[1]https://patchwork.ozlabs.org/project/ltp/patch/20201026164756.30556-4-mdoucha@suse.cz/
>>> + tst_brk_(file, lineno, TBROK | TERRNO,
>>> + "Invalid timerfd_create(%s) return value %d",
>>> + tst_clock_name(clockid), fd);
>
>>> }
>
>>> return fd;
>>> @@ -31,9 +36,14 @@ int safe_timerfd_gettime(const char *file, const int lineno,
>>> int rval;
>
>>> rval = timerfd_gettime(fd, curr_value);
>>> - if (rval != 0) {
>>> - tst_brk(TTYPE | TERRNO, "%s:%d timerfd_gettime() failed",
>>> - file, lineno);
>>> +
>>> + if (rval == -1) {
>>> + tst_brk_(file, lineno, TTYPE | TERRNO,
>>> + "timerfd_gettime() failed");
>>> + }
>>> + if (rval) {
>>> + tst_brk_(file, lineno, TBROK | TERRNO,
>>> + "Invalid timerfd_gettime() return value %d", rval);
>> Here also should use else if.
> +1.
> If I'm not wrong we need to count that safe functions does not quit the test in
> cleanup function (tst_brk__() and tst_brk_entered).
Yes, because we want to do more it in cleanup, so we use
"tst_brk_handler = tst_cvres" to print something instead of "
tst_brk_handler = tst_vbrk_;". We also have documented it in
doc/test-writing-guidelines.txt.
Best Regards
Yang Xu
>
> Kind regards,
> Petr
>
>
> .
>
next prev parent reply other threads:[~2020-11-07 0:22 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-26 16:47 [LTP] [PATCH 00/19] Unify error handling in LTP library Martin Doucha
2020-10-26 16:47 ` [LTP] [PATCH 01/19] Unify error handling in lib/tst_safe_macros.c Martin Doucha
2020-10-27 8:22 ` Yang Xu
2020-10-29 15:35 ` Cyril Hrubis
2020-10-26 16:47 ` [LTP] [PATCH 02/19] Unify error handling in lib/tst_safe_sysv_ipc.c Martin Doucha
2020-10-27 9:10 ` Yang Xu
2020-10-26 16:47 ` [LTP] [PATCH 03/19] Unify error handling in lib/tst_safe_timerfd.c Martin Doucha
2020-10-27 9:21 ` Yang Xu
2020-11-06 17:35 ` Petr Vorel
2020-11-07 0:22 ` Yang Xu [this message]
2020-11-07 16:42 ` Petr Vorel
2020-10-26 16:47 ` [LTP] [PATCH 04/19] Unify error handling in lib/safe_file_ops.c Martin Doucha
2020-10-29 15:59 ` Cyril Hrubis
2020-10-29 16:02 ` Cyril Hrubis
2020-10-29 16:05 ` Martin Doucha
2020-10-29 16:17 ` Cyril Hrubis
2020-10-29 16:23 ` Martin Doucha
2020-10-30 10:31 ` Cyril Hrubis
2020-10-26 16:47 ` [LTP] [PATCH 05/19] Unify error handling in lib/safe_macros.c Martin Doucha
2020-10-27 10:10 ` Yang Xu
2020-10-27 10:51 ` Martin Doucha
2020-11-11 12:58 ` Cyril Hrubis
2020-10-26 16:47 ` [LTP] [PATCH 06/19] Unify error handling in lib/safe_net.c Martin Doucha
2020-11-11 12:53 ` Cyril Hrubis
2020-10-26 16:47 ` [LTP] [PATCH 07/19] Unify error handling in lib/safe_stdio.c Martin Doucha
2020-11-10 16:11 ` Cyril Hrubis
2020-10-26 16:47 ` [LTP] [PATCH 08/19] Unify error handling in lib/tst_mkfs.c Martin Doucha
2020-11-10 15:43 ` Cyril Hrubis
2020-10-26 16:47 ` [LTP] [PATCH 09/19] Unify error handling in lib/tst_checkpoint.c Martin Doucha
2020-11-10 15:17 ` Cyril Hrubis
2020-10-26 16:47 ` [LTP] [PATCH 10/19] Unify error handling in lib/tst_net.c Martin Doucha
2020-11-10 13:20 ` Cyril Hrubis
2020-10-26 16:47 ` [LTP] [PATCH 11/19] Unify error handling in lib/tst_fs_setup.c Martin Doucha
2020-10-27 13:12 ` Yang Xu
2020-10-26 16:47 ` [LTP] [PATCH 12/19] Unify error handling in include/tst_safe_clocks.h Martin Doucha
2020-11-10 13:13 ` Cyril Hrubis
2020-10-26 16:47 ` [LTP] [PATCH 13/19] Move executable code out of tst_safe_macros.h Martin Doucha
2020-10-26 16:47 ` [LTP] [PATCH 14/19] Unify error handling in moved functions Martin Doucha
2020-11-10 12:18 ` Cyril Hrubis
2020-10-26 16:47 ` [LTP] [PATCH 15/19] Unify error handling in include/tst_safe_macros.h Martin Doucha
2020-11-10 11:37 ` Cyril Hrubis
2020-10-26 16:47 ` [LTP] [PATCH 16/19] Unify error handling in include/tst_safe_posix_ipc.h Martin Doucha
2020-11-06 15:43 ` Cyril Hrubis
2020-10-26 16:47 ` [LTP] [PATCH 17/19] Unify error handling in include/tst_safe_prw.h Martin Doucha
2020-11-06 15:39 ` Cyril Hrubis
2020-10-26 16:47 ` [LTP] [PATCH 18/19] Unify error handling in lib/tst_resource.c Martin Doucha
2020-11-06 13:05 ` Cyril Hrubis
2020-10-26 16:47 ` [LTP] [PATCH 19/19] Unify error handling in include/lapi/safe_rt_signal.h Martin Doucha
2020-11-06 12:57 ` Cyril Hrubis
2020-10-27 13:32 ` [LTP] [PATCH 00/19] Unify error handling in LTP library Yang Xu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5FA5E8D6.4040401@cn.fujitsu.com \
--to=xuyang2018.jy@cn.fujitsu.com \
--cc=ltp@lists.linux.it \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).