tests: gpioset: make test cases work with linux v5.1

Make all gpioset test cases work with the recent changes to gpio-mockup
introduced in linux v5.1.

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

diff --git a/tests/tests-gpioset.c b/tests/tests-gpioset.c
index ab7b5147c58423282d4753eace79e0f59a3496cc..c3159a87658ce2da221ae6db3ef889cdcecd6f80 100644 (file)
--- a/tests/tests-gpioset.c
+++ b/tests/tests-gpioset.c
@@ -3,6 +3,7 @@
  * This file is part of libgpiod.
  *
  * Copyright (C) 2017-2018 Bartosz Golaszewski <bartekgola@gmail.com>
+ * Copyright (C) 2019 Bartosz Golaszewski <bgolaszewski@baylibre.com>
  */
 
 /* Test cases for the gpioset program. */
@@ -14,40 +15,28 @@
 
 static void gpioset_set_lines_and_exit(void)
 {
-       unsigned int offsets[8];
-       int rv, values[8];
-
-       test_tool_run("gpioset", test_chip_name(2),
+       test_tool_run("gpioset",
+                     "--mode=signal", test_chip_name(2),
                      "0=0", "1=0", "2=1", "3=1",
                      "4=1", "5=1", "6=0", "7=1", (char *)NULL);
+       usleep(200000);
+
+       TEST_ASSERT_EQ(test_debugfs_get_value(2, 0), 0);
+       TEST_ASSERT_EQ(test_debugfs_get_value(2, 1), 0);
+       TEST_ASSERT_EQ(test_debugfs_get_value(2, 2), 1);
+       TEST_ASSERT_EQ(test_debugfs_get_value(2, 3), 1);
+       TEST_ASSERT_EQ(test_debugfs_get_value(2, 4), 1);
+       TEST_ASSERT_EQ(test_debugfs_get_value(2, 5), 1);
+       TEST_ASSERT_EQ(test_debugfs_get_value(2, 6), 0);
+       TEST_ASSERT_EQ(test_debugfs_get_value(2, 7), 1);
+
+       test_tool_signal(SIGTERM);
        test_tool_wait();
 
        TEST_ASSERT(test_tool_exited());
        TEST_ASSERT_RET_OK(test_tool_exit_status());
        TEST_ASSERT_NULL(test_tool_stdout());
        TEST_ASSERT_NULL(test_tool_stderr());
-
-       offsets[0] = 0;
-       offsets[1] = 1;
-       offsets[2] = 2;
-       offsets[3] = 3;
-       offsets[4] = 4;
-       offsets[5] = 5;
-       offsets[6] = 6;
-       offsets[7] = 7;
-
-       rv = gpiod_ctxless_get_value_multiple(test_chip_name(2), offsets,
-                                             values, 8, false, TEST_CONSUMER);
-       TEST_ASSERT_RET_OK(rv);
-
-       TEST_ASSERT_EQ(values[0], 0);
-       TEST_ASSERT_EQ(values[1], 0);
-       TEST_ASSERT_EQ(values[2], 1);
-       TEST_ASSERT_EQ(values[3], 1);
-       TEST_ASSERT_EQ(values[4], 1);
-       TEST_ASSERT_EQ(values[5], 1);
-       TEST_ASSERT_EQ(values[6], 0);
-       TEST_ASSERT_EQ(values[7], 1);
 }
 TEST_DEFINE(gpioset_set_lines_and_exit,
            "tools: gpioset - set lines and exit",
@@ -55,93 +44,45 @@ TEST_DEFINE(gpioset_set_lines_and_exit,
 
 static void gpioset_set_lines_and_exit_active_low(void)
 {
-       unsigned int offsets[8];
-       int rv, values[8];
-
-       test_tool_run("gpioset", "--active-low", test_chip_name(2),
+       test_tool_run("gpioset",
+                     "--mode=signal", "--active-low", test_chip_name(2),
                      "0=0", "1=0", "2=1", "3=1",
                      "4=1", "5=1", "6=0", "7=1", (char *)NULL);
-       test_tool_wait();
-
-       TEST_ASSERT(test_tool_exited());
-       TEST_ASSERT_RET_OK(test_tool_exit_status());
-       TEST_ASSERT_NULL(test_tool_stdout());
-       TEST_ASSERT_NULL(test_tool_stderr());
-
-       offsets[0] = 0;
-       offsets[1] = 1;
-       offsets[2] = 2;
-       offsets[3] = 3;
-       offsets[4] = 4;
-       offsets[5] = 5;
-       offsets[6] = 6;
-       offsets[7] = 7;
-
-       rv = gpiod_ctxless_get_value_multiple(test_chip_name(2), offsets,
-                                             values, 8, false, TEST_CONSUMER);
-       TEST_ASSERT_RET_OK(rv);
-
-       TEST_ASSERT_EQ(values[0], 1);
-       TEST_ASSERT_EQ(values[1], 1);
-       TEST_ASSERT_EQ(values[2], 0);
-       TEST_ASSERT_EQ(values[3], 0);
-       TEST_ASSERT_EQ(values[4], 0);
-       TEST_ASSERT_EQ(values[5], 0);
-       TEST_ASSERT_EQ(values[6], 1);
-       TEST_ASSERT_EQ(values[7], 0);
-}
-TEST_DEFINE(gpioset_set_lines_and_exit_active_low,
-           "tools: gpioset - set lines and exit (active-low)",
-           0, { 8, 8, 8 });
+       usleep(200000);
 
-static void gpioset_set_lines_and_exit_explicit_mode(void)
-{
-       unsigned int offsets[8];
-       int rv, values[8];
+       TEST_ASSERT_EQ(test_debugfs_get_value(2, 0), 1);
+       TEST_ASSERT_EQ(test_debugfs_get_value(2, 1), 1);
+       TEST_ASSERT_EQ(test_debugfs_get_value(2, 2), 0);
+       TEST_ASSERT_EQ(test_debugfs_get_value(2, 3), 0);
+       TEST_ASSERT_EQ(test_debugfs_get_value(2, 4), 0);
+       TEST_ASSERT_EQ(test_debugfs_get_value(2, 5), 0);
+       TEST_ASSERT_EQ(test_debugfs_get_value(2, 6), 1);
+       TEST_ASSERT_EQ(test_debugfs_get_value(2, 7), 0);
 
-       test_tool_run("gpioset", "--mode=exit", test_chip_name(2),
-                     "0=0", "1=0", "2=1", "3=1",
-                     "4=1", "5=1", "6=0", "7=1", (char *)NULL);
+       test_tool_signal(SIGTERM);
        test_tool_wait();
 
        TEST_ASSERT(test_tool_exited());
        TEST_ASSERT_RET_OK(test_tool_exit_status());
        TEST_ASSERT_NULL(test_tool_stdout());
        TEST_ASSERT_NULL(test_tool_stderr());
-
-       offsets[0] = 0;
-       offsets[1] = 1;
-       offsets[2] = 2;
-       offsets[3] = 3;
-       offsets[4] = 4;
-       offsets[5] = 5;
-       offsets[6] = 6;
-       offsets[7] = 7;
-
-       rv = gpiod_ctxless_get_value_multiple(test_chip_name(2), offsets,
-                                             values, 8, false, TEST_CONSUMER);
-       TEST_ASSERT_RET_OK(rv);
-
-       TEST_ASSERT_EQ(values[0], 0);
-       TEST_ASSERT_EQ(values[1], 0);
-       TEST_ASSERT_EQ(values[2], 1);
-       TEST_ASSERT_EQ(values[3], 1);
-       TEST_ASSERT_EQ(values[4], 1);
-       TEST_ASSERT_EQ(values[5], 1);
-       TEST_ASSERT_EQ(values[6], 0);
-       TEST_ASSERT_EQ(values[7], 1);
 }
-TEST_DEFINE(gpioset_set_lines_and_exit_explicit_mode,
-           "tools: gpioset - set lines and exit (explicit mode argument)",
+TEST_DEFINE(gpioset_set_lines_and_exit_active_low,
+           "tools: gpioset - set lines and exit (active-low)",
            0, { 8, 8, 8 });
 
 static void gpioset_set_some_lines_and_wait_for_enter(void)
 {
-       unsigned int offsets[5];
-       int rv, values[5];
-
        test_tool_run("gpioset", "--mode=wait", test_chip_name(2),
                      "1=0", "2=1", "5=1", "6=0", "7=1", (char *)NULL);
+       usleep(200000);
+
+       TEST_ASSERT_EQ(test_debugfs_get_value(2, 1), 0);
+       TEST_ASSERT_EQ(test_debugfs_get_value(2, 2), 1);
+       TEST_ASSERT_EQ(test_debugfs_get_value(2, 5), 1);
+       TEST_ASSERT_EQ(test_debugfs_get_value(2, 6), 0);
+       TEST_ASSERT_EQ(test_debugfs_get_value(2, 7), 1);
+
        test_tool_stdin_write("\n");
        test_tool_wait();
 
@@ -149,22 +90,6 @@ static void gpioset_set_some_lines_and_wait_for_enter(void)
        TEST_ASSERT_RET_OK(test_tool_exit_status());
        TEST_ASSERT_NULL(test_tool_stdout());
        TEST_ASSERT_NULL(test_tool_stderr());
-
-       offsets[0] = 1;
-       offsets[1] = 2;
-       offsets[2] = 5;
-       offsets[3] = 6;
-       offsets[4] = 7;
-
-       rv = gpiod_ctxless_get_value_multiple(test_chip_name(2), offsets,
-                                             values, 5, false, TEST_CONSUMER);
-       TEST_ASSERT_RET_OK(rv);
-
-       TEST_ASSERT_EQ(values[0], 0);
-       TEST_ASSERT_EQ(values[1], 1);
-       TEST_ASSERT_EQ(values[2], 1);
-       TEST_ASSERT_EQ(values[3], 0);
-       TEST_ASSERT_EQ(values[4], 1);
 }
 TEST_DEFINE(gpioset_set_some_lines_and_wait_for_enter,
            "tools: gpioset - set some lines and wait for enter",
@@ -174,13 +99,19 @@ static void gpioset_set_some_lines_and_wait_for_signal(void)
 {
        static const int signals[] = { SIGTERM, SIGINT };
 
-       unsigned int offsets[5], i;
-       int rv, values[5];
+       unsigned int i;
 
        for (i = 0; i < TEST_ARRAY_SIZE(signals); i++) {
                test_tool_run("gpioset", "--mode=signal", test_chip_name(2),
                              "1=0", "2=1", "5=0", "6=0", "7=1", (char *)NULL);
                usleep(200000);
+
+               TEST_ASSERT_EQ(test_debugfs_get_value(2, 1), 0);
+               TEST_ASSERT_EQ(test_debugfs_get_value(2, 2), 1);
+               TEST_ASSERT_EQ(test_debugfs_get_value(2, 5), 0);
+               TEST_ASSERT_EQ(test_debugfs_get_value(2, 6), 0);
+               TEST_ASSERT_EQ(test_debugfs_get_value(2, 7), 1);
+
                test_tool_signal(signals[i]);
                test_tool_wait();
 
@@ -188,23 +119,6 @@ static void gpioset_set_some_lines_and_wait_for_signal(void)
                TEST_ASSERT_RET_OK(test_tool_exit_status());
                TEST_ASSERT_NULL(test_tool_stdout());
                TEST_ASSERT_NULL(test_tool_stderr());
-
-               offsets[0] = 1;
-               offsets[1] = 2;
-               offsets[2] = 5;
-               offsets[3] = 6;
-               offsets[4] = 7;
-
-               rv = gpiod_ctxless_get_value_multiple(test_chip_name(2),
-                                                     offsets, values,
-                                                     5, false, TEST_CONSUMER);
-               TEST_ASSERT_RET_OK(rv);
-
-               TEST_ASSERT_EQ(values[0], 0);
-               TEST_ASSERT_EQ(values[1], 1);
-               TEST_ASSERT_EQ(values[2], 0);
-               TEST_ASSERT_EQ(values[3], 0);
-               TEST_ASSERT_EQ(values[4], 1);
        }
 }
 TEST_DEFINE(gpioset_set_some_lines_and_wait_for_signal,
@@ -213,31 +127,21 @@ TEST_DEFINE(gpioset_set_some_lines_and_wait_for_signal,
 
 static void gpioset_set_some_lines_and_wait_time(void)
 {
-       unsigned int offsets[3];
-       int rv, values[3];
-
        test_tool_run("gpioset", "--mode=time",
-                     "--usec=100000", "--sec=0", test_chip_name(0),
+                     "--usec=600000", "--sec=0", test_chip_name(0),
                      "1=1", "2=0", "5=1", (char *)NULL);
        usleep(200000);
+
+       TEST_ASSERT_EQ(test_debugfs_get_value(0, 1), 1);
+       TEST_ASSERT_EQ(test_debugfs_get_value(0, 2), 0);
+       TEST_ASSERT_EQ(test_debugfs_get_value(0, 5), 1);
+
        test_tool_wait();
 
        TEST_ASSERT(test_tool_exited());
        TEST_ASSERT_RET_OK(test_tool_exit_status());
        TEST_ASSERT_NULL(test_tool_stdout());
        TEST_ASSERT_NULL(test_tool_stderr());
-
-       offsets[0] = 1;
-       offsets[1] = 2;
-       offsets[2] = 5;
-
-       rv = gpiod_ctxless_get_value_multiple(test_chip_name(0), offsets,
-                                             values, 3, false, TEST_CONSUMER);
-       TEST_ASSERT_RET_OK(rv);
-
-       TEST_ASSERT_EQ(values[0], 1);
-       TEST_ASSERT_EQ(values[1], 0);
-       TEST_ASSERT_EQ(values[2], 1);
 }
 TEST_DEFINE(gpioset_set_some_lines_and_wait_time,
            "tools: gpioset - set some lines and wait for specified time",