diff options
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"); |