diff options
Diffstat (limited to 'tests')
-rw-r--r-- | tests/vboot_api_kernel2_tests.c | 4 | ||||
-rw-r--r-- | tests/vboot_api_kernel4_tests.c | 18 |
2 files changed, 3 insertions, 19 deletions
diff --git a/tests/vboot_api_kernel2_tests.c b/tests/vboot_api_kernel2_tests.c index 66de74aa..c8e269e0 100644 --- a/tests/vboot_api_kernel2_tests.c +++ b/tests/vboot_api_kernel2_tests.c @@ -1408,8 +1408,8 @@ static void VbBootRecTest(void) "F12 todiag - disabled"); TEST_EQ(vb2_nv_get(&ctx, VB2_NV_DIAG_REQUEST), DIAGNOSTIC_UI, " todiag is updated for F12"); - TEST_EQ(vb2_nv_get(&ctx, VB2_NV_DISPLAY_REQUEST), DIAGNOSTIC_UI, - " todiag sets DISPLAY_REQUEST if needed"); + TEST_EQ(vb2_nv_get(&ctx, VB2_NV_DISPLAY_REQUEST), 0, + " todiag doesn't set unneeded DISPLAY_REQUEST"); TEST_EQ(screens_displayed[0], VB_SCREEN_RECOVERY_INSERT, " insert screen"); diff --git a/tests/vboot_api_kernel4_tests.c b/tests/vboot_api_kernel4_tests.c index b3b34022..5d4370c0 100644 --- a/tests/vboot_api_kernel4_tests.c +++ b/tests/vboot_api_kernel4_tests.c @@ -266,27 +266,11 @@ static void VbSlkTest(void) ResetMocks(); mock_switches[1] = VB_SWITCH_FLAG_PHYS_PRESENCE_PRESSED; vb2_nv_set(&ctx_nvram_backend, VB2_NV_DIAG_REQUEST, 1); - vb2_nv_set(&ctx_nvram_backend, VB2_NV_DISPLAY_REQUEST, 1); vbboot_retval = -4; test_slk(VBERROR_SIMULATED, 0, - "Normal boot with diag - display available"); + "Normal boot with diag"); TEST_EQ(vb2_nv_get(&ctx_nvram_backend, VB2_NV_DIAG_REQUEST), 0, " diag not requested"); - TEST_EQ(vb2_nv_get(&ctx_nvram_backend, VB2_NV_DISPLAY_REQUEST), - 0, " DISPLAY_REQUEST disabled"); - - ResetMocks(); - mock_switches[1] = VB_SWITCH_FLAG_PHYS_PRESENCE_PRESSED; - vb2_nv_set(&ctx_nvram_backend, VB2_NV_DIAG_REQUEST, 1); - vb2_nv_set(&ctx_nvram_backend, VB2_NV_DISPLAY_REQUEST, 0); - sd->flags &= ~VB2_SD_FLAG_DISPLAY_AVAILABLE; - vbboot_retval = -4; - test_slk(VBERROR_REBOOT_REQUIRED, 0, - "Normal boot with diag - display unavailable"); - TEST_EQ(vb2_nv_get(&ctx_nvram_backend, VB2_NV_DIAG_REQUEST), - 1, " diag requested"); - TEST_EQ(vb2_nv_get(&ctx_nvram_backend, VB2_NV_DISPLAY_REQUEST), - 1, " DISPLAY_REQUEST needed"); } /* Boot dev */ |