From 318db06b5f5e93a1543ce75ce42ab300c7dad01a Mon Sep 17 00:00:00 2001 From: Bartosz Golaszewski Date: Fri, 7 Apr 2023 13:27:52 +0200 Subject: [PATCH] tests: fix inconsistent naming of test helpers Some of the helpers' names don't refer to the objects they're acting upon. Make the naming consistent. While at it: fix line breaking in the helpers header. Signed-off-by: Bartosz Golaszewski --- tests/gpiod-test-helpers.h | 11 ++++---- tests/tests-chip-info.c | 6 ++-- tests/tests-edge-event.c | 22 +++++++-------- tests/tests-info-event.c | 2 +- tests/tests-line-config.c | 2 +- tests/tests-line-info.c | 58 +++++++++++++++++++------------------- tests/tests-line-request.c | 39 ++++++++++++------------- 7 files changed, 71 insertions(+), 69 deletions(-) diff --git a/tests/gpiod-test-helpers.h b/tests/gpiod-test-helpers.h index 49e782b..5b3476a 100644 --- a/tests/gpiod-test-helpers.h +++ b/tests/gpiod-test-helpers.h @@ -71,7 +71,7 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(struct_gpiod_edge_event_buffer, _chip; \ }) -#define gpiod_test_get_chip_info_or_fail(_chip) \ +#define gpiod_test_chip_get_info_or_fail(_chip) \ ({ \ struct gpiod_chip_info *_info = gpiod_chip_get_info(_chip); \ g_assert_nonnull(_info); \ @@ -79,7 +79,7 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(struct_gpiod_edge_event_buffer, _info; \ }) -#define gpiod_test_get_line_info_or_fail(_chip, _offset) \ +#define gpiod_test_chip_get_line_info_or_fail(_chip, _offset) \ ({ \ struct gpiod_line_info *_info = \ gpiod_chip_get_line_info(_chip, _offset); \ @@ -116,7 +116,8 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(struct_gpiod_edge_event_buffer, }) #define gpiod_test_line_config_add_line_settings_or_fail(_line_cfg, _offsets, \ - _num_offsets, _settings) \ + _num_offsets, \ + _settings) \ do { \ gint _ret = gpiod_line_config_add_line_settings(_line_cfg, \ _offsets, \ @@ -155,7 +156,7 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(struct_gpiod_edge_event_buffer, _config; \ }) -#define gpiod_test_request_lines_or_fail(_chip, _req_cfg, _line_cfg) \ +#define gpiod_test_chip_request_lines_or_fail(_chip, _req_cfg, _line_cfg) \ ({ \ struct gpiod_line_request *_request = \ gpiod_chip_request_lines(_chip, \ @@ -165,7 +166,7 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(struct_gpiod_edge_event_buffer, _request; \ }) -#define gpiod_test_reconfigure_lines_or_fail(_request, _line_cfg) \ +#define gpiod_test_line_request_reconfigure_lines_or_fail(_request, _line_cfg) \ do { \ gint _ret = gpiod_line_request_reconfigure_lines(_request, \ _line_cfg); \ diff --git a/tests/tests-chip-info.c b/tests/tests-chip-info.c index c43cfbe..db76385 100644 --- a/tests/tests-chip-info.c +++ b/tests/tests-chip-info.c @@ -18,7 +18,7 @@ GPIOD_TEST_CASE(get_chip_info_name) g_autoptr(struct_gpiod_chip_info) info = NULL; chip = gpiod_test_open_chip_or_fail(g_gpiosim_chip_get_dev_path(sim)); - info = gpiod_test_get_chip_info_or_fail(chip); + info = gpiod_test_chip_get_info_or_fail(chip); g_assert_cmpstr(gpiod_chip_info_get_name(info), ==, g_gpiosim_chip_get_name(sim)); @@ -32,7 +32,7 @@ GPIOD_TEST_CASE(get_chip_info_label) g_autoptr(struct_gpiod_chip_info) info = NULL; chip = gpiod_test_open_chip_or_fail(g_gpiosim_chip_get_dev_path(sim)); - info = gpiod_test_get_chip_info_or_fail(chip); + info = gpiod_test_chip_get_info_or_fail(chip); g_assert_cmpstr(gpiod_chip_info_get_label(info), ==, "foobar"); } @@ -44,7 +44,7 @@ GPIOD_TEST_CASE(get_num_lines) g_autoptr(struct_gpiod_chip_info) info = NULL; chip = gpiod_test_open_chip_or_fail(g_gpiosim_chip_get_dev_path(sim)); - info = gpiod_test_get_chip_info_or_fail(chip); + info = gpiod_test_chip_get_info_or_fail(chip); g_assert_cmpuint(gpiod_chip_info_get_num_lines(info), ==, 16); } diff --git a/tests/tests-edge-event.c b/tests/tests-edge-event.c index e79f457..b744ca5 100644 --- a/tests/tests-edge-event.c +++ b/tests/tests-edge-event.c @@ -49,7 +49,7 @@ GPIOD_TEST_CASE(edge_event_wait_timeout) gpiod_test_line_config_add_line_settings_or_fail(line_cfg, &offset, 1, settings); - request = gpiod_test_request_lines_or_fail(chip, NULL, line_cfg); + request = gpiod_test_chip_request_lines_or_fail(chip, NULL, line_cfg); ret = gpiod_line_request_wait_edge_events(request, 1000000); g_assert_cmpint(ret, ==, 0); @@ -122,7 +122,7 @@ GPIOD_TEST_CASE(read_both_events) gpiod_test_line_config_add_line_settings_or_fail(line_cfg, &offset, 1, settings); - request = gpiod_test_request_lines_or_fail(chip, NULL, line_cfg); + request = gpiod_test_chip_request_lines_or_fail(chip, NULL, line_cfg); thread = g_thread_new("request-release", falling_and_rising_edge_events, sim); @@ -199,7 +199,7 @@ GPIOD_TEST_CASE(read_rising_edge_event) gpiod_test_line_config_add_line_settings_or_fail(line_cfg, &offset, 1, settings); - request = gpiod_test_request_lines_or_fail(chip, NULL, line_cfg); + request = gpiod_test_chip_request_lines_or_fail(chip, NULL, line_cfg); thread = g_thread_new("edge-generator", falling_and_rising_edge_events, sim); @@ -258,7 +258,7 @@ GPIOD_TEST_CASE(read_falling_edge_event) gpiod_test_line_config_add_line_settings_or_fail(line_cfg, &offset, 1, settings); - request = gpiod_test_request_lines_or_fail(chip, NULL, line_cfg); + request = gpiod_test_chip_request_lines_or_fail(chip, NULL, line_cfg); thread = g_thread_new("request-release", falling_and_rising_edge_events, sim); @@ -319,7 +319,7 @@ GPIOD_TEST_CASE(read_rising_edge_event_polled) gpiod_test_line_config_add_line_settings_or_fail(line_cfg, &offset, 1, settings); - request = gpiod_test_request_lines_or_fail(chip, NULL, line_cfg); + request = gpiod_test_chip_request_lines_or_fail(chip, NULL, line_cfg); thread = g_thread_new("edge-generator", falling_and_rising_edge_events, sim); @@ -391,7 +391,7 @@ GPIOD_TEST_CASE(read_both_events_blocking) gpiod_test_line_config_add_line_settings_or_fail(line_cfg, &offset, 1, settings); - request = gpiod_test_request_lines_or_fail(chip, NULL, line_cfg); + request = gpiod_test_chip_request_lines_or_fail(chip, NULL, line_cfg); thread = g_thread_new("request-release", falling_and_rising_edge_events, sim); @@ -470,7 +470,7 @@ GPIOD_TEST_CASE(seqno) gpiod_test_line_config_add_line_settings_or_fail(line_cfg, offsets, 2, settings); - request = gpiod_test_request_lines_or_fail(chip, NULL, line_cfg); + request = gpiod_test_chip_request_lines_or_fail(chip, NULL, line_cfg); thread = g_thread_new("request-release", rising_edge_events_on_two_offsets, sim); @@ -542,7 +542,7 @@ GPIOD_TEST_CASE(event_copy) gpiod_test_line_config_add_line_settings_or_fail(line_cfg, &offset, 1, settings); - request = gpiod_test_request_lines_or_fail(chip, NULL, line_cfg); + request = gpiod_test_chip_request_lines_or_fail(chip, NULL, line_cfg); g_gpiosim_chip_set_pull(sim, 2, G_GPIOSIM_PULL_UP); @@ -586,7 +586,7 @@ GPIOD_TEST_CASE(reading_more_events_than_the_queue_contains_doesnt_block) gpiod_test_line_config_add_line_settings_or_fail(line_cfg, &offset, 1, settings); - request = gpiod_test_request_lines_or_fail(chip, NULL, line_cfg); + request = gpiod_test_chip_request_lines_or_fail(chip, NULL, line_cfg); g_gpiosim_chip_set_pull(sim, 2, G_GPIOSIM_PULL_UP); g_usleep(500); @@ -633,7 +633,7 @@ GPIOD_TEST_CASE(null_buffer) gpiod_test_line_config_add_line_settings_or_fail(line_cfg, &offset, 1, settings); - request = gpiod_test_request_lines_or_fail(chip, NULL, line_cfg); + request = gpiod_test_chip_request_lines_or_fail(chip, NULL, line_cfg); ret = gpiod_line_request_read_edge_events(request, NULL, 1); g_assert_cmpint(ret, ==, -1); @@ -664,7 +664,7 @@ GPIOD_TEST_CASE(get_edge_event_index_out_of_bounds) gpiod_test_line_config_add_line_settings_or_fail(line_cfg, &offset, 1, settings); - request = gpiod_test_request_lines_or_fail(chip, NULL, line_cfg); + request = gpiod_test_chip_request_lines_or_fail(chip, NULL, line_cfg); g_gpiosim_chip_set_pull(sim, 2, G_GPIOSIM_PULL_UP); g_usleep(500); diff --git a/tests/tests-info-event.c b/tests/tests-info-event.c index 20e91a8..958d2b6 100644 --- a/tests/tests-info-event.c +++ b/tests/tests-info-event.c @@ -282,7 +282,7 @@ GPIOD_TEST_CASE(unwatch_and_check_that_no_events_are_generated) g_assert_nonnull(info); gpiod_test_return_if_failed(); - request = gpiod_test_request_lines_or_fail(chip, NULL, line_cfg); + request = gpiod_test_chip_request_lines_or_fail(chip, NULL, line_cfg); ret = gpiod_chip_wait_info_event(chip, 100000000); g_assert_cmpint(ret, >, 0); diff --git a/tests/tests-line-config.c b/tests/tests-line-config.c index fafbcf3..51f190d 100644 --- a/tests/tests-line-config.c +++ b/tests/tests-line-config.c @@ -327,7 +327,7 @@ GPIOD_TEST_CASE(set_global_output_values) settings); gpiod_test_line_config_set_output_values_or_fail(config, values, 4); - request = gpiod_test_request_lines_or_fail(chip, NULL, config); + request = gpiod_test_chip_request_lines_or_fail(chip, NULL, config); g_assert_cmpint(g_gpiosim_chip_get_value(sim, 0), ==, G_GPIOSIM_VALUE_ACTIVE); diff --git a/tests/tests-line-info.c b/tests/tests-line-info.c index 75b38f0..cf2c650 100644 --- a/tests/tests-line-info.c +++ b/tests/tests-line-info.c @@ -19,7 +19,7 @@ GPIOD_TEST_CASE(get_line_info_good) chip = gpiod_test_open_chip_or_fail(g_gpiosim_chip_get_dev_path(sim)); - info = gpiod_test_get_line_info_or_fail(chip, 3); + info = gpiod_test_chip_get_line_info_or_fail(chip, 3); g_assert_cmpuint(gpiod_line_info_get_offset(info), ==, 3); } @@ -74,8 +74,8 @@ GPIOD_TEST_CASE(line_info_basic_properties) NULL); chip = gpiod_test_open_chip_or_fail(g_gpiosim_chip_get_dev_path(sim)); - info4 = gpiod_test_get_line_info_or_fail(chip, 4); - info6 = gpiod_test_get_line_info_or_fail(chip, 6); + info4 = gpiod_test_chip_get_line_info_or_fail(chip, 4); + info6 = gpiod_test_chip_get_line_info_or_fail(chip, 6); g_assert_cmpuint(gpiod_line_info_get_offset(info4), ==, 4); g_assert_cmpstr(gpiod_line_info_get_name(info4), ==, "baz"); @@ -104,7 +104,7 @@ GPIOD_TEST_CASE(copy_line_info) g_autoptr(struct_gpiod_line_info) copy = NULL; chip = gpiod_test_open_chip_or_fail(g_gpiosim_chip_get_dev_path(sim)); - info = gpiod_test_get_line_info_or_fail(chip, 3); + info = gpiod_test_chip_get_line_info_or_fail(chip, 3); copy = gpiod_line_info_copy(info); g_assert_nonnull(copy); @@ -143,10 +143,10 @@ GPIOD_TEST_CASE(direction_settings) gpiod_test_line_config_add_line_settings_or_fail(line_cfg, &offset, 1, settings); - request = gpiod_test_request_lines_or_fail(chip, NULL, line_cfg); - info0 = gpiod_test_get_line_info_or_fail(chip, 0); - info1 = gpiod_test_get_line_info_or_fail(chip, 1); - info2 = gpiod_test_get_line_info_or_fail(chip, 2); + request = gpiod_test_chip_request_lines_or_fail(chip, NULL, line_cfg); + info0 = gpiod_test_chip_get_line_info_or_fail(chip, 0); + info1 = gpiod_test_chip_get_line_info_or_fail(chip, 1); + info2 = gpiod_test_chip_get_line_info_or_fail(chip, 2); g_assert_cmpint(gpiod_line_info_get_direction(info0), ==, GPIOD_LINE_DIRECTION_OUTPUT); @@ -175,8 +175,8 @@ GPIOD_TEST_CASE(active_high) gpiod_test_line_config_add_line_settings_or_fail(line_cfg, &offset, 1, settings); - request = gpiod_test_request_lines_or_fail(chip, NULL, line_cfg); - info = gpiod_test_get_line_info_or_fail(chip, 5); + request = gpiod_test_chip_request_lines_or_fail(chip, NULL, line_cfg); + info = gpiod_test_chip_get_line_info_or_fail(chip, 5); g_assert_true(gpiod_line_info_is_active_low(info)); } @@ -217,11 +217,11 @@ GPIOD_TEST_CASE(edge_detection_settings) gpiod_test_line_config_add_line_settings_or_fail(line_cfg, &offset, 1, settings); - request = gpiod_test_request_lines_or_fail(chip, NULL, line_cfg); - info0 = gpiod_test_get_line_info_or_fail(chip, 0); - info1 = gpiod_test_get_line_info_or_fail(chip, 1); - info2 = gpiod_test_get_line_info_or_fail(chip, 2); - info3 = gpiod_test_get_line_info_or_fail(chip, 3); + request = gpiod_test_chip_request_lines_or_fail(chip, NULL, line_cfg); + info0 = gpiod_test_chip_get_line_info_or_fail(chip, 0); + info1 = gpiod_test_chip_get_line_info_or_fail(chip, 1); + info2 = gpiod_test_chip_get_line_info_or_fail(chip, 2); + info3 = gpiod_test_chip_get_line_info_or_fail(chip, 3); g_assert_cmpint(gpiod_line_info_get_edge_detection(info0), ==, GPIOD_LINE_EDGE_NONE); @@ -268,11 +268,11 @@ GPIOD_TEST_CASE(bias_settings) gpiod_test_line_config_add_line_settings_or_fail(line_cfg, &offset, 1, settings); - request = gpiod_test_request_lines_or_fail(chip, NULL, line_cfg); - info0 = gpiod_test_get_line_info_or_fail(chip, 0); - info1 = gpiod_test_get_line_info_or_fail(chip, 1); - info2 = gpiod_test_get_line_info_or_fail(chip, 2); - info3 = gpiod_test_get_line_info_or_fail(chip, 3); + request = gpiod_test_chip_request_lines_or_fail(chip, NULL, line_cfg); + info0 = gpiod_test_chip_get_line_info_or_fail(chip, 0); + info1 = gpiod_test_chip_get_line_info_or_fail(chip, 1); + info2 = gpiod_test_chip_get_line_info_or_fail(chip, 2); + info3 = gpiod_test_chip_get_line_info_or_fail(chip, 3); g_assert_cmpint(gpiod_line_info_get_bias(info0), ==, GPIOD_LINE_BIAS_UNKNOWN); @@ -314,10 +314,10 @@ GPIOD_TEST_CASE(drive_settings) gpiod_test_line_config_add_line_settings_or_fail(line_cfg, &offset, 1, settings); - request = gpiod_test_request_lines_or_fail(chip, NULL, line_cfg); - info0 = gpiod_test_get_line_info_or_fail(chip, 0); - info1 = gpiod_test_get_line_info_or_fail(chip, 1); - info2 = gpiod_test_get_line_info_or_fail(chip, 2); + request = gpiod_test_chip_request_lines_or_fail(chip, NULL, line_cfg); + info0 = gpiod_test_chip_get_line_info_or_fail(chip, 0); + info1 = gpiod_test_chip_get_line_info_or_fail(chip, 1); + info2 = gpiod_test_chip_get_line_info_or_fail(chip, 2); g_assert_cmpint(gpiod_line_info_get_drive(info0), ==, GPIOD_LINE_DRIVE_PUSH_PULL); @@ -348,8 +348,8 @@ GPIOD_TEST_CASE(debounce_period) gpiod_test_line_config_add_line_settings_or_fail(line_cfg, &offset, 1, settings); - request = gpiod_test_request_lines_or_fail(chip, NULL, line_cfg); - info = gpiod_test_get_line_info_or_fail(chip, 5); + request = gpiod_test_chip_request_lines_or_fail(chip, NULL, line_cfg); + info = gpiod_test_chip_get_line_info_or_fail(chip, 5); g_assert_cmpuint(gpiod_line_info_get_debounce_period_us(info), ==, 1000); @@ -394,9 +394,9 @@ GPIOD_TEST_CASE(event_clock) gpiod_test_return_if_failed(); - info0 = gpiod_test_get_line_info_or_fail(chip, 0); - info1 = gpiod_test_get_line_info_or_fail(chip, 1); - info2 = gpiod_test_get_line_info_or_fail(chip, 2); + info0 = gpiod_test_chip_get_line_info_or_fail(chip, 0); + info1 = gpiod_test_chip_get_line_info_or_fail(chip, 1); + info2 = gpiod_test_chip_get_line_info_or_fail(chip, 2); g_assert_cmpint(gpiod_line_info_get_event_clock(info0), ==, GPIOD_LINE_CLOCK_MONOTONIC); diff --git a/tests/tests-line-request.c b/tests/tests-line-request.c index 399e09e..47ba986 100644 --- a/tests/tests-line-request.c +++ b/tests/tests-line-request.c @@ -108,9 +108,10 @@ GPIOD_TEST_CASE(set_consumer) gpiod_test_line_config_add_line_settings_or_fail(line_cfg, &offset, 1, NULL); - request = gpiod_test_request_lines_or_fail(chip, req_cfg, line_cfg); + request = gpiod_test_chip_request_lines_or_fail(chip, + req_cfg, line_cfg); - info = gpiod_test_get_line_info_or_fail(chip, offset); + info = gpiod_test_chip_get_line_info_or_fail(chip, offset); g_assert_true(gpiod_line_info_is_used(info)); g_assert_cmpstr(gpiod_line_info_get_consumer(info), ==, consumer); @@ -132,9 +133,9 @@ GPIOD_TEST_CASE(empty_consumer) gpiod_test_line_config_add_line_settings_or_fail(line_cfg, &offset, 1, NULL); - request = gpiod_test_request_lines_or_fail(chip, NULL, line_cfg); + request = gpiod_test_chip_request_lines_or_fail(chip, NULL, line_cfg); - info = gpiod_test_get_line_info_or_fail(chip, offset); + info = gpiod_test_chip_get_line_info_or_fail(chip, offset); g_assert_cmpstr(gpiod_line_info_get_consumer(info), ==, "?"); } @@ -167,7 +168,7 @@ GPIOD_TEST_CASE(default_output_value) g_gpiosim_chip_set_pull(sim, 2, G_GPIOSIM_PULL_DOWN); - request = gpiod_test_request_lines_or_fail(chip, NULL, line_cfg); + request = gpiod_test_chip_request_lines_or_fail(chip, NULL, line_cfg); for (i = 0; i < 4; i++) g_assert_cmpint(g_gpiosim_chip_get_value(sim, offsets[i]), ==, @@ -199,7 +200,7 @@ GPIOD_TEST_CASE(read_all_values) gpiod_test_line_config_add_line_settings_or_fail(line_cfg, offsets, 5, settings); - request = gpiod_test_request_lines_or_fail(chip, NULL, line_cfg); + request = gpiod_test_chip_request_lines_or_fail(chip, NULL, line_cfg); for (i = 0; i < 5; i++) g_gpiosim_chip_set_pull(sim, offsets[i], @@ -235,7 +236,7 @@ GPIOD_TEST_CASE(request_multiple_values_but_read_one) gpiod_test_line_config_add_line_settings_or_fail(line_cfg, offsets, 5, settings); - request = gpiod_test_request_lines_or_fail(chip, NULL, line_cfg); + request = gpiod_test_chip_request_lines_or_fail(chip, NULL, line_cfg); for (i = 0; i < 5; i++) g_gpiosim_chip_set_pull(sim, offsets[i], @@ -281,7 +282,7 @@ GPIOD_TEST_CASE(set_all_values) gpiod_test_line_config_add_line_settings_or_fail(line_cfg, offsets, 5, settings); - request = gpiod_test_request_lines_or_fail(chip, NULL, line_cfg); + request = gpiod_test_chip_request_lines_or_fail(chip, NULL, line_cfg); ret = gpiod_line_request_set_values(request, values); g_assert_cmpint(ret, ==, 0); @@ -318,7 +319,7 @@ GPIOD_TEST_CASE(set_values_subset_of_lines) gpiod_test_line_config_add_line_settings_or_fail(line_cfg, offsets, 4, settings); - request = gpiod_test_request_lines_or_fail(chip, NULL, line_cfg); + request = gpiod_test_chip_request_lines_or_fail(chip, NULL, line_cfg); ret = gpiod_line_request_set_values_subset(request, 3, offsets_to_set, values); @@ -354,7 +355,7 @@ GPIOD_TEST_CASE(set_line_after_requesting) gpiod_test_line_config_add_line_settings_or_fail(line_cfg, offsets, 4, settings); - request = gpiod_test_request_lines_or_fail(chip, NULL, line_cfg); + request = gpiod_test_chip_request_lines_or_fail(chip, NULL, line_cfg); gpiod_line_request_set_value(request, 1, GPIOD_LINE_VALUE_ACTIVE); @@ -389,7 +390,7 @@ GPIOD_TEST_CASE(request_survives_parent_chip) gpiod_test_line_config_add_line_settings_or_fail(line_cfg, &offset, 1, settings); - request = gpiod_test_request_lines_or_fail(chip, NULL, line_cfg); + request = gpiod_test_chip_request_lines_or_fail(chip, NULL, line_cfg); g_assert_cmpint(gpiod_line_request_get_value(request, offset), ==, GPIOD_LINE_VALUE_ACTIVE); @@ -424,7 +425,7 @@ GPIOD_TEST_CASE(num_lines_and_offsets) gpiod_test_line_config_add_line_settings_or_fail(line_cfg, offsets, 8, NULL); - request = gpiod_test_request_lines_or_fail(chip, NULL, line_cfg); + request = gpiod_test_chip_request_lines_or_fail(chip, NULL, line_cfg); g_assert_cmpuint(gpiod_line_request_get_num_requested_lines(request), ==, 8); @@ -460,7 +461,7 @@ GPIOD_TEST_CASE(active_low_read_value) gpiod_test_line_config_add_line_settings_or_fail(line_cfg, &offset, 1, settings); - request = gpiod_test_request_lines_or_fail(chip, NULL, line_cfg); + request = gpiod_test_chip_request_lines_or_fail(chip, NULL, line_cfg); g_gpiosim_chip_set_pull(sim, 2, G_GPIOSIM_PULL_DOWN); value = gpiod_line_request_get_value(request, 2); @@ -499,7 +500,7 @@ GPIOD_TEST_CASE(reconfigure_lines) gpiod_test_line_config_add_line_settings_or_fail(line_cfg, offsets, 2, settings); - request = gpiod_test_request_lines_or_fail(chip, NULL, line_cfg); + request = gpiod_test_chip_request_lines_or_fail(chip, NULL, line_cfg); g_assert_cmpint(g_gpiosim_chip_get_value(sim, 0), ==, G_GPIOSIM_VALUE_ACTIVE); @@ -554,7 +555,7 @@ GPIOD_TEST_CASE(reconfigure_lines_null_config) gpiod_test_line_config_add_line_settings_or_fail(line_cfg, offsets, 4, NULL); - request = gpiod_test_request_lines_or_fail(chip, NULL, line_cfg); + request = gpiod_test_chip_request_lines_or_fail(chip, NULL, line_cfg); ret = gpiod_line_request_reconfigure_lines(request, NULL); g_assert_cmpint(ret, ==, -1); @@ -578,7 +579,7 @@ GPIOD_TEST_CASE(reconfigure_lines_different_offsets) gpiod_test_line_config_add_line_settings_or_fail(line_cfg, offsets0, 4, NULL); - request = gpiod_test_request_lines_or_fail(chip, NULL, line_cfg); + request = gpiod_test_chip_request_lines_or_fail(chip, NULL, line_cfg); gpiod_line_config_reset(line_cfg); @@ -613,7 +614,7 @@ GPIOD_TEST_CASE(request_lines_with_unordered_offsets) gpiod_test_line_config_add_line_settings_or_fail(line_cfg, offsets, 6, settings); - request = gpiod_test_request_lines_or_fail(chip, NULL, line_cfg); + request = gpiod_test_chip_request_lines_or_fail(chip, NULL, line_cfg); values[0] = 0; values[1] = 1; @@ -658,7 +659,7 @@ GPIOD_TEST_CASE(request_with_bias_set_to_pull_up) gpiod_test_line_config_add_line_settings_or_fail(line_cfg, &offset, 1, settings); - request = gpiod_test_request_lines_or_fail(chip, NULL, line_cfg); + request = gpiod_test_chip_request_lines_or_fail(chip, NULL, line_cfg); g_assert_cmpint(g_gpiosim_chip_get_value(sim, 3), ==, G_GPIOSIM_VALUE_ACTIVE); @@ -681,7 +682,7 @@ GPIOD_TEST_CASE(get_requested_offsets_less_and_more) gpiod_test_line_config_add_line_settings_or_fail(line_cfg, offsets, 4, NULL); - request = gpiod_test_request_lines_or_fail(chip, NULL, line_cfg); + request = gpiod_test_chip_request_lines_or_fail(chip, NULL, line_cfg); num_retrieved = gpiod_line_request_get_requested_offsets(request, retrieved, 3); -- 2.30.2