diff options
| author | Mathew King <mathewk@chromium.org> | 2019-04-11 11:56:47 -0600 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2019-04-13 18:37:56 -0700 |
| commit | 351c005eddd763ba89997ebc08ad0e19d2d1c3a0 (patch) | |
| tree | e9844999a64816a56b2b2804f78cccf86d69b6a9 /tests | |
| parent | 6ed4c9938ff0026bb2837171242cd39141e34055 (diff) | |
| download | vboot-351c005eddd763ba89997ebc08ad0e19d2d1c3a0.tar.gz | |
Enable launching diagnostics from OS broken screenstabilize-12088.B
If firmware diagnostics is enabled allow the user to lauch diagnostics
from the OS broken screen. Currently diagnostics can only be launched
from the recovery screen.
BUG=b:130244249
TEST=Tested on arcada device
make runmisctests
BRANCH=none
Change-Id: Ic6946338605599ea7411b5658acb2c6fc960a782
Signed-off-by: Mathew King <mathewk@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/1564448
Commit-Ready: ChromeOS CL Exonerator Bot <chromiumos-cl-exonerator@appspot.gserviceaccount.com>
Reviewed-by: Julius Werner <jwerner@chromium.org>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/vboot_api_kernel2_tests.c | 41 |
1 files changed, 35 insertions, 6 deletions
diff --git a/tests/vboot_api_kernel2_tests.c b/tests/vboot_api_kernel2_tests.c index fc13362b..889d2cba 100644 --- a/tests/vboot_api_kernel2_tests.c +++ b/tests/vboot_api_kernel2_tests.c @@ -1100,8 +1100,9 @@ static void VbBootRecTest(void) ResetMocks(); shared->flags = VBSD_BOOT_REC_SWITCH_ON; trust_ec = 1; + vbtlk_retval = VBERROR_NO_DISK_FOUND - VB_DISK_FLAG_REMOVABLE; shutdown_request_calls_left = 100; - mock_keypress[0] = 0x03; + mock_keypress[0] = VB_KEY_CTRL('C'); TEST_EQ(vb2_nv_get(&ctx, VB2_NV_DIAG_REQUEST), 0, "todiag is zero"); if (DIAGNOSTIC_UI) @@ -1112,17 +1113,21 @@ static void VbBootRecTest(void) TEST_EQ(VbBootRecovery(&ctx), VBERROR_SHUTDOWN_REQUESTED, "Ctrl+C todiag - disabled"); + TEST_EQ(vb2_nv_get(&ctx, VB2_NV_DIAG_REQUEST), DIAGNOSTIC_UI, - "todiag is updated for Ctrl-C"); + " todiag is updated for Ctrl-C"); TEST_EQ(vb2_nv_get(&ctx, VB2_NV_OPROM_NEEDED), 0, - "todiag doesn't update for unneeded opom"); + " todiag doesn't update for unneeded opom"); + TEST_EQ(screens_displayed[0], VB_SCREEN_RECOVERY_INSERT, + " insert screen"); /* Test Diagnostic Mode via F12 - oprom needed */ ResetMocks(); shared->flags = VBSD_BOOT_REC_SWITCH_ON | VBSD_OPROM_MATTERS; trust_ec = 1; + vbtlk_retval = VBERROR_NO_DISK_FOUND - VB_DISK_FLAG_REMOVABLE; shutdown_request_calls_left = 100; - mock_keypress[0] = 0x114; + mock_keypress[0] = VB_KEY_F(12); TEST_EQ(vb2_nv_get(&ctx, VB2_NV_DIAG_REQUEST), 0, "todiag is zero"); if (DIAGNOSTIC_UI) @@ -1134,9 +1139,33 @@ static void VbBootRecTest(void) VBERROR_SHUTDOWN_REQUESTED, "F12 todiag - disabled"); TEST_EQ(vb2_nv_get(&ctx, VB2_NV_DIAG_REQUEST), DIAGNOSTIC_UI, - "todiag is updated for F12"); + " todiag is updated for F12"); TEST_EQ(vb2_nv_get(&ctx, VB2_NV_OPROM_NEEDED), DIAGNOSTIC_UI, - "todiag updates opom, if need"); + " todiag updates opom, if need"); + TEST_EQ(screens_displayed[0], VB_SCREEN_RECOVERY_INSERT, + " insert screen"); + + /* Test Diagnostic Mode via Ctrl-C OS broken */ + ResetMocks(); + shared->flags = 0; + shutdown_request_calls_left = 100; + mock_keypress[0] = VB_KEY_CTRL('C'); + TEST_EQ(vb2_nv_get(&ctx, VB2_NV_DIAG_REQUEST), 0, + "todiag is zero"); + if (DIAGNOSTIC_UI) + TEST_EQ(VbBootRecovery(&ctx), + VBERROR_REBOOT_REQUIRED, + "Ctrl+C todiag os broken - enabled"); + else + TEST_EQ(VbBootRecovery(&ctx), + VBERROR_SHUTDOWN_REQUESTED, + "Ctrl+C todiag os broken - disabled"); + TEST_EQ(vb2_nv_get(&ctx, VB2_NV_DIAG_REQUEST), DIAGNOSTIC_UI, + " todiag is updated for Ctrl-C"); + TEST_EQ(vb2_nv_get(&ctx, VB2_NV_OPROM_NEEDED), 0, + " todiag doesn't update for unneeded opom"); + TEST_EQ(screens_displayed[0], VB_SCREEN_OS_BROKEN, + " os broken screen"); printf("...done.\n"); } |