diff options
| author | Joel Kitching <kitching@google.com> | 2019-07-29 18:51:00 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2019-08-13 08:23:54 +0000 |
| commit | cf49e7b6ae5abee0552b596ec11b695b5d15853c (patch) | |
| tree | a6a6ef6cdf73ee3078b07f0c195795d67c625b0b /tests/vboot_api_kernel_tests.c | |
| parent | e6b803355ee3dc548a4519a71b29672d856f9bc5 (diff) | |
| download | vboot-cf49e7b6ae5abee0552b596ec11b695b5d15853c.tar.gz | |
vboot: replace VBERROR_SUCCESS with VB2_SUCCESS
Replace vboot1-style VBERROR_SUCCESS with VB2_SUCCESS
(trivial change since both are equal values).
BUG=b:124141368, chromium:988410
TEST=make clean && make runtests
BRANCH=none
Change-Id: I46e02471a031e9f36ec869d11d0b957d1c1b5769
Signed-off-by: Joel Kitching <kitching@google.com>
Cq-Depend: chromium:1728114
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/1722915
Commit-Queue: Joel Kitching <kitching@chromium.org>
Tested-by: Joel Kitching <kitching@chromium.org>
Reviewed-by: Julius Werner <jwerner@chromium.org>
Diffstat (limited to 'tests/vboot_api_kernel_tests.c')
| -rw-r--r-- | tests/vboot_api_kernel_tests.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/tests/vboot_api_kernel_tests.c b/tests/vboot_api_kernel_tests.c index 7afe6d04..5b1e71b9 100644 --- a/tests/vboot_api_kernel_tests.c +++ b/tests/vboot_api_kernel_tests.c @@ -78,14 +78,14 @@ test_case_t test[] = { {512, 100, VB_DISK_FLAG_REMOVABLE, "holygrail"}, }, .disk_count_to_return = DEFAULT_COUNT, - .diskgetinfo_return_val = VBERROR_SUCCESS, + .diskgetinfo_return_val = VB2_SUCCESS, .loadkernel_return_val = {0, 1, 1, 1, 1, 1, 1, 1, 1, 1,}, .external_expected = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0,}, .expected_recovery_request_val = VB2_RECOVERY_NOT_REQUESTED, .expected_to_find_disk = pickme, .expected_to_load_disk = pickme, - .expected_return_val = VBERROR_SUCCESS + .expected_return_val = VB2_SUCCESS }, { .name = "first removable drive", @@ -110,14 +110,14 @@ test_case_t test[] = { {512, 100, VB_DISK_FLAG_REMOVABLE, "holygrail"}, }, .disk_count_to_return = DEFAULT_COUNT, - .diskgetinfo_return_val = VBERROR_SUCCESS, + .diskgetinfo_return_val = VB2_SUCCESS, .loadkernel_return_val = {0, 1, 1, 1, 1, 1, 1, 1, 1, 1,}, .external_expected = {1, 0, 0, 0, 0, 0, 0, 0, 0, 0,}, .expected_recovery_request_val = VB2_RECOVERY_NOT_REQUESTED, .expected_to_find_disk = pickme, .expected_to_load_disk = pickme, - .expected_return_val = VBERROR_SUCCESS + .expected_return_val = VB2_SUCCESS }, { .name = "second removable drive", @@ -129,13 +129,13 @@ test_case_t test[] = { {512, 100, VB_DISK_FLAG_REMOVABLE, pickme}, }, .disk_count_to_return = DEFAULT_COUNT, - .diskgetinfo_return_val = VBERROR_SUCCESS, + .diskgetinfo_return_val = VB2_SUCCESS, .loadkernel_return_val = {1, 0, 1, 1, 1, 1, 1, 1, 1, 1,}, .expected_recovery_request_val = VB2_RECOVERY_NOT_REQUESTED, .expected_to_find_disk = pickme, .expected_to_load_disk = pickme, - .expected_return_val = VBERROR_SUCCESS + .expected_return_val = VB2_SUCCESS }, { .name = "first fixed drive", @@ -161,20 +161,20 @@ test_case_t test[] = { {512, 100, VB_DISK_FLAG_FIXED, "holygrail"}, }, .disk_count_to_return = DEFAULT_COUNT, - .diskgetinfo_return_val = VBERROR_SUCCESS, + .diskgetinfo_return_val = VB2_SUCCESS, .loadkernel_return_val = {0, 1, 1, 1, 1, 1, 1, 1, 1, 1,}, .expected_recovery_request_val = VB2_RECOVERY_NOT_REQUESTED, .expected_to_find_disk = pickme, .expected_to_load_disk = pickme, - .expected_return_val = VBERROR_SUCCESS + .expected_return_val = VB2_SUCCESS }, { .name = "no drives at all", .want_flags = VB_DISK_FLAG_FIXED, .disks_to_provide = {}, .disk_count_to_return = DEFAULT_COUNT, - .diskgetinfo_return_val = VBERROR_SUCCESS, + .diskgetinfo_return_val = VB2_SUCCESS, .loadkernel_return_val = {1, 1, 1, 1, 1, 1, 1, 1, 1, 1,}, .expected_recovery_request_val = VB2_RECOVERY_RW_NO_DISK, @@ -204,7 +204,7 @@ test_case_t test[] = { {512, 100, VB_DISK_FLAG_FIXED, "bad2"}, }, .disk_count_to_return = DEFAULT_COUNT, - .diskgetinfo_return_val = VBERROR_SUCCESS, + .diskgetinfo_return_val = VB2_SUCCESS, .loadkernel_return_val = {1, 1, 1, 1, 1, 1, 1, 1, 1, 1,}, .expected_recovery_request_val = VB2_RECOVERY_RW_NO_KERNEL, @@ -314,7 +314,7 @@ vb2_error_t VbExDiskFreeInfo(VbDiskInfo *infos, got_load_disk = (const char *)preserve_handle; VB2_DEBUG("%s(): got_load_disk = %s\n", __FUNCTION__, got_load_disk ? got_load_disk : "0"); - return VBERROR_SUCCESS; + return VB2_SUCCESS; } vb2_error_t LoadKernel(struct vb2_context *c, LoadKernelParams *params) |