diff options
Diffstat (limited to 'tests/vboot_api_kernel4_tests.c')
-rw-r--r-- | tests/vboot_api_kernel4_tests.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/tests/vboot_api_kernel4_tests.c b/tests/vboot_api_kernel4_tests.c index 645b2049..a33c5bc2 100644 --- a/tests/vboot_api_kernel4_tests.c +++ b/tests/vboot_api_kernel4_tests.c @@ -219,10 +219,9 @@ static void VbSlkTest(void) TEST_EQ(rkr_version, 0x20003, " version"); ResetMocks(); + vb2_nv_set(&ctx_nvram_backend, VB2_NV_FW_RESULT, VB2_FW_RESULT_TRYING); new_version = 0x20003; - shared->flags |= VBSD_FWB_TRIED; - shared->firmware_index = 1; - test_slk(0, 0, "Don't roll forward during try B"); + test_slk(0, 0, "Don't roll forward kernel when trying new FW"); TEST_EQ(rkr_version, 0x10002, " version"); ResetMocks(); @@ -238,14 +237,6 @@ static void VbSlkTest(void) TEST_EQ(rkr_version, 0x10002, " version"); ResetMocks(); - vbboot_retval = VBERROR_INVALID_KERNEL_FOUND; - vb2_nv_set(&ctx_nvram_backend, VB2_NV_RECOVERY_REQUEST, 123); - shared->flags |= VBSD_FWB_TRIED; - shared->firmware_index = 1; - test_slk(VBERROR_INVALID_KERNEL_FOUND, - 0, "Don't go to recovery if try b fails to find a kernel"); - - ResetMocks(); new_version = 0x20003; rkw_retval = 123; test_slk(VBERROR_TPM_WRITE_KERNEL, |