diff options
| author | Hsin-Te Yuan <yuanhsinte@google.com> | 2022-07-08 16:55:54 +0800 |
|---|---|---|
| committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2022-07-15 07:11:44 +0000 |
| commit | a975eed306e16947c30b48ccd25ab67a37295742 (patch) | |
| tree | 47c71250e1c5d9d1b841fade2ad8e69632f9cef9 /tests | |
| parent | b68529526ab82d1da99b58155620beaa8aa3f487 (diff) | |
| download | vboot-a975eed306e16947c30b48ccd25ab67a37295742.tar.gz | |
2kernel.c: check display request in vb2api_kernel_phase2stabilize-14989.85.Bstabilize-14989.107.Brelease-R105-14989.B
In preparation for moving VbTryLoadKernel to depthcharge, move the
VB2_NV_DISPLAY_REQUEST check from vb2api_normal_boot to
vb2api_kernel_phase2.
BUG=b:172339016
BRANCH=none
TEST=make runtests
Signed-off-by: Hsin-Te Yuan <yuanhsinte@google.com>
Change-Id: I3629d8dbbcaba23220152543ba77558c8bbcdc7b
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/3752431
Reviewed-by: Yu-Ping Wu <yupingso@chromium.org>
Reviewed-by: Hsuan Ting Chen <roccochen@chromium.org>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/vb2_kernel2_tests.c | 16 | ||||
| -rw-r--r-- | tests/vb2_kernel_tests.c | 8 |
2 files changed, 8 insertions, 16 deletions
diff --git a/tests/vb2_kernel2_tests.c b/tests/vb2_kernel2_tests.c index ef06b5f1..04defe50 100644 --- a/tests/vb2_kernel2_tests.c +++ b/tests/vb2_kernel2_tests.c @@ -114,22 +114,6 @@ static void normal_boot_tests(void) "vb2api_normal_boot() returns VB2_ERROR_MOCK"); reset_common_data(); - mock_vbtlk_expect_fixed = 0; - vb2_nv_set(ctx, VB2_NV_DISPLAY_REQUEST, 1); - TEST_EQ(vb2api_normal_boot(ctx, &kparams), VB2_REQUEST_REBOOT, - "vb2api_normal_boot() reboot to reset NVRAM display request"); - TEST_EQ(vb2_nv_get(ctx, VB2_NV_DISPLAY_REQUEST), 0, - " display request reset"); - - reset_common_data(); - mock_vbtlk_expect_fixed = 0; - vb2_nv_set(ctx, VB2_NV_DIAG_REQUEST, 1); - TEST_EQ(vb2api_normal_boot(ctx, &kparams), VB2_REQUEST_REBOOT, - "vb2api_normal_boot() reboot to reset NVRAM diag request"); - TEST_EQ(vb2_nv_get(ctx, VB2_NV_DIAG_REQUEST), 0, - " diag request reset"); - - reset_common_data(); new_version = 0x20003; TEST_SUCC(vb2api_normal_boot(ctx, &kparams), "Roll forward"); TEST_EQ(kernel_version, 0x20003, " version"); diff --git a/tests/vb2_kernel_tests.c b/tests/vb2_kernel_tests.c index a573b52b..ca945e95 100644 --- a/tests/vb2_kernel_tests.c +++ b/tests/vb2_kernel_tests.c @@ -325,6 +325,14 @@ static void phase2_tests(void) TEST_EQ(mock_ec_sync_called, 1, " EC sync"); reset_common_data(FOR_PHASE2); + SET_BOOT_MODE(ctx, VB2_BOOT_MODE_NORMAL); + vb2_nv_set(ctx, VB2_NV_DISPLAY_REQUEST, 1); + TEST_EQ(vb2api_kernel_phase2(ctx), VB2_REQUEST_REBOOT, + "Normal mode with display request: rebooting"); + TEST_EQ(vb2_nv_get(ctx, VB2_NV_DISPLAY_REQUEST), 0, + " display request reset"); + + reset_common_data(FOR_PHASE2); SET_BOOT_MODE(ctx, VB2_BOOT_MODE_DEVELOPER); TEST_SUCC(vb2api_kernel_phase2(ctx), "Developer mode"); TEST_EQ(mock_ec_sync_called, 1, " EC sync"); |