From 8734b70ff56e48900e4aaa68c1c56e84d60ce2ac Mon Sep 17 00:00:00 2001 From: Vadim Bendebury Date: Sun, 8 Jan 2017 16:17:35 -0800 Subject: [PATCH] test: nvmem_vars: drop redundant erase_flash() invocations There is no need to invoke erase_flash() before load_flash(), as load_flash() invokes that function itself. BRANCH=none BUG=none TEST=make buildall -j still passes Change-Id: Ic4aba9f680402418ec6268d6ed5800065a09110b Signed-off-by: Vadim Bendebury Reviewed-on: https://chromium-review.googlesource.com/426087 Reviewed-by: Bill Richardson Reviewed-by: Mary Ruthven --- test/nvmem_vars.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/test/nvmem_vars.c b/test/nvmem_vars.c index 7a0333e525..1ea2a312c6 100644 --- a/test/nvmem_vars.c +++ b/test/nvmem_vars.c @@ -186,12 +186,10 @@ static int check_init(void) [513] = 0x01, [514] = 0x52, /* 513-598 */ [599] = 0xff }; - erase_flash(); load_flash(good, sizeof(good)); TEST_ASSERT(initvars() == EC_SUCCESS); TEST_ASSERT(verify_flash(good, sizeof(good))); - erase_flash(); load_flash(empty, sizeof(empty)); TEST_ASSERT(initvars() == EC_SUCCESS); TEST_ASSERT(verify_flash(empty, sizeof(empty))); @@ -201,27 +199,22 @@ static int check_init(void) TEST_ASSERT(initvars() == EC_SUCCESS); TEST_ASSERT(verify_flash(empty, sizeof(empty))); - erase_flash(); load_flash(bad_key, sizeof(bad_key)); TEST_ASSERT(initvars() == EC_SUCCESS); TEST_ASSERT(verify_flash(empty, sizeof(empty))); - erase_flash(); load_flash(bad_val, sizeof(bad_val)); TEST_ASSERT(initvars() == EC_SUCCESS); TEST_ASSERT(verify_flash(empty, sizeof(empty))); - erase_flash(); load_flash(too_big, sizeof(too_big)); TEST_ASSERT(initvars() == EC_SUCCESS); TEST_ASSERT(verify_flash(empty, sizeof(empty))); - erase_flash(); load_flash(just_right, sizeof(just_right)); TEST_ASSERT(initvars() == EC_SUCCESS); TEST_ASSERT(verify_flash(just_right, sizeof(just_right))); - erase_flash(); load_flash(not_right, sizeof(not_right)); TEST_ASSERT(initvars() == EC_SUCCESS); TEST_ASSERT(verify_flash(empty, sizeof(empty)));