diff options
| author | Joel Kitching <kitching@google.com> | 2019-08-30 16:19:35 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2019-10-23 16:28:21 +0000 |
| commit | 1ed2dfff778285f36321d90f01d919b948182758 (patch) | |
| tree | 1290fd08c018ab384e1033f5f9062b0f32da2ccd /tests | |
| parent | c7a384c92d83eac81506e3898f2db741f14a17f1 (diff) | |
| download | vboot-1ed2dfff778285f36321d90f01d919b948182758.tar.gz | |
vboot: merge pre-vboot1 error codes into vb2_return_code
Since these pre-historic functions have already been updated to
return vb2_error_t values, their error codes should be merged
into vb2_return_code just like was done for vboot1 error codes
in CL:1722913.
BUG=b:124141368, chromium:988410
TEST=make clean && make runtests
BRANCH=none
Change-Id: I5c64eca088a5f130fa5b420f94c85d04955948d2
Signed-off-by: Joel Kitching <kitching@google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/1776292
Tested-by: Joel Kitching <kitching@chromium.org>
Commit-Queue: Joel Kitching <kitching@chromium.org>
Reviewed-by: Joel Kitching <kitching@chromium.org>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/vboot_common_tests.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/vboot_common_tests.c b/tests/vboot_common_tests.c index 1869556b..49f2f2b9 100644 --- a/tests/vboot_common_tests.c +++ b/tests/vboot_common_tests.c @@ -88,18 +88,18 @@ static void VbSharedDataTest(void) uint8_t buf[VB_SHARED_DATA_MIN_SIZE + 1]; VbSharedDataHeader* d = (VbSharedDataHeader*)buf; - TEST_NEQ(VBOOT_SUCCESS, + TEST_NEQ(VB2_SUCCESS, VbSharedDataInit(d, sizeof(VbSharedDataHeader) - 1), "VbSharedDataInit too small"); - TEST_NEQ(VBOOT_SUCCESS, + TEST_NEQ(VB2_SUCCESS, VbSharedDataInit(d, VB_SHARED_DATA_MIN_SIZE - 1), "VbSharedDataInit too small 2"); - TEST_NEQ(VBOOT_SUCCESS, + TEST_NEQ(VB2_SUCCESS, VbSharedDataInit(NULL, VB_SHARED_DATA_MIN_SIZE), "VbSharedDataInit null"); memset(buf, 0x68, sizeof(buf)); - TEST_EQ(VBOOT_SUCCESS, VbSharedDataInit(d, VB_SHARED_DATA_MIN_SIZE), + TEST_EQ(VB2_SUCCESS, VbSharedDataInit(d, VB_SHARED_DATA_MIN_SIZE), "VbSharedDataInit"); /* Check fields that should have been initialized */ |