diff options
| author | Randall Spangler <rspangler@chromium.org> | 2012-06-08 12:30:17 -0700 |
|---|---|---|
| committer | Gerrit <chrome-bot@google.com> | 2012-06-11 10:43:32 -0700 |
| commit | c0e3742996a84d3c503cfa002b09a0831bcb2c32 (patch) | |
| tree | 232ef3a8e633f9cec480775bdceae2e1868b9475 /tests | |
| parent | 71b126ba46c3b2fda3007dc0dd24a9f74adab604 (diff) | |
| download | vboot-c0e3742996a84d3c503cfa002b09a0831bcb2c32.tar.gz | |
Remove unused test fields from VbNvStorage
Confirmed via codesearch that these fields are not used outside of
vboot_reference itself, and the only use inside vboot_reference is one
test which checked that the test error generation itself worked.
BUG=chromium-os:31668
TEST=make && make runtests
Signed-off-by: Randall Spangler <rspangler@chromium.org>
Change-Id: Ic393e126ca2853f7aaff19ffd6fcdbdb1c47689f
Reviewed-on: https://gerrit.chromium.org/gerrit/24895
Reviewed-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/vboot_firmware_tests.c | 10 | ||||
| -rw-r--r-- | tests/vboot_nvstorage_test.c | 4 |
2 files changed, 2 insertions, 12 deletions
diff --git a/tests/vboot_firmware_tests.c b/tests/vboot_firmware_tests.c index 940e5ea7..7a023226 100644 --- a/tests/vboot_firmware_tests.c +++ b/tests/vboot_firmware_tests.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2011 The Chromium OS Authors. All rights reserved. +/* Copyright (c) 2012 The Chromium OS Authors. All rights reserved. * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * @@ -186,14 +186,6 @@ static void TestLoadFirmware(VbError_t expected_retval, static void LoadFirmwareTest(void) { uint32_t u; - /* Test error should cause abort */ - ResetMocks(); - VbNvSet(&vnc, VBNV_TEST_ERROR_FUNC, VBNV_TEST_ERROR_LOAD_FIRMWARE); - VbNvSet(&vnc, VBNV_TEST_ERROR_NUM, 1); - TestLoadFirmware(VBERROR_SIMULATED, VBNV_RECOVERY_RO_TEST_LF, - "Simulated error"); - TEST_EQ(shared->firmware_index, 0xFF, "Error means no firmware index"); - /* Require GBB */ ResetMocks(); cparams.gbb_data = NULL; diff --git a/tests/vboot_nvstorage_test.c b/tests/vboot_nvstorage_test.c index d3f431ef..46219df5 100644 --- a/tests/vboot_nvstorage_test.c +++ b/tests/vboot_nvstorage_test.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2011 The Chromium OS Authors. All rights reserved. +/* Copyright (c) 2012 The Chromium OS Authors. All rights reserved. * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * @@ -29,8 +29,6 @@ static VbNvField nvfields[] = { {VBNV_RECOVERY_REQUEST, 0, 0x42, 0xED, "recovery request"}, {VBNV_LOCALIZATION_INDEX, 0, 0x69, 0xB0, "localization index"}, {VBNV_KERNEL_FIELD, 0, 0x12345678, 0xFEDCBA98, "kernel field"}, - {VBNV_TEST_ERROR_FUNC, 0, 1, 7, "verified boot test error func"}, - {VBNV_TEST_ERROR_NUM, 0, 3, 6, "verified boot test error number"}, {VBNV_DEV_BOOT_USB, 0, 1, 0, "dev boot usb"}, {VBNV_DEV_BOOT_SIGNED_ONLY, 0, 1, 0, "dev boot custom"}, {0, 0, 0, 0, NULL} |