diff options
| author | Furquan Shaikh <furquan@google.com> | 2015-09-08 15:40:09 -0700 |
|---|---|---|
| committer | ChromeOS bot <3su6n15k.default@developer.gserviceaccount.com> | 2015-09-09 01:14:34 +0000 |
| commit | 20ea5cf4d35da435283f852059fe7dcd4341988b (patch) | |
| tree | b5b2aa3b540eb1c2c1ad0df12d56011e6b4f564c | |
| parent | e58098995fdb40d61f83a5916cf2140822f43eb2 (diff) | |
| download | vboot-20ea5cf4d35da435283f852059fe7dcd4341988b.tar.gz | |
tests: Fix tests for nvstorage
With CL:293950 , fastboot_unlock_in_fw is not cleared when switching to
normal-mode. Update the tests accordingly.
BUG=None
BRANCH=None
TEST=make -j runtests successful.
Change-Id: Ic8d5ec9d0283ed507b16479bb980385d4d844ebb
Signed-off-by: Furquan Shaikh <furquan@google.com>
Reviewed-on: https://chromium-review.googlesource.com/298173
Trybot-Ready: Furquan Shaikh <furquan@chromium.org>
Tested-by: Furquan Shaikh <furquan@chromium.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Commit-Queue: Furquan Shaikh <furquan@chromium.org>
| -rw-r--r-- | tests/vb2_misc_tests.c | 2 | ||||
| -rw-r--r-- | tests/vboot_api_init_tests.c | 6 |
2 files changed, 0 insertions, 8 deletions
diff --git a/tests/vb2_misc_tests.c b/tests/vb2_misc_tests.c index 3346f20f..b8eee343 100644 --- a/tests/vb2_misc_tests.c +++ b/tests/vb2_misc_tests.c @@ -320,8 +320,6 @@ static void dev_switch_tests(void) 0, "cleared dev boot signed only"); TEST_EQ(vb2_nv_get(&cc, VB2_NV_DEV_BOOT_FASTBOOT_FULL_CAP), 0, "cleared dev boot fastboot full cap"); - TEST_EQ(vb2_nv_get(&cc, VB2_NV_FASTBOOT_UNLOCK_IN_FW), - 0, "cleared dev boot fastboot unlock in fw"); /* Normal-dev transition clears TPM */ reset_common_data(); diff --git a/tests/vboot_api_init_tests.c b/tests/vboot_api_init_tests.c index bfa5d7df..053fc3ad 100644 --- a/tests/vboot_api_init_tests.c +++ b/tests/vboot_api_init_tests.c @@ -586,8 +586,6 @@ static void VbInitTestBackup(void) TEST_EQ(u, 0, " NV dev_boot_signed_only"); VbNvGet(&vnc, VBNV_DEV_BOOT_FASTBOOT_FULL_CAP, &u); TEST_EQ(u, 0, " NV dev_boot_fastboot_full_cap"); - VbNvGet(&vnc, VBNV_FASTBOOT_UNLOCK_IN_FW, &u); - TEST_EQ(u, 0, " NV_fastboot_unlock_in_fw "); /* So we should have written the backup */ TEST_EQ(backup_write_called, 1, " Backup written once"); /* And the backup should reflect the persisent flags. */ @@ -605,8 +603,6 @@ static void VbInitTestBackup(void) TEST_EQ(u, 0, " BU dev_boot_signed_only"); VbNvGet(&tmp_vnc, VBNV_DEV_BOOT_FASTBOOT_FULL_CAP, &u); TEST_EQ(u, 0, " BU dev_boot_fastboot_full_cap"); - VbNvGet(&tmp_vnc, VBNV_FASTBOOT_UNLOCK_IN_FW, &u); - TEST_EQ(u, 0, " BU fastboot_unlock_in_fw"); /* but not the others */ VbNvGet(&tmp_vnc, VBNV_OPROM_NEEDED, &u); TEST_EQ(u, 0, " BU oprom_needed"); @@ -776,8 +772,6 @@ static void VbInitTestBackup(void) TEST_EQ(u, 0, " BU dev_boot_signed_only"); VbNvGet(&vnc, VBNV_DEV_BOOT_FASTBOOT_FULL_CAP, &u); TEST_EQ(u, 0, " BU dev_boot_fastboot_full_cap"); - VbNvGet(&vnc, VBNV_FASTBOOT_UNLOCK_IN_FW, &u); - TEST_EQ(u, 0, " BU fastboot_unlock_in_fw"); } |