diff options
| author | Joel Kitching <kitching@google.com> | 2020-01-10 01:50:45 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-01-10 19:50:51 +0000 |
| commit | 7d9ddea16d8face9fd56199bcdda0aa34c556071 (patch) | |
| tree | 9726d8ef77190eed56a89915130b68deb76036d1 /tests/vboot_api_kernel4_tests.c | |
| parent | ffcc2c5daa9032a21b80daf13fba2fc4ab5f8fd1 (diff) | |
| download | vboot-7d9ddea16d8face9fd56199bcdda0aa34c556071.tar.gz | |
vboot: use vboot 2 flags for checking rec/dev mode
Use vboot 2 flags for checking whether dev mode is enabled, and
whether manual recovery was requested.
VBSD_BOOT_DEV_SWITCH_ON --> VB2_SD_FLAG_DEV_MODE_ENABLED
VBSD_BOOT_REC_SWITCH_ON --> VB2_SD_FLAG_MANUAL_RECOVERY
BUG=b:124141368, chromium:1038260
TEST=make clean && make runtests
BRANCH=none
Change-Id: Idb439f658391f46170704a0fd614853054e1c64d
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/1992852
Tested-by: Joel Kitching <kitching@chromium.org>
Reviewed-by: Yu-Ping Wu <yupingso@chromium.org>
Commit-Queue: Joel Kitching <kitching@chromium.org>
Diffstat (limited to 'tests/vboot_api_kernel4_tests.c')
| -rw-r--r-- | tests/vboot_api_kernel4_tests.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/vboot_api_kernel4_tests.c b/tests/vboot_api_kernel4_tests.c index 80c8099a..71efb2cb 100644 --- a/tests/vboot_api_kernel4_tests.c +++ b/tests/vboot_api_kernel4_tests.c @@ -284,12 +284,12 @@ static void VbSlkTest(void) /* Boot dev */ ResetMocks(); - shared->flags |= VBSD_BOOT_DEV_SWITCH_ON; + sd->flags |= VB2_SD_FLAG_DEV_MODE_ENABLED; vbboot_retval = -2; test_slk(VB2_ERROR_MOCK, 0, "Dev boot bad"); ResetMocks(); - shared->flags |= VBSD_BOOT_DEV_SWITCH_ON; + sd->flags |= VB2_SD_FLAG_DEV_MODE_ENABLED; new_version = 0x20003; test_slk(0, 0, "Dev doesn't roll forward"); TEST_EQ(kernel_version, 0x10002, " version"); |