From: Cyril Hrubis <chrubis@suse.cz>
To: ltp@lists.linux.it
Subject: [LTP] [PATCH 2/2] uevents/uevent03.c: Check if "UI_GET_SYSNAME" is supported
Date: Tue, 3 Sep 2019 16:35:13 +0200 [thread overview]
Message-ID: <20190903143513.GA14511@rei.lan> (raw)
In-Reply-To: <1567514890-1216-2-git-send-email-huangjh.jy@cn.fujitsu.com>
Hi!
> Signed-off-by: Jinhui huang <huangjh.jy@cn.fujitsu.com>
> ---
> testcases/kernel/uevents/uevent03.c | 15 +++++++++++++--
> 1 file changed, 13 insertions(+), 2 deletions(-)
>
> diff --git a/testcases/kernel/uevents/uevent03.c b/testcases/kernel/uevents/uevent03.c
> index 9b901dc..f676984 100644
> --- a/testcases/kernel/uevents/uevent03.c
> +++ b/testcases/kernel/uevents/uevent03.c
> @@ -52,7 +52,7 @@ static void get_minor_major(char *device, char *minor, char *major, size_t buf_s
>
> static void verify_uevent(void)
> {
> - int pid, fd;
> + int pid, fd, ret;
> char sysname[64];
> char add_msg[1024];
> char rem_msg[1024];
> @@ -167,7 +167,18 @@ static void verify_uevent(void)
>
> create_uinput_mouse();
>
> - SAFE_IOCTL(mouse_fd, UI_GET_SYSNAME(sizeof(sysname)), sysname);
> + ret = ioctl(mouse_fd, UI_GET_SYSNAME(sizeof(sysname)), sysname);
> + if (ret < 0) {
> + if (errno == EINVAL) {
> + tst_brk(TCONF,
> + "kernel does not support UI_GET_SYSNAME");
> + } else {
> + tst_brk(TBROK,
> + "ioctl(%d, %s,...) failed",
> + mouse_fd, "UI_GET_SYSNAME");
> + }
> + }
I do wonder if it makes sense to add a fallback that reads the sysname
from /proc/bus/input/devices.
We do have the sysname as the last component of the SysFs= path.
I guess that it's probably not worth of the effort.
> handlers = get_input_handlers();
>
> tst_res(TINFO, "Sysname: %s", sysname);
> --
> 1.8.3.1
>
>
>
>
> --
> Mailing list info: https://lists.linux.it/listinfo/ltp
--
Cyril Hrubis
chrubis@suse.cz
next prev parent reply other threads:[~2019-09-03 14:35 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-03 12:48 [LTP] [PATCH 1/2] kernel/uevents: Fix compiler errors Jinhui huang
2019-09-03 12:48 ` [LTP] [PATCH 2/2] uevents/uevent03.c: Check if "UI_GET_SYSNAME" is supported Jinhui huang
2019-09-03 14:35 ` Cyril Hrubis [this message]
2019-09-04 14:01 ` Cyril Hrubis
2019-09-05 9:48 ` Yang Xu
2019-09-03 14:25 ` [LTP] [PATCH 1/2] kernel/uevents: Fix compiler errors Cyril Hrubis
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=20190903143513.GA14511@rei.lan \
--to=chrubis@suse.cz \
--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