From: Bartosz Golaszewski Date: Sun, 14 May 2017 09:47:06 +0000 (+0200) Subject: tests: use a default consumer name X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=9ab9b0950bc7a7bf7f3958c81b66c5d51fe6b239;p=qemu-gpiodev%2Flibgpiod.git tests: use a default consumer name We're using the same consumer name everywhere in the tests. Hide it behind a define. Signed-off-by: Bartosz Golaszewski --- diff --git a/tests/gpiod-test.h b/tests/gpiod-test.h index 3b45522..84fa23f 100644 --- a/tests/gpiod-test.h +++ b/tests/gpiod-test.h @@ -14,6 +14,8 @@ #include #include +#define GU_CONSUMER "gpiod-test" + #define GU_INIT __attribute__((constructor)) #define GU_UNUSED __attribute__((unused)) #define GU_PRINTF(fmt, arg) __attribute__((format(printf, fmt, arg))) diff --git a/tests/tests-event.c b/tests/tests-event.c index 5dc9dfe..6f92b94 100644 --- a/tests/tests-event.c +++ b/tests/tests-event.c @@ -24,7 +24,7 @@ static void event_rising_edge_good(void) line = gpiod_chip_get_line(chip, 7); GU_ASSERT_NOT_NULL(line); - status = gpiod_line_event_request_rising(line, "gpiod-unit", false); + status = gpiod_line_event_request_rising(line, GU_CONSUMER, false); GU_ASSERT_RET_OK(status); gu_set_event(0, 7, GU_EVENT_RISING, 100); @@ -55,7 +55,7 @@ static void event_falling_edge_good(void) line = gpiod_chip_get_line(chip, 7); GU_ASSERT_NOT_NULL(line); - status = gpiod_line_event_request_falling(line, "gpiod-unit", false); + status = gpiod_line_event_request_falling(line, GU_CONSUMER, false); GU_ASSERT_RET_OK(status); gu_set_event(0, 7, GU_EVENT_FALLING, 100); @@ -85,7 +85,7 @@ static void event_rising_edge_ignore_falling(void) line = gpiod_chip_get_line(chip, 7); GU_ASSERT_NOT_NULL(line); - status = gpiod_line_event_request_rising(line, "gpiod-unit", false); + status = gpiod_line_event_request_rising(line, GU_CONSUMER, false); GU_ASSERT_RET_OK(status); gu_set_event(0, 7, GU_EVENT_FALLING, 100); @@ -111,7 +111,7 @@ static void event_rising_edge_active_low(void) line = gpiod_chip_get_line(chip, 7); GU_ASSERT_NOT_NULL(line); - status = gpiod_line_event_request_rising(line, "gpiod-unit", true); + status = gpiod_line_event_request_rising(line, GU_CONSUMER, true); GU_ASSERT_RET_OK(status); gu_set_event(0, 7, GU_EVENT_RISING, 100); @@ -142,7 +142,7 @@ static void event_get_value(void) line = gpiod_chip_get_line(chip, 7); GU_ASSERT_NOT_NULL(line); - status = gpiod_line_event_request_rising(line, "gpiod-unit", false); + status = gpiod_line_event_request_rising(line, GU_CONSUMER, false); GU_ASSERT_RET_OK(status); status = gpiod_line_get_value(line); diff --git a/tests/tests-line.c b/tests/tests-line.c index 7264869..1e7c28e 100644 --- a/tests/tests-line.c +++ b/tests/tests-line.c @@ -25,9 +25,9 @@ static void line_request_output(void) GU_ASSERT_NOT_NULL(line_0); GU_ASSERT_NOT_NULL(line_1); - status = gpiod_line_request_output(line_0, "gpiod-unit", false, 0); + status = gpiod_line_request_output(line_0, GU_CONSUMER, false, 0); GU_ASSERT_RET_OK(status); - status = gpiod_line_request_output(line_1, "gpiod-unit", false, 1); + status = gpiod_line_request_output(line_1, GU_CONSUMER, false, 1); GU_ASSERT_RET_OK(status); GU_ASSERT_EQ(gpiod_line_get_value(line_0), 0); @@ -52,10 +52,10 @@ static void line_request_already_requested(void) line = gpiod_chip_get_line(chip, 0); GU_ASSERT_NOT_NULL(line); - status = gpiod_line_request_input(line, "gpiod-unit", false); + status = gpiod_line_request_input(line, GU_CONSUMER, false); GU_ASSERT_RET_OK(status); - status = gpiod_line_request_input(line, "gpiod-unit", false); + status = gpiod_line_request_input(line, GU_CONSUMER, false); GU_ASSERT_NOTEQ(status, 0); GU_ASSERT_EQ(gpiod_errno(), GPIOD_ELINEBUSY); } @@ -77,11 +77,11 @@ static void line_consumer(void) GU_ASSERT_NULL(gpiod_line_consumer(line)); - status = gpiod_line_request_input(line, "gpiod-unit", false); + status = gpiod_line_request_input(line, GU_CONSUMER, false); GU_ASSERT_RET_OK(status); GU_ASSERT(!gpiod_line_needs_update(line)); - GU_ASSERT_STR_EQ(gpiod_line_consumer(line), "gpiod-unit"); + GU_ASSERT_STR_EQ(gpiod_line_consumer(line), GU_CONSUMER); } GU_DEFINE_TEST(line_consumer, "gpiod_line_consumer() - good", @@ -142,7 +142,7 @@ static void line_request_bulk_output(void) valA[1] = 0; valA[2] = 0; valA[3] = 1; - status = gpiod_line_request_bulk_output(&bulkA, "gpiod-unit", + status = gpiod_line_request_bulk_output(&bulkA, GU_CONSUMER, false, valA); GU_ASSERT_RET_OK(status); @@ -150,7 +150,7 @@ static void line_request_bulk_output(void) valB[1] = 1; valB[2] = 0; valB[3] = 1; - status = gpiod_line_request_bulk_output(&bulkB, "gpiod-unit", + status = gpiod_line_request_bulk_output(&bulkB, GU_CONSUMER, false, valB); GU_ASSERT_RET_OK(status); @@ -211,7 +211,7 @@ static void line_request_bulk_different_chips(void) gpiod_line_bulk_add(&bulk, lineB0); gpiod_line_bulk_add(&bulk, lineB1); - req.consumer = "gpiod-unit"; + req.consumer = GU_CONSUMER; req.direction = GPIOD_DIRECTION_INPUT; req.active_state = GPIOD_ACTIVE_STATE_HIGH; @@ -235,7 +235,7 @@ static void line_set_value(void) line = gpiod_chip_get_line(chip, 2); GU_ASSERT_NOT_NULL(line); - status = gpiod_line_request_output(line, "gpiod-unit", false, 0); + status = gpiod_line_request_output(line, GU_CONSUMER, false, 0); GU_ASSERT_RET_OK(status); GU_ASSERT_RET_OK(gpiod_line_set_value(line, 1)); @@ -277,14 +277,14 @@ static void line_direction(void) line = gpiod_chip_get_line(chip, 5); GU_ASSERT_NOT_NULL(line); - status = gpiod_line_request_output(line, "gpiod-unit", false, 0); + status = gpiod_line_request_output(line, GU_CONSUMER, false, 0); GU_ASSERT_RET_OK(status); GU_ASSERT_EQ(gpiod_line_direction(line), GPIOD_DIRECTION_OUTPUT); gpiod_line_release(line); - status = gpiod_line_request_input(line, "gpiod-unit", false); + status = gpiod_line_request_input(line, GU_CONSUMER, false); GU_ASSERT_RET_OK(status); GU_ASSERT_EQ(gpiod_line_direction(line), GPIOD_DIRECTION_INPUT); @@ -305,14 +305,14 @@ static void line_active_state(void) line = gpiod_chip_get_line(chip, 5); GU_ASSERT_NOT_NULL(line); - status = gpiod_line_request_input(line, "gpiod-unit", false); + status = gpiod_line_request_input(line, GU_CONSUMER, false); GU_ASSERT_RET_OK(status); GU_ASSERT_EQ(gpiod_line_active_state(line), GPIOD_ACTIVE_STATE_HIGH); gpiod_line_release(line); - status = gpiod_line_request_input(line, "gpiod-unit", true); + status = gpiod_line_request_input(line, GU_CONSUMER, true); GU_ASSERT_RET_OK(status); GU_ASSERT_EQ(gpiod_line_direction(line), GPIOD_ACTIVE_STATE_LOW); @@ -339,7 +339,7 @@ static void line_misc_flags(void) GU_ASSERT_FALSE(gpiod_line_is_open_source(line)); config.direction = GPIOD_DIRECTION_INPUT; - config.consumer = "gpiod-unit"; + config.consumer = GU_CONSUMER; config.active_state = GPIOD_ACTIVE_STATE_HIGH; config.flags = GPIOD_REQUEST_OPEN_DRAIN; diff --git a/tests/tests-simple-api.c b/tests/tests-simple-api.c index 3ce271a..855a3d4 100644 --- a/tests/tests-simple-api.c +++ b/tests/tests-simple-api.c @@ -14,14 +14,14 @@ static void simple_set_get_value(void) { int ret; - ret = gpiod_simple_get_value("gpiod-unit", gu_chip_name(0), 3, false); + ret = gpiod_simple_get_value(GU_CONSUMER, gu_chip_name(0), 3, false); GU_ASSERT_EQ(ret, 0); - ret = gpiod_simple_set_value("gpiod-unit", gu_chip_name(0), + ret = gpiod_simple_set_value(GU_CONSUMER, gu_chip_name(0), 3, 1, false, NULL, NULL); GU_ASSERT_RET_OK(ret); - ret = gpiod_simple_get_value("gpiod-unit", gu_chip_name(0), 3, false); + ret = gpiod_simple_get_value(GU_CONSUMER, gu_chip_name(0), 3, false); GU_ASSERT_EQ(ret, 1); } GU_DEFINE_TEST(simple_set_get_value, @@ -33,7 +33,7 @@ static void simple_set_get_value_multiple(void) unsigned int offsets[] = { 0, 1, 2, 3, 4, 5, 6, 12, 13, 15 }; int values[10], ret; - ret = gpiod_simple_get_value_multiple("gpiod-unit", gu_chip_name(0), + ret = gpiod_simple_get_value_multiple(GU_CONSUMER, gu_chip_name(0), offsets, values, 10, false); GU_ASSERT_RET_OK(ret); @@ -59,12 +59,12 @@ static void simple_set_get_value_multiple(void) values[8] = 0; values[9] = 0; - ret = gpiod_simple_set_value_multiple("gpiod-unit", gu_chip_name(0), + ret = gpiod_simple_set_value_multiple(GU_CONSUMER, gu_chip_name(0), offsets, values, 10, false, NULL, NULL); GU_ASSERT_RET_OK(ret); - ret = gpiod_simple_get_value_multiple("gpiod-unit", gu_chip_name(0), + ret = gpiod_simple_get_value_multiple(GU_CONSUMER, gu_chip_name(0), offsets, values, 10, false); GU_ASSERT_RET_OK(ret); @@ -88,7 +88,7 @@ static void simple_get_value_multiple_max_lines(void) unsigned int offsets[GPIOD_REQUEST_MAX_LINES + 1]; int values[GPIOD_REQUEST_MAX_LINES + 1], ret; - ret = gpiod_simple_get_value_multiple("gpiod-unit", gu_chip_name(0), + ret = gpiod_simple_get_value_multiple(GU_CONSUMER, gu_chip_name(0), offsets, values, GPIOD_REQUEST_MAX_LINES + 1, false); @@ -104,7 +104,7 @@ static void simple_set_value_multiple_max_lines(void) unsigned int offsets[GPIOD_REQUEST_MAX_LINES + 1]; int values[GPIOD_REQUEST_MAX_LINES + 1], ret; - ret = gpiod_simple_set_value_multiple("gpiod-unit", gu_chip_name(0), + ret = gpiod_simple_set_value_multiple(GU_CONSUMER, gu_chip_name(0), offsets, values, GPIOD_REQUEST_MAX_LINES + 1, false, NULL, NULL); @@ -138,7 +138,7 @@ static void simple_event_loop(void) gu_set_event(0, 3, GU_EVENT_ALTERNATING, 100); - status = gpiod_simple_event_loop("gpiod-unit", gu_chip_name(0), 3, + status = gpiod_simple_event_loop(GU_CONSUMER, gu_chip_name(0), 3, false, &ts, simple_event_cb, &evdata); GU_ASSERT_RET_OK(status);