From: Bartosz Golaszewski Date: Wed, 14 Jun 2017 08:11:27 +0000 (+0200) Subject: tests: don't hardcode the chip names X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=2fad2a8827479ecc6f65ddd00880339026b6753c;p=qemu-gpiodev%2Flibgpiod.git tests: don't hardcode the chip names Use test_chip_name() to get the name of a chip. Don't hardcode it as it will make the tests not work if any gpiochips other than the ones created by gpio-mockup already exist in the system. This also fixes a couple hidden bugs, where we requested inexistent chips in tools' command-line arguments. Signed-off-by: Bartosz Golaszewski --- diff --git a/tests/tests-gpioget.c b/tests/tests-gpioget.c index 7cd73c5..e5ebc70 100644 --- a/tests/tests-gpioget.c +++ b/tests/tests-gpioget.c @@ -15,7 +15,7 @@ static void gpioget_read_all_lines(void) unsigned int offsets[4]; int rv, values[4]; - test_tool_run("gpioget", "gpiochip1", + test_tool_run("gpioget", test_chip_name(1), "0", "1", "2", "3", "4", "5", "6", "7", (char *)NULL); test_tool_wait(); @@ -37,7 +37,7 @@ static void gpioget_read_all_lines(void) NULL, NULL); TEST_ASSERT_RET_OK(rv); - test_tool_run("gpioget", "gpiochip1", + test_tool_run("gpioget", test_chip_name(1), "0", "1", "2", "3", "4", "5", "6", "7", (char *)NULL); test_tool_wait(); @@ -56,7 +56,7 @@ static void gpioget_read_all_lines_active_low(void) unsigned int offsets[4]; int rv, values[4]; - test_tool_run("gpioget", "--active-low", "gpiochip1", + test_tool_run("gpioget", "--active-low", test_chip_name(1), "0", "1", "2", "3", "4", "5", "6", "7", (char *)NULL); test_tool_wait(); @@ -78,7 +78,7 @@ static void gpioget_read_all_lines_active_low(void) NULL, NULL); TEST_ASSERT_RET_OK(rv); - test_tool_run("gpioget", "--active-low", "gpiochip1", + test_tool_run("gpioget", "--active-low", test_chip_name(1), "0", "1", "2", "3", "4", "5", "6", "7", (char *)NULL); test_tool_wait(); @@ -97,7 +97,7 @@ static void gpioget_read_some_lines(void) unsigned int offsets[3]; int rv, values[3]; - test_tool_run("gpioget", "gpiochip1", + test_tool_run("gpioget", test_chip_name(1), "0", "1", "4", "6", (char *)NULL); test_tool_wait(); @@ -118,7 +118,7 @@ static void gpioget_read_some_lines(void) NULL, NULL); TEST_ASSERT_RET_OK(rv); - test_tool_run("gpioget", "gpiochip1", + test_tool_run("gpioget", test_chip_name(1), "0", "1", "4", "6", (char *)NULL); test_tool_wait(); @@ -150,7 +150,7 @@ TEST_DEFINE(gpioget_no_arguments, static void gpioget_no_lines_specified(void) { - test_tool_run("gpioget", "gpiochip1", (char *)NULL); + test_tool_run("gpioget", test_chip_name(1), (char *)NULL); test_tool_wait(); TEST_ASSERT(test_tool_exited()); @@ -166,7 +166,7 @@ TEST_DEFINE(gpioget_no_lines_specified, static void gpioget_too_many_lines_specified(void) { - test_tool_run("gpioget", "gpiochip1", + test_tool_run("gpioget", test_chip_name(0), "0", "1", "2", "3", "4", (char *)NULL); test_tool_wait(); diff --git a/tests/tests-gpioinfo.c b/tests/tests-gpioinfo.c index 82a3ad7..9a83e56 100644 --- a/tests/tests-gpioinfo.c +++ b/tests/tests-gpioinfo.c @@ -70,7 +70,7 @@ TEST_DEFINE(gpioinfo_dump_all_chips_one_exported, static void gpioinfo_dump_one_chip(void) { - test_tool_run("gpioinfo", "gpiochip1", (char *)NULL); + test_tool_run("gpioinfo", test_chip_name(1), (char *)NULL); test_tool_wait(); TEST_ASSERT(test_tool_exited()); @@ -89,8 +89,8 @@ TEST_DEFINE(gpioinfo_dump_one_chip, static void gpioinfo_dump_all_but_one_chip(void) { - test_tool_run("gpioinfo", "gpiochip0", - "gpiochip1", "gpiochip3", (char *)NULL); + test_tool_run("gpioinfo", test_chip_name(0), + test_chip_name(1), test_chip_name(3), (char *)NULL); test_tool_wait(); TEST_ASSERT(test_tool_exited()); diff --git a/tests/tests-gpioset.c b/tests/tests-gpioset.c index b702215..1001d8c 100644 --- a/tests/tests-gpioset.c +++ b/tests/tests-gpioset.c @@ -18,7 +18,7 @@ static void gpioset_set_lines_and_exit(void) unsigned int offsets[8]; int rv, values[8]; - test_tool_run("gpioset", "gpiochip2", + test_tool_run("gpioset", 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(); @@ -59,7 +59,7 @@ static void gpioset_set_lines_and_exit_active_low(void) unsigned int offsets[8]; int rv, values[8]; - test_tool_run("gpioset", "--active-low", "gpiochip2", + test_tool_run("gpioset", "--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(); @@ -100,7 +100,7 @@ static void gpioset_set_lines_and_exit_explicit_mode(void) unsigned int offsets[8]; int rv, values[8]; - test_tool_run("gpioset", "--mode=exit", "gpiochip2", + 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_wait(); @@ -141,7 +141,7 @@ 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", "gpiochip2", + test_tool_run("gpioset", "--mode=wait", test_chip_name(2), "1=0", "2=1", "5=1", "6=0", "7=1", (char *)NULL); test_tool_stdin_write("\n"); test_tool_wait(); @@ -179,7 +179,7 @@ static void gpioset_set_some_lines_and_wait_for_signal(void) int rv, values[5]; for (i = 0; i < TEST_ARRAY_SIZE(signals); i++) { - test_tool_run("gpioset", "--mode=signal", "gpiochip2", + 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_tool_signal(signals[i]); @@ -219,7 +219,7 @@ static void gpioset_set_some_lines_and_wait_time(void) int rv, values[3]; test_tool_run("gpioset", "--mode=time", - "--usec=100000", "--sec=0", "gpiochip0", + "--usec=100000", "--sec=0", test_chip_name(0), "1=1", "2=0", "5=1", (char *)NULL); usleep(200000); test_tool_wait(); @@ -263,7 +263,7 @@ TEST_DEFINE(gpioset_no_arguments, static void gpioset_no_lines_specified(void) { - test_tool_run("gpioset", "gpiochip1", (char *)NULL); + test_tool_run("gpioset", test_chip_name(1), (char *)NULL); test_tool_wait(); TEST_ASSERT(test_tool_exited()); @@ -279,7 +279,7 @@ TEST_DEFINE(gpioset_no_lines_specified, static void gpioset_too_many_lines_specified(void) { - test_tool_run("gpioset", "gpiochip1", + test_tool_run("gpioset", test_chip_name(0), "0=1", "1=1", "2=1", "3=1", "4=1", (char *)NULL); test_tool_wait(); @@ -297,7 +297,7 @@ TEST_DEFINE(gpioset_too_many_lines_specified, static void gpioset_sec_usec_without_time(void) { test_tool_run("gpioset", "--mode=exit", "--sec=1", - "gpiochip1", "0=1", (char *)NULL); + test_chip_name(0), "0=1", (char *)NULL); test_tool_wait(); TEST_ASSERT(test_tool_exited()); @@ -308,7 +308,7 @@ static void gpioset_sec_usec_without_time(void) "can't specify seconds in this mode"); test_tool_run("gpioset", "--mode=exit", "--usec=100", - "gpiochip1", "0=1", (char *)NULL); + test_chip_name(0), "0=1", (char *)NULL); test_tool_wait(); TEST_ASSERT(test_tool_exited()); @@ -324,7 +324,7 @@ TEST_DEFINE(gpioset_sec_usec_without_time, static void gpioset_invalid_mapping(void) { - test_tool_run("gpioset", "gpiochip0", "0=c", (char *)NULL); + test_tool_run("gpioset", test_chip_name(0), "0=c", (char *)NULL); test_tool_wait(); TEST_ASSERT(test_tool_exited()); @@ -340,7 +340,7 @@ TEST_DEFINE(gpioset_invalid_mapping, static void gpioset_invalid_value(void) { - test_tool_run("gpioset", "gpiochip0", "0=3", (char *)NULL); + test_tool_run("gpioset", test_chip_name(0), "0=3", (char *)NULL); test_tool_wait(); TEST_ASSERT(test_tool_exited()); @@ -355,7 +355,8 @@ TEST_DEFINE(gpioset_invalid_value, static void gpioset_invalid_offset(void) { - test_tool_run("gpioset", "gpiochip0", "4000000000=1", (char *)NULL); + test_tool_run("gpioset", test_chip_name(0), + "4000000000=1", (char *)NULL); test_tool_wait(); TEST_ASSERT(test_tool_exited()); @@ -371,7 +372,7 @@ TEST_DEFINE(gpioset_invalid_offset, static void gpioset_daeminize_in_wrong_mode(void) { test_tool_run("gpioset", "--background", - "gpiochip0", "0=1", (char *)NULL); + test_chip_name(0), "0=1", (char *)NULL); test_tool_wait(); TEST_ASSERT(test_tool_exited());