diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/vb2_kernel_tests.c | 6 | ||||
| -rw-r--r-- | tests/vb2_ui_action_tests.c | 10 | ||||
| -rw-r--r-- | tests/vb2_ui_tests.c | 10 | ||||
| -rw-r--r-- | tests/vboot_api_kernel4_tests.c | 2 | ||||
| -rw-r--r-- | tests/vboot_api_kernel_tests.c | 34 |
5 files changed, 48 insertions, 14 deletions
diff --git a/tests/vb2_kernel_tests.c b/tests/vb2_kernel_tests.c index ebddafcd..0e1cb284 100644 --- a/tests/vb2_kernel_tests.c +++ b/tests/vb2_kernel_tests.c @@ -139,7 +139,7 @@ vb2_error_t vb2ex_read_resource(struct vb2_context *c, return VB2_SUCCESS; } -vb2_error_t VbTryLoadKernel(struct vb2_context *c, uint32_t get_info_flags) +vb2_error_t VbTryLoadKernel(struct vb2_context *c, uint32_t disk_flags) { /* * TODO: Currently we don't have a good way of testing for an ordered @@ -150,10 +150,10 @@ vb2_error_t VbTryLoadKernel(struct vb2_context *c, uint32_t get_info_flags) return mock_vbtlk_retval; TEST_EQ(!!mock_vbtlk_expect_fixed, - !!(get_info_flags & VB_DISK_FLAG_FIXED), + !!(disk_flags & VB_DISK_FLAG_FIXED), " VbTryLoadKernel unexpected fixed disk call"); TEST_EQ(!!mock_vbtlk_expect_removable, - !!(get_info_flags & VB_DISK_FLAG_REMOVABLE), + !!(disk_flags & VB_DISK_FLAG_REMOVABLE), " VbTryLoadKernel unexpected removable disk call"); return mock_vbtlk_retval; diff --git a/tests/vb2_ui_action_tests.c b/tests/vb2_ui_action_tests.c index 66a776eb..6db75bfd 100644 --- a/tests/vb2_ui_action_tests.c +++ b/tests/vb2_ui_action_tests.c @@ -235,10 +235,10 @@ static void add_mock_keypress(uint32_t press) } -static void set_mock_vbtlk(vb2_error_t retval, uint32_t get_info_flags) +static void set_mock_vbtlk(vb2_error_t retval, uint32_t disk_flags) { mock_vbtlk_retval = retval; - mock_vbtlk_expected_flag = get_info_flags; + mock_vbtlk_expected_flag = disk_flags; } static void displayed_eq(const char *text, @@ -481,10 +481,10 @@ uint32_t VbExKeyboardReadWithFlags(uint32_t *key_flags) return 0; } -vb2_error_t VbTryLoadKernel(struct vb2_context *c, uint32_t get_info_flags) +vb2_error_t VbTryLoadKernel(struct vb2_context *c, uint32_t disk_flags) { - TEST_EQ(mock_vbtlk_expected_flag, get_info_flags, - " unexpected get_info_flags"); + TEST_EQ(mock_vbtlk_expected_flag, disk_flags, + " unexpected disk_flags"); return mock_vbtlk_retval; } diff --git a/tests/vb2_ui_tests.c b/tests/vb2_ui_tests.c index 3eb0c9f9..9a84a939 100644 --- a/tests/vb2_ui_tests.c +++ b/tests/vb2_ui_tests.c @@ -120,7 +120,7 @@ static void add_mock_keypress(uint32_t press) add_mock_key(press, 0); } -static void add_mock_vbtlk(vb2_error_t retval, uint32_t get_info_flags) +static void add_mock_vbtlk(vb2_error_t retval, uint32_t disk_flags) { if (mock_vbtlk_total >= ARRAY_SIZE(mock_vbtlk_retval) || mock_vbtlk_total >= ARRAY_SIZE(mock_vbtlk_expected_flag)) { @@ -129,7 +129,7 @@ static void add_mock_vbtlk(vb2_error_t retval, uint32_t get_info_flags) } mock_vbtlk_retval[mock_vbtlk_total] = retval; - mock_vbtlk_expected_flag[mock_vbtlk_total] = get_info_flags; + mock_vbtlk_expected_flag[mock_vbtlk_total] = disk_flags; mock_vbtlk_total++; } @@ -517,7 +517,7 @@ uint32_t vb2ex_get_altfw_count(void) return mock_altfw_count; } -vb2_error_t VbTryLoadKernel(struct vb2_context *c, uint32_t get_info_flags) +vb2_error_t VbTryLoadKernel(struct vb2_context *c, uint32_t disk_flags) { int i = mock_iters; @@ -525,8 +525,8 @@ vb2_error_t VbTryLoadKernel(struct vb2_context *c, uint32_t get_info_flags) if (i >= mock_vbtlk_total) i = mock_vbtlk_total - 1; - TEST_EQ(mock_vbtlk_expected_flag[i], get_info_flags, - " unexpected get_info_flags"); + TEST_EQ(mock_vbtlk_expected_flag[i], disk_flags, + " unexpected disk_flags"); return mock_vbtlk_retval[i]; } diff --git a/tests/vboot_api_kernel4_tests.c b/tests/vboot_api_kernel4_tests.c index a25132f7..32eaf025 100644 --- a/tests/vboot_api_kernel4_tests.c +++ b/tests/vboot_api_kernel4_tests.c @@ -120,7 +120,7 @@ void vb2_secdata_kernel_set(struct vb2_context *c, kernel_version = value; } -vb2_error_t VbTryLoadKernel(struct vb2_context *c, uint32_t get_info_flags) +vb2_error_t VbTryLoadKernel(struct vb2_context *c, uint32_t disk_flags) { sd->kernel_version = new_version; diff --git a/tests/vboot_api_kernel_tests.c b/tests/vboot_api_kernel_tests.c index 9904770b..83b6d6c1 100644 --- a/tests/vboot_api_kernel_tests.c +++ b/tests/vboot_api_kernel_tests.c @@ -52,6 +52,40 @@ static const char pickme[] = "correct choice"; test_case_t test[] = { { + .name = "first drive (removable)", + .want_flags = VB_DISK_FLAG_REMOVABLE | VB_DISK_FLAG_FIXED, + .disks_to_provide = { + {4096, 100, VB_DISK_FLAG_REMOVABLE, pickme}, + {4096, 100, VB_DISK_FLAG_FIXED, "holygrail"}, + }, + .disk_count_to_return = DEFAULT_COUNT, + .diskgetinfo_return_val = VB2_SUCCESS, + .loadkernel_return_val = {0}, + .external_expected = {0}, + + .expected_recovery_request_val = VB2_RECOVERY_NOT_REQUESTED, + .expected_to_find_disk = pickme, + .expected_to_load_disk = pickme, + .expected_return_val = VB2_SUCCESS + }, + { + .name = "first drive (fixed)", + .want_flags = VB_DISK_FLAG_REMOVABLE | VB_DISK_FLAG_FIXED, + .disks_to_provide = { + {4096, 100, VB_DISK_FLAG_FIXED, pickme}, + {4096, 100, VB_DISK_FLAG_REMOVABLE, "holygrail"}, + }, + .disk_count_to_return = DEFAULT_COUNT, + .diskgetinfo_return_val = VB2_SUCCESS, + .loadkernel_return_val = {0}, + .external_expected = {0}, + + .expected_recovery_request_val = VB2_RECOVERY_NOT_REQUESTED, + .expected_to_find_disk = pickme, + .expected_to_load_disk = pickme, + .expected_return_val = VB2_SUCCESS + }, + { .name = "first removable drive", .want_flags = VB_DISK_FLAG_REMOVABLE, .disks_to_provide = { |