tests: don't allow to generate events of the same type subsequently

Since linux v5.1 the state of simulated lines is tracked by the kernel
and it's no longer possible to generate two subsequent events of the
same type (e.g. two rising edge events one after another). Drop the
event_type parameter from test_set_event() and adjust all users.

Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>

diff --git a/tests/gpiod-test.c b/tests/gpiod-test.c
index 9cb907295584b77d877ea68117c849acb0d9cefe..0ffda44ab77744e660179ec0c355d5da6b7182b1 100644 (file)
--- a/tests/gpiod-test.c
+++ b/tests/gpiod-test.c
@@ -49,7 +49,6 @@ struct event_thread {
        unsigned int chip_index;
        unsigned int line_offset;
        unsigned int freq;
-       int event_type;
 };
 
 struct gpiotool_proc {
@@ -388,12 +387,7 @@ static void *event_worker(void *data TEST_UNUSED)
                        if (fd < 0)
                                die_perr("error opening gpio event file");
 
-                       if (ev->event_type == TEST_EVENT_RISING)
-                               buf = '1';
-                       else if (ev->event_type == TEST_EVENT_FALLING)
-                               buf = '0';
-                       else
-                               buf = i % 2 == 0 ? '1' : '0';
+                       buf = i % 2 == 0 ? '1' : '0';
 
                        rd = write(fd, &buf, 1);
                        close(fd);
@@ -1150,8 +1144,8 @@ void _test_print_failed(const char *fmt, ...)
        globals.test_ctx.test_failed = true;
 }
 
-void test_set_event(unsigned int chip_index, unsigned int line_offset,
-                   int event_type, unsigned int freq)
+void test_set_event(unsigned int chip_index,
+                   unsigned int line_offset, unsigned int freq)
 {
        struct event_thread *ev = &globals.test_ctx.event;
        int rv;
@@ -1169,7 +1163,6 @@ void test_set_event(unsigned int chip_index, unsigned int line_offset,
 
        ev->chip_index = chip_index;
        ev->line_offset = line_offset;
-       ev->event_type = event_type;
        ev->freq = freq;
 
        pthread_cond_broadcast(&ev->cond);

diff --git a/tests/gpiod-test.h b/tests/gpiod-test.h
index 7b024080097e70c3c62391a658d0eac86a97bdbe..b97cd476e75f95b983009ecc9003ce9a7531a261 100644 (file)
--- a/tests/gpiod-test.h
+++ b/tests/gpiod-test.h
@@ -93,14 +93,8 @@ const char *test_chip_path(unsigned int index);
 const char *test_chip_name(unsigned int index);
 unsigned int test_chip_num(unsigned int index);
 
-enum {
-       TEST_EVENT_FALLING,
-       TEST_EVENT_RISING,
-       TEST_EVENT_ALTERNATING,
-};
-
-void test_set_event(unsigned int chip_index, unsigned int line_offset,
-                   int event_type, unsigned int freq);
+void test_set_event(unsigned int chip_index,
+                   unsigned int line_offset, unsigned int freq);
 
 void test_tool_run(char *tool, ...);
 void test_tool_wait(void);

diff --git a/tests/tests-ctxless.c b/tests/tests-ctxless.c
index 638274fd10c4b743ae514fc2ef07f351db2fc223..1f637dd30e06538d9f3523e19fb1950701687269 100644 (file)
--- a/tests/tests-ctxless.c
+++ b/tests/tests-ctxless.c
@@ -148,7 +148,7 @@ static void ctxless_event_monitor(void)
        struct timespec ts = { 1, 0 };
        int rv;
 
-       test_set_event(0, 3, TEST_EVENT_ALTERNATING, 100);
+       test_set_event(0, 3, 100);
 
        rv = gpiod_ctxless_event_monitor(test_chip_name(0),
                                         GPIOD_CTXLESS_EVENT_BOTH_EDGES,
@@ -171,7 +171,7 @@ static void ctxless_event_monitor_single_event_type(void)
        struct timespec ts = { 1, 0 };
        int rv;
 
-       test_set_event(0, 3, TEST_EVENT_ALTERNATING, 100);
+       test_set_event(0, 3, 100);
 
        rv = gpiod_ctxless_event_monitor(test_chip_name(0),
                                         GPIOD_CTXLESS_EVENT_FALLING_EDGE,
@@ -200,7 +200,7 @@ static void ctxless_event_monitor_multiple(void)
        offsets[2] = 5;
        offsets[3] = 6;
 
-       test_set_event(0, 3, TEST_EVENT_ALTERNATING, 100);
+       test_set_event(0, 3, 100);
 
        rv = gpiod_ctxless_event_monitor_multiple(
                                        test_chip_name(0),
@@ -233,7 +233,7 @@ static void ctxless_event_monitor_indicate_error(void)
        struct timespec ts = { 1, 0 };
        int rv;
 
-       test_set_event(0, 3, TEST_EVENT_ALTERNATING, 100);
+       test_set_event(0, 3, 100);
 
        rv = gpiod_ctxless_event_monitor(test_chip_name(0),
                                         GPIOD_CTXLESS_EVENT_BOTH_EDGES,

diff --git a/tests/tests-event.c b/tests/tests-event.c
index 93e53a4da89e63b42cb935272d03d3dc00d51eb0..af80904135785e11dc9dad0a511f0fc221719f8e 100644 (file)
--- a/tests/tests-event.c
+++ b/tests/tests-event.c
@@ -29,7 +29,7 @@ static void event_rising_edge_good(void)
        rv = gpiod_line_request_rising_edge_events(line, TEST_CONSUMER);
        TEST_ASSERT_RET_OK(rv);
 
-       test_set_event(0, 7, TEST_EVENT_RISING, 100);
+       test_set_event(0, 7, 100);
 
        rv = gpiod_line_event_wait(line, &ts);
        TEST_ASSERT_EQ(rv, 1);
@@ -60,7 +60,7 @@ static void event_falling_edge_good(void)
        rv = gpiod_line_request_falling_edge_events(line, TEST_CONSUMER);
        TEST_ASSERT_RET_OK(rv);
 
-       test_set_event(0, 7, TEST_EVENT_FALLING, 100);
+       test_set_event(0, 7, 100);
 
        rv = gpiod_line_event_wait(line, &ts);
        TEST_ASSERT_EQ(rv, 1);
@@ -90,7 +90,7 @@ static void event_rising_edge_ignore_falling(void)
        rv = gpiod_line_request_rising_edge_events(line, TEST_CONSUMER);
        TEST_ASSERT_RET_OK(rv);
 
-       test_set_event(0, 7, TEST_EVENT_FALLING, 100);
+       test_set_event(0, 7, 100);
 
        rv = gpiod_line_event_wait(line, &ts);
        TEST_ASSERT_EQ(rv, 0);
@@ -117,7 +117,7 @@ static void event_rising_edge_active_low(void)
                                        GPIOD_LINE_REQUEST_FLAG_ACTIVE_LOW);
        TEST_ASSERT_RET_OK(rv);
 
-       test_set_event(0, 7, TEST_EVENT_RISING, 100);
+       test_set_event(0, 7, 100);
 
        rv = gpiod_line_event_wait(line, &ts);
        TEST_ASSERT_EQ(rv, 1);
@@ -151,7 +151,7 @@ static void event_get_value(void)
        rv = gpiod_line_get_value(line);
        TEST_ASSERT_EQ(rv, 0);
 
-       test_set_event(0, 7, TEST_EVENT_RISING, 100);
+       test_set_event(0, 7, 100);
 
        rv = gpiod_line_event_wait(line, &ts);
        TEST_ASSERT_EQ(rv, 1);
@@ -189,7 +189,7 @@ static void event_get_value_active_low(void)
        rv = gpiod_line_get_value(line);
        TEST_ASSERT_EQ(rv, 1);
 
-       test_set_event(0, 7, TEST_EVENT_FALLING, 100);
+       test_set_event(0, 7, 100);
 
        rv = gpiod_line_event_wait(line, &ts);
        TEST_ASSERT_EQ(rv, 1);
@@ -229,7 +229,7 @@ static void event_wait_multiple(void)
        rv = gpiod_line_request_bulk_both_edges_events(&bulk, TEST_CONSUMER);
        TEST_ASSERT_RET_OK(rv);
 
-       test_set_event(0, 4, TEST_EVENT_RISING, 100);
+       test_set_event(0, 4, 100);
 
        rv = gpiod_line_event_wait_bulk(&bulk, &ts, &event_bulk);
        TEST_ASSERT_EQ(rv, 1);

diff --git a/tests/tests-gpiomon.c b/tests/tests-gpiomon.c
index fd2139151882760adb4cfa1755e0717881f61227..a251be6667e813abdfb2264c6f7f0b5cf6bb4680 100644 (file)
--- a/tests/tests-gpiomon.c
+++ b/tests/tests-gpiomon.c
@@ -16,7 +16,7 @@ static void gpiomon_single_rising_edge_event(void)
 {
        test_tool_run("gpiomon", "--rising-edge", "--num-events=1",
                      test_chip_name(1), "4", (char *)NULL);
-       test_set_event(1, 4, TEST_EVENT_RISING, 200);
+       test_set_event(1, 4, 200);
        test_tool_wait();
 
        TEST_ASSERT(test_tool_exited());
@@ -34,7 +34,7 @@ static void gpiomon_single_rising_edge_event_active_low(void)
 {
        test_tool_run("gpiomon", "--rising-edge", "--num-events=1",
                      "--active-low", test_chip_name(1), "4", (char *)NULL);
-       test_set_event(1, 4, TEST_EVENT_RISING, 200);
+       test_set_event(1, 4, 200);
        test_tool_wait();
 
        TEST_ASSERT(test_tool_exited());
@@ -52,7 +52,7 @@ static void gpiomon_single_rising_edge_event_silent(void)
 {
        test_tool_run("gpiomon", "--rising-edge", "--num-events=1",
                      "--silent", test_chip_name(1), "4", (char *)NULL);
-       test_set_event(1, 4, TEST_EVENT_RISING, 200);
+       test_set_event(1, 4, 200);
        test_tool_wait();
 
        TEST_ASSERT(test_tool_exited());
@@ -68,7 +68,7 @@ static void gpiomon_four_alternating_events(void)
 {
        test_tool_run("gpiomon", "--num-events=4",
                      test_chip_name(1), "4", (char *)NULL);
-       test_set_event(1, 4, TEST_EVENT_ALTERNATING, 100);
+       test_set_event(1, 4, 100);
        test_tool_wait();
 
        TEST_ASSERT(test_tool_exited());
@@ -88,7 +88,7 @@ static void gpiomon_falling_edge_events_sigint(void)
 {
        test_tool_run("gpiomon", "--falling-edge",
                      test_chip_name(0), "4", (char *)NULL);
-       test_set_event(0, 4, TEST_EVENT_FALLING, 100);
+       test_set_event(0, 4, 100);
        usleep(200000);
        test_tool_signal(SIGINT);
        test_tool_wait();
@@ -108,7 +108,7 @@ static void gpiomon_both_events_sigterm(void)
 {
        test_tool_run("gpiomon", "--falling-edge", "--rising-edge",
                      test_chip_name(0), "4", (char *)NULL);
-       test_set_event(0, 4, TEST_EVENT_ALTERNATING, 100);
+       test_set_event(0, 4, 100);
        usleep(300000);
        test_tool_signal(SIGTERM);
        test_tool_wait();
@@ -130,11 +130,11 @@ static void gpiomon_watch_multiple_lines(void)
 {
        test_tool_run("gpiomon", "--format=%o", test_chip_name(0),
                      "1", "2", "3", "4", "5", (char *)NULL);
-       test_set_event(0, 2, TEST_EVENT_ALTERNATING, 100);
+       test_set_event(0, 2, 100);
        usleep(150000);
-       test_set_event(0, 3, TEST_EVENT_ALTERNATING, 100);
+       test_set_event(0, 3, 100);
        usleep(150000);
-       test_set_event(0, 4, TEST_EVENT_ALTERNATING, 100);
+       test_set_event(0, 4, 100);
        usleep(150000);
        test_tool_signal(SIGTERM);
        test_tool_wait();
@@ -154,11 +154,11 @@ static void gpiomon_watch_multiple_lines_not_in_order(void)
 {
        test_tool_run("gpiomon", "--format=%o", test_chip_name(0),
                      "5", "2", "7", "1", "6", (char *)NULL);
-       test_set_event(0, 2, TEST_EVENT_ALTERNATING, 100);
+       test_set_event(0, 2, 100);
        usleep(150000);
-       test_set_event(0, 1, TEST_EVENT_ALTERNATING, 100);
+       test_set_event(0, 1, 100);
        usleep(150000);
-       test_set_event(0, 6, TEST_EVENT_ALTERNATING, 100);
+       test_set_event(0, 6, 100);
        usleep(150000);
        test_tool_signal(SIGTERM);
        test_tool_wait();
@@ -242,7 +242,7 @@ static void gpiomon_custom_format_event_and_offset(void)
 {
        test_tool_run("gpiomon", "--num-events=1", "--format=%e %o",
                      test_chip_name(0), "3", (char *)NULL);
-       test_set_event(0, 3, TEST_EVENT_RISING, 100);
+       test_set_event(0, 3, 100);
        test_tool_wait();
 
        TEST_ASSERT(test_tool_exited());
@@ -259,7 +259,7 @@ static void gpiomon_custom_format_event_and_offset_joined(void)
 {
        test_tool_run("gpiomon", "--num-events=1", "--format=%e%o",
                      test_chip_name(0), "3", (char *)NULL);
-       test_set_event(0, 3, TEST_EVENT_RISING, 100);
+       test_set_event(0, 3, 100);
        test_tool_wait();
 
        TEST_ASSERT(test_tool_exited());
@@ -276,7 +276,7 @@ static void gpiomon_custom_format_timestamp(void)
 {
        test_tool_run("gpiomon", "--num-events=1", "--format=%e %o %s.%n",
                      test_chip_name(0), "3", (char *)NULL);
-       test_set_event(0, 3, TEST_EVENT_RISING, 100);
+       test_set_event(0, 3, 100);
        test_tool_wait();
 
        TEST_ASSERT(test_tool_exited());
@@ -293,7 +293,7 @@ static void gpiomon_custom_format_double_percent_sign(void)
 {
        test_tool_run("gpiomon", "--num-events=1", "--format=%%",
                      test_chip_name(0), "3", (char *)NULL);
-       test_set_event(0, 3, TEST_EVENT_RISING, 100);
+       test_set_event(0, 3, 100);
        test_tool_wait();
 
        TEST_ASSERT(test_tool_exited());
@@ -310,7 +310,7 @@ static void gpiomon_custom_format_double_percent_sign_and_spec(void)
 {
        test_tool_run("gpiomon", "--num-events=1", "--format=%%e",
                      test_chip_name(0), "3", (char *)NULL);
-       test_set_event(0, 3, TEST_EVENT_RISING, 100);
+       test_set_event(0, 3, 100);
        test_tool_wait();
 
        TEST_ASSERT(test_tool_exited());
@@ -327,7 +327,7 @@ static void gpiomon_custom_format_single_percent_sign(void)
 {
        test_tool_run("gpiomon", "--num-events=1", "--format=%",
                      test_chip_name(0), "3", (char *)NULL);
-       test_set_event(0, 3, TEST_EVENT_RISING, 100);
+       test_set_event(0, 3, 100);
        test_tool_wait();
 
        TEST_ASSERT(test_tool_exited());
@@ -344,7 +344,7 @@ static void gpiomon_custom_format_single_percent_sign_between_chars(void)
 {
        test_tool_run("gpiomon", "--num-events=1", "--format=foo % bar",
                      test_chip_name(0), "3", (char *)NULL);
-       test_set_event(0, 3, TEST_EVENT_RISING, 100);
+       test_set_event(0, 3, 100);
        test_tool_wait();
 
        TEST_ASSERT(test_tool_exited());
@@ -361,7 +361,7 @@ static void gpiomon_custom_format_unknown_specifier(void)
 {
        test_tool_run("gpiomon", "--num-events=1", "--format=%x",
                      test_chip_name(0), "3", (char *)NULL);
-       test_set_event(0, 3, TEST_EVENT_RISING, 100);
+       test_set_event(0, 3, 100);
        test_tool_wait();
 
        TEST_ASSERT(test_tool_exited());