diff options
| author | Anastasia Klimchuk <aklm@chromium.org> | 2022-09-14 08:51:54 +1000 |
|---|---|---|
| committer | Edward O'Callaghan <quasisec@chromium.org> | 2022-09-20 23:45:08 +0000 |
| commit | 5363f35fa03e4db2cd79032ca9860c0c5382a355 (patch) | |
| tree | c69fd9e692bd589a1e6ee29dcfca81f68bd2117f /tests | |
| parent | 5d05a2811e67903c7de091ca053d46a831c62b2b (diff) | |
| download | flashrom-5363f35fa03e4db2cd79032ca9860c0c5382a355.tar.gz flashrom-5363f35fa03e4db2cd79032ca9860c0c5382a355.tar.bz2 flashrom-5363f35fa03e4db2cd79032ca9860c0c5382a355.zip | |
tests: Add unit test for initialisation with NULL programmer param
Programmer param can be NULL and this is a valid case which can
be covered by unit test.
`run_lifecycle` needs an adjustment to handle NULL as programmer
param, which is also included in the patch.
Change-Id: I409f1c9ac832943e54107f7cf8652d1f46ac67df
Signed-off-by: Anastasia Klimchuk <aklm@chromium.org>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/67642
Reviewed-by: Edward O'Callaghan <quasisec@chromium.org>
Reviewed-by: Felix Singer <felixsinger@posteo.net>
Reviewed-by: Thomas Heijligen <src@posteo.de>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/dummyflasher.c | 14 | ||||
| -rw-r--r-- | tests/lifecycle.c | 3 | ||||
| -rw-r--r-- | tests/tests.c | 1 | ||||
| -rw-r--r-- | tests/tests.h | 1 |
4 files changed, 18 insertions, 1 deletions
diff --git a/tests/dummyflasher.c b/tests/dummyflasher.c index b52a54274..11482177e 100644 --- a/tests/dummyflasher.c +++ b/tests/dummyflasher.c @@ -110,6 +110,19 @@ void dummy_init_success_unhandled_param_test_success(void **state) "bus=spi,emulate=W25Q128FV,voltage=3.5V", ERROR_FATAL); } +void dummy_null_prog_param_test_success(void **state) +{ + struct io_mock_fallback_open_state dummy_fallback_open_state = { + .noc = 0, + .paths = { NULL }, + }; + const struct io_mock dummy_io = { + .fallback_open_state = &dummy_fallback_open_state, + }; + + run_basic_lifecycle(state, &dummy_io, &programmer_dummy, NULL); +} + #else SKIP_TEST(dummy_basic_lifecycle_test_success) SKIP_TEST(dummy_probe_lifecycle_test_success) @@ -117,4 +130,5 @@ void dummy_init_success_unhandled_param_test_success(void **state) SKIP_TEST(dummy_init_fails_unhandled_param_test_success) SKIP_TEST(dummy_init_success_invalid_param_test_success) SKIP_TEST(dummy_init_success_unhandled_param_test_success) + SKIP_TEST(dummy_null_prog_param_test_success) #endif /* CONFIG_DUMMY */ diff --git a/tests/lifecycle.c b/tests/lifecycle.c index 568b1790f..0c7969920 100644 --- a/tests/lifecycle.c +++ b/tests/lifecycle.c @@ -39,7 +39,8 @@ static void run_lifecycle(void **state, const struct io_mock *io, const struct p io_mock_register(io); struct flashrom_programmer *flashprog; - char *param_dup = strdup(param); + + char *param_dup = param ? strdup(param) : NULL; printf("Testing flashrom_programmer_init for programmer=%s ...\n", prog->name); assert_int_equal(0, flashrom_programmer_init(&flashprog, prog->name, param_dup)); diff --git a/tests/tests.c b/tests/tests.c index 7f20069f9..53bad6569 100644 --- a/tests/tests.c +++ b/tests/tests.c @@ -424,6 +424,7 @@ int main(int argc, char *argv[]) cmocka_unit_test(dummy_init_fails_unhandled_param_test_success), cmocka_unit_test(dummy_init_success_invalid_param_test_success), cmocka_unit_test(dummy_init_success_unhandled_param_test_success), + cmocka_unit_test(dummy_null_prog_param_test_success), cmocka_unit_test(nicrealtek_basic_lifecycle_test_success), cmocka_unit_test(raiden_debug_basic_lifecycle_test_success), cmocka_unit_test(dediprog_basic_lifecycle_test_success), diff --git a/tests/tests.h b/tests/tests.h index cdbf01cf8..7d84101e7 100644 --- a/tests/tests.h +++ b/tests/tests.h @@ -48,6 +48,7 @@ void dummy_probe_variable_size_test_success(void **state); void dummy_init_fails_unhandled_param_test_success(void **state); void dummy_init_success_invalid_param_test_success(void **state); void dummy_init_success_unhandled_param_test_success(void **state); +void dummy_null_prog_param_test_success(void **state); void nicrealtek_basic_lifecycle_test_success(void **state); void raiden_debug_basic_lifecycle_test_success(void **state); void dediprog_basic_lifecycle_test_success(void **state); |