diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/vb2_misc_tests.c | 17 | ||||
| -rw-r--r-- | tests/vb2_nvstorage_tests.c | 2 | ||||
| -rw-r--r-- | tests/vboot_nvstorage_test.c | 2 |
3 files changed, 21 insertions, 0 deletions
diff --git a/tests/vb2_misc_tests.c b/tests/vb2_misc_tests.c index 72c284c6..6155f23e 100644 --- a/tests/vb2_misc_tests.c +++ b/tests/vb2_misc_tests.c @@ -450,6 +450,23 @@ static void select_slot_tests(void) TEST_EQ(sd->fw_slot, 0, "selected A"); TEST_EQ(cc.flags & VB2_CONTEXT_FW_SLOT_B, 0, "didn't choose B"); TEST_EQ(vb2_nv_get(&cc, VB2_NV_TRY_COUNT), 2, "tries decremented"); + + /* Tried/result get copied to the previous fields */ + reset_common_data(); + vb2_nv_set(&cc, VB2_NV_FW_TRIED, 0); + vb2_nv_set(&cc, VB2_NV_FW_RESULT, VB2_FW_RESULT_SUCCESS); + vb2_select_fw_slot(&cc); + TEST_EQ(vb2_nv_get(&cc, VB2_NV_FW_PREV_TRIED), 0, "prev A"); + TEST_EQ(vb2_nv_get(&cc, VB2_NV_FW_PREV_RESULT), VB2_FW_RESULT_SUCCESS, + "prev success"); + + reset_common_data(); + vb2_nv_set(&cc, VB2_NV_FW_TRIED, 1); + vb2_nv_set(&cc, VB2_NV_FW_RESULT, VB2_FW_RESULT_FAILURE); + vb2_select_fw_slot(&cc); + TEST_EQ(vb2_nv_get(&cc, VB2_NV_FW_PREV_TRIED), 1, "prev B"); + TEST_EQ(vb2_nv_get(&cc, VB2_NV_FW_PREV_RESULT), VB2_FW_RESULT_FAILURE, + "prev failure"); } int main(int argc, char* argv[]) diff --git a/tests/vb2_nvstorage_tests.c b/tests/vb2_nvstorage_tests.c index b648ca95..46547f8f 100644 --- a/tests/vb2_nvstorage_tests.c +++ b/tests/vb2_nvstorage_tests.c @@ -34,6 +34,8 @@ static struct nv_field nvfields[] = { {VB2_NV_TRY_COUNT, 0, 6, 15, "try B count"}, {VB2_NV_FW_TRIED, 0, 1, 0, "firmware tried"}, {VB2_NV_FW_RESULT, 0, 1, 2, "firmware result"}, + {VB2_NV_FW_PREV_TRIED, 0, 1, 0, "firmware prev tried"}, + {VB2_NV_FW_PREV_RESULT, 0, 1, 3, "firmware prev result"}, {VB2_NV_RECOVERY_REQUEST, 0, 0x42, 0xED, "recovery request"}, {VB2_NV_RECOVERY_SUBCODE, 0, 0x56, 0xAC, "recovery subcode"}, {VB2_NV_LOCALIZATION_INDEX, 0, 0x69, 0xB0, "localization index"}, diff --git a/tests/vboot_nvstorage_test.c b/tests/vboot_nvstorage_test.c index 2d096182..ec857382 100644 --- a/tests/vboot_nvstorage_test.c +++ b/tests/vboot_nvstorage_test.c @@ -41,6 +41,8 @@ static VbNvField nvfields[] = { {VBNV_FW_TRY_NEXT, 0, 1, 0, "try next"}, {VBNV_FW_TRIED, 0, 1, 0, "firmware tried"}, {VBNV_FW_RESULT, VBNV_FW_RESULT_UNKNOWN, 1, 2, "firmware result"}, + {VBNV_FW_PREV_TRIED, 0, 1, 0, "firmware prev tried"}, + {VBNV_FW_PREV_RESULT, VBNV_FW_RESULT_UNKNOWN, 1, 3, "firmware prev result"}, {0, 0, 0, 0, NULL} }; |