[LTP] [PATCH v2 6/7] Refactor input06 test
Andrea Cervesato
andrea.cervesato@suse.de
Mon Dec 2 11:12:50 CET 2024
From: Andrea Cervesato <andrea.cervesato@suse.com>
Signed-off-by: Andrea Cervesato <andrea.cervesato@suse.com>
---
testcases/kernel/input/Makefile | 5 +-
testcases/kernel/input/input06.c | 190 ++++++++++++++++-----------------------
2 files changed, 79 insertions(+), 116 deletions(-)
diff --git a/testcases/kernel/input/Makefile b/testcases/kernel/input/Makefile
index a37aa28fc27688901e0555a0338395a681b45b39..945299a13bfcecc3eeae029931ef5ae44781b7ad 100644
--- a/testcases/kernel/input/Makefile
+++ b/testcases/kernel/input/Makefile
@@ -7,9 +7,6 @@ LTPLIBS = uinput
include $(top_srcdir)/include/mk/testcases.mk
-FILTER_OUT_MAKE_TARGETS := input_helper
-input01 input02 input03 input04 input05: LDLIBS += -lltpuinput
-
-input06: %: input_helper.o
+LDLIBS += -lltpuinput
include $(top_srcdir)/include/mk/generic_leaf_target.mk
diff --git a/testcases/kernel/input/input06.c b/testcases/kernel/input/input06.c
index b698c277d875ed2df8a0f07a88784997944eeee4..5527e160c4569a94d5b5f50da3dc3360143f231d 100644
--- a/testcases/kernel/input/input06.c
+++ b/testcases/kernel/input/input06.c
@@ -1,102 +1,30 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
/*
* Copyright (c) 2015 Cedric Hnyda <chnyda@suse.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it would be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * Copyright (C) 2024 SUSE LLC Andrea Cervesato <andrea.cervesato@suse.com>
*/
- /*
- * Create a virtual device, activate auto-repeat and
- * and check that auto repeat is working
- */
+/*\
+ * [Description]
+ *
+ * Verify that auto-repeat is working on a virtual device, that in our case
+ * it's a mouse.
+ */
-#include <linux/input.h>
#include <linux/uinput.h>
-#include <linux/kd.h>
-
-#include "test.h"
-#include "safe_macros.h"
-#include "lapi/fcntl.h"
-#include "input_helper.h"
-static void setup(void);
-static void send_events(void);
-static int check_events(void);
-static void cleanup(void);
+#include "input_common.h"
-static int fd;
-static int fd2;
struct input_event events[64];
static int num_events;
static int ev_iter;
-
-char *TCID = "input06";
-
-int main(int ac, char **av)
-{
- int lc;
- int pid;
-
- tst_parse_opts(ac, av, NULL, NULL);
-
- setup();
-
- for (lc = 0; TEST_LOOPING(lc); ++lc) {
- pid = tst_fork();
-
- switch (pid) {
- case 0:
- send_events();
- exit(0);
- case -1:
- tst_brkm(TBROK | TERRNO, cleanup, "fork() failed");
- default:
- if (!check_events())
- tst_resm(TFAIL,
- "Wrong data received in eventX");
- else
- tst_resm(TPASS, "Data received in eventX");
- break;
- }
-
- SAFE_WAITPID(NULL, pid, NULL, 0);
- }
-
- cleanup();
- tst_exit();
-}
-
-static void setup(void)
-{
- tst_require_root();
-
- fd = open_uinput();
-
- SAFE_IOCTL(NULL, fd, UI_SET_EVBIT, EV_KEY);
- SAFE_IOCTL(NULL, fd, UI_SET_EVBIT, EV_REP);
- SAFE_IOCTL(NULL, fd, UI_SET_KEYBIT, KEY_X);
-
- create_device(fd);
-
- fd2 = open_device();
- SAFE_IOCTL(NULL, fd2, EVIOCGRAB, 1);
-}
+static int fd_send = -1;
+static int fd_recv = -1;
static void send_events(void)
{
- send_event(fd, EV_KEY, KEY_X, 1);
- send_event(fd, EV_SYN, 0, 0);
+ send_event(fd_send, EV_KEY, KEY_X, 1);
+ send_event(fd_send, EV_SYN, 0, 0);
/*
* Sleep long enough to keep the key pressed for some time
@@ -106,8 +34,8 @@ static void send_events(void)
*/
usleep(500000);
- send_event(fd, EV_KEY, KEY_X, 0);
- send_event(fd, EV_SYN, 0, 0);
+ send_event(fd_send, EV_KEY, KEY_X, 0);
+ send_event(fd_send, EV_SYN, 0, 0);
}
static int check_event(struct input_event *iev, int event, int code, int value)
@@ -117,20 +45,18 @@ static int check_event(struct input_event *iev, int event, int code, int value)
static void read_events(void)
{
- int rd = read(fd2, events, sizeof(events));
- if (rd < 0)
- tst_brkm(TBROK | TERRNO, cleanup, "read() failed");
+ int num_bytes = SAFE_READ(0, fd_recv, events, sizeof(events));
- if (rd == 0)
- tst_brkm(TBROK, cleanup, "Failed to read events");
+ if (!num_bytes)
+ tst_brk(TBROK, "Failed to read events");
- if (rd % sizeof(struct input_event) != 0) {
- tst_brkm(TBROK, cleanup, "read size %i not multiple of %zu",
- rd, sizeof(struct input_event));
+ if (num_bytes % sizeof(struct input_event) != 0) {
+ tst_brk(TBROK, "Read size %i is not multiple of %zu",
+ num_bytes, sizeof(struct input_event));
}
ev_iter = 0;
- num_events = rd / sizeof(struct input_event);
+ num_events = num_bytes / sizeof(struct input_event);
}
static int have_events(void)
@@ -146,29 +72,37 @@ static struct input_event *next_event(void)
return &events[ev_iter++];
}
+static int check_event_code(struct input_event *iev, int event, int code)
+{
+ return iev->type == event && iev->code == code;
+}
+
static int parse_autorepeat_config(struct input_event *iev)
{
if (!check_event_code(iev, EV_REP, REP_DELAY)) {
- tst_resm(TFAIL,
- "Didn't get EV_REP configuration with code REP_DELAY");
+ tst_res(TFAIL, "Didn't get EV_REP type with REP_DELAY code");
return 0;
}
if (!check_event_code(next_event(), EV_REP, REP_PERIOD)) {
- tst_resm(TFAIL,
- "Didn't get EV_REP configuration with code REP_PERIOD");
+ tst_res(TFAIL, "Didn't get EV_REP type with REP_PERIOD code");
return 0;
}
return 1;
}
+static int check_sync_event(struct input_event *iev)
+{
+ return check_event_code(iev, EV_SYN, SYN_REPORT);
+}
+
static int parse_key(struct input_event *iev)
{
int autorep_count = 0;
if (!check_event(iev, EV_KEY, KEY_X, 1) || !check_sync_event(next_event())) {
- tst_resm(TFAIL, "Didn't get expected key press for KEY_X");
+ tst_res(TFAIL, "Didn't get expected key press for KEY_X");
return 0;
}
@@ -180,19 +114,16 @@ static int parse_key(struct input_event *iev)
/* make sure we have at least one auto-repeated key event */
if (!autorep_count) {
- tst_resm(TFAIL,
- "Didn't get autorepeat events for the key - KEY_X");
+ tst_res(TFAIL, "Didn't get autorepeat events for the key - KEY_X");
return 0;
}
if (!check_event(iev, EV_KEY, KEY_X, 0) || !check_sync_event(next_event())) {
- tst_resm(TFAIL,
- "Didn't get expected key release for KEY_X");
+ tst_res(TFAIL, "Didn't get expected key release for KEY_X");
return 0;
}
- tst_resm(TINFO,
- "Received %d repititions for KEY_X", autorep_count);
+ tst_res(TINFO, "Received %d repetitions for KEY_X", autorep_count);
return 1;
}
@@ -218,8 +149,7 @@ static int check_events(void)
rep_keys_done = 1;
break;
default:
- tst_resm(TFAIL,
- "Unexpected event type '0x%04x' received",
+ tst_res(TFAIL, "Unexpected event type '0x%04x' received",
iev->type);
ret = 0;
break;
@@ -232,10 +162,46 @@ static int check_events(void)
return ret;
}
+static void run(void)
+{
+ if (!SAFE_FORK()) {
+ send_events();
+ exit(0);
+ }
+
+ if (!check_events())
+ tst_res(TFAIL, "Wrong data received from input device");
+ else
+ tst_res(TPASS, "Data received from input device");
+}
+
+static void setup(void)
+{
+ fd_send = open_uinput();
+
+ SAFE_IOCTL(fd_send, UI_SET_EVBIT, EV_KEY);
+ SAFE_IOCTL(fd_send, UI_SET_EVBIT, EV_REP);
+ SAFE_IOCTL(fd_send, UI_SET_KEYBIT, KEY_X);
+
+ create_input_device(fd_send);
+
+ fd_recv = open_event_device();
+ SAFE_IOCTL(fd_recv, EVIOCGRAB, 1);
+}
+
static void cleanup(void)
{
- if (fd2 > 0 && close(fd2))
- tst_resm(TWARN | TERRNO, "close(fd2) failed");
+ if (fd_send != -1)
+ destroy_input_device(fd_send);
- destroy_device(fd);
+ if (fd_recv != -1)
+ SAFE_CLOSE(fd_recv);
}
+
+static struct tst_test test = {
+ .test_all = run,
+ .setup = setup,
+ .cleanup = cleanup,
+ .needs_root = 1,
+ .forks_child = 1,
+};
--
2.43.0
More information about the ltp
mailing list