diff options
| author | Joel Kitching <kitching@google.com> | 2020-03-20 18:07:18 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-05-25 11:27:01 +0000 |
| commit | 77bb1fccb2dca1caeb19bec7dfa6d59d7da60be7 (patch) | |
| tree | f1f69dfe7d23628e1623a5e3e27a00004985ea36 | |
| parent | ff2a2f2cf6b77be178b2425bc0c60ef5c6c8cf21 (diff) | |
| download | vboot-77bb1fccb2dca1caeb19bec7dfa6d59d7da60be7.tar.gz | |
vboot: fix vboot_api_kernel4_tests to work with LEGACY_MENU_UI=1
Set FWMP to "initialized" to make accesses work, and also
implement the "Menu" variant of UI mock functions.
BUG=b:124141368
TEST=make clean && make runtests
BRANCH=none
Change-Id: I50d787c88a9682878ae7e6fe3f3e7a0578757d74
Signed-off-by: Joel Kitching <kitching@google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/2112396
Commit-Queue: Joel Kitching <kitching@chromium.org>
Tested-by: Joel Kitching <kitching@chromium.org>
Reviewed-by: Julius Werner <jwerner@chromium.org>
Reviewed-by: Yu-Ping Wu <yupingso@chromium.org>
| -rw-r--r-- | tests/vboot_api_kernel4_tests.c | 25 |
1 files changed, 23 insertions, 2 deletions
diff --git a/tests/vboot_api_kernel4_tests.c b/tests/vboot_api_kernel4_tests.c index 45ba7be5..0a07b388 100644 --- a/tests/vboot_api_kernel4_tests.c +++ b/tests/vboot_api_kernel4_tests.c @@ -75,6 +75,7 @@ static void reset_common_data(void) mock_presence_count = 0; sd->status |= VB2_SD_STATUS_SECDATA_KERNEL_INIT; + sd->status |= VB2_SD_STATUS_SECDATA_FWMP_INIT; } static void test_slk(vb2_error_t retval, int recovery_reason, const char *desc) @@ -131,7 +132,7 @@ vb2_error_t VbTryLoadKernel(struct vb2_context *c, uint32_t get_info_flags) return vbboot_retval; } -vb2_error_t VbBootDeveloperLegacyClamshell(struct vb2_context *c) +static vb2_error_t boot_dev(struct vb2_context *c) { if (vbboot_retval == -2) return VB2_ERROR_MOCK; @@ -139,7 +140,17 @@ vb2_error_t VbBootDeveloperLegacyClamshell(struct vb2_context *c) return vbboot_retval; } -vb2_error_t VbBootRecoveryLegacyClamshell(struct vb2_context *c) +vb2_error_t VbBootDeveloperLegacyClamshell(struct vb2_context *c) +{ + return boot_dev(c); +} + +vb2_error_t VbBootDeveloperLegacyMenu(struct vb2_context *c) +{ + return boot_dev(c); +} + +static vb2_error_t boot_legacy(struct vb2_context *c) { TEST_EQ(current_recovery_reason, expected_recovery_reason, " recovery reason"); @@ -151,6 +162,16 @@ vb2_error_t VbBootRecoveryLegacyClamshell(struct vb2_context *c) return vbboot_retval; } +vb2_error_t VbBootRecoveryLegacyClamshell(struct vb2_context *c) +{ + return boot_legacy(c); +} + +vb2_error_t VbBootRecoveryLegacyMenu(struct vb2_context *c) +{ + return boot_legacy(c); +} + vb2_error_t VbBootDiagnosticLegacyClamshell(struct vb2_context *c) { if (vbboot_retval == -4) |