From 9e8ed9029e76c5b94862be98a6d8ecdc02f1923f Mon Sep 17 00:00:00 2001 From: Daniele Lacamera Date: Mon, 30 Jun 2025 13:33:36 +0200 Subject: [PATCH] Update unit tests: inverted selection after correcting update_trigger double write --- tools/unit-tests/unit-enc-nvm.c | 7 ++++--- tools/unit-tests/unit-nvm.c | 6 +++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/tools/unit-tests/unit-enc-nvm.c b/tools/unit-tests/unit-enc-nvm.c index d5e361a6..4fec9b20 100644 --- a/tools/unit-tests/unit-enc-nvm.c +++ b/tools/unit-tests/unit-enc-nvm.c @@ -27,6 +27,7 @@ #define MOCK_ADDRESS_SWAP 0xCE000000 const char ENCRYPT_KEY[] = "0123456789abcdef0123456789abcdef0123456789abcdef"; #include +#include "image.h" #include "encrypt.h" #include "libwolfboot.c" #include @@ -274,10 +275,10 @@ START_TEST (test_nvm_update_with_encryption) /* Triggering update to set flags */ wolfBoot_update_trigger(); - /* Current selected should now be 0 */ + /* Current selected should now be 1 */ ret = nvm_select_fresh_sector(PART_UPDATE); - ck_assert_msg(ret == 0, "Failed to select updating fresh sector\n"); - ck_assert_msg(erased_nvm_bank1 != 0, "Did not erase the non-selected bank"); + ck_assert_msg(ret == 1, "Failed to select updating fresh sector\n"); + ck_assert_msg(erased_nvm_bank0 != 0, "Did not erase the non-selected bank"); magic = get_partition_magic(PART_UPDATE); ck_assert_msg(*magic == *boot_word, diff --git a/tools/unit-tests/unit-nvm.c b/tools/unit-tests/unit-nvm.c index 774dc642..74f40144 100644 --- a/tools/unit-tests/unit-nvm.c +++ b/tools/unit-tests/unit-nvm.c @@ -269,10 +269,10 @@ START_TEST (test_nvm_select_fresh_sector) /* Triggering update to set flags */ wolfBoot_update_trigger(); - /* Current selected should now be 0 */ + /* Current selected should now be 1 */ ret = nvm_select_fresh_sector(PART_UPDATE); - ck_assert_msg(ret == 0, "Failed to select updating fresh sector\n"); - ck_assert_msg(erased_nvm_bank1 > 0, "Did not erase the non-selected bank"); + ck_assert_msg(ret == 1, "Failed to select updating fresh sector\n"); + ck_assert_msg(erased_nvm_bank0 > 0, "Did not erase the non-selected bank"); magic = get_partition_magic(PART_UPDATE); ck_assert_msg(*magic == *boot_word,