commit b0875b6535530860a153b25cf04358c7ad55f11f
author Sherry Zhang <sherry.zhang2@arm.com> Wed Nov 15 16:43:34 2023 +0800
committer David Hu <david.hu@arm.com> Thu Nov 16 00:59:50 2023 +0100
tree ebb93ad2cf8071e5949d896a7ca1378e08c07957
parent 14ecf3449173de8c5a5f1e3c3c360f9502e530f1

Test: Fix outdated macro in FWU test

Signed-off-by: Sherry Zhang <sherry.zhang2@arm.com>
Change-Id: I7e55d673da434bec5c1925aa5a7163d9daddbe20

tests_reg/test/secure_fw/suites/fwu/mcuboot/fwu_tests_common.c

diff --git a/tests_reg/test/secure_fw/suites/fwu/mcuboot/fwu_tests_common.c b/tests_reg/test/secure_fw/suites/fwu/mcuboot/fwu_tests_common.c
index 56cac2d..8d88dd6 100644
--- a/tests_reg/test/secure_fw/suites/fwu/mcuboot/fwu_tests_common.c
+++ b/tests_reg/test/secure_fw/suites/fwu/mcuboot/fwu_tests_common.c
@@ -1008,7 +1008,7 @@
     ret->val = TEST_PASSED;
 }
 
-#if (FWU_CONCURRENTLY_UPDATE_COMPONENTS > 1)
+#if (FWU_COMPONENT_NUMBER > 1)
 void tfm_fwu_test_common_006(struct test_result_t *ret)
 {
     psa_status_t status;
@@ -1364,7 +1364,7 @@
     /* End of the test. The candidate is back to PSA_FWU_READY state now. */
     ret->val = TEST_PASSED;
 }
-#endif /* FWU_CONCURRENTLY_UPDATE_COMPONENTS > 1 */
+#endif /* FWU_COMPONENT_NUMBER > 1 */
 #endif /* MCUBOOT_IMAGE_NUMBER > 1 */
 
 #ifdef TFM_FWU_TEST_REQUEST_REBOOT

tests_reg/test/secure_fw/suites/fwu/mcuboot/non_secure/psa_fwu_ns_interface_testsuite.c

diff --git a/tests_reg/test/secure_fw/suites/fwu/mcuboot/non_secure/psa_fwu_ns_interface_testsuite.c b/tests_reg/test/secure_fw/suites/fwu/mcuboot/non_secure/psa_fwu_ns_interface_testsuite.c
index 9821765..4e01cfa 100644
--- a/tests_reg/test/secure_fw/suites/fwu/mcuboot/non_secure/psa_fwu_ns_interface_testsuite.c
+++ b/tests_reg/test/secure_fw/suites/fwu/mcuboot/non_secure/psa_fwu_ns_interface_testsuite.c
@@ -21,7 +21,7 @@
 #if (MCUBOOT_IMAGE_NUMBER > 1)
     {&tfm_fwu_test_common_005, "TFM_NS_FWU_TEST_1005",
      "Dependency pass in multiple components case."},
-#if (FWU_CONCURRENTLY_UPDATE_COMPONENTS > 1)
+#if (FWU_COMPONENT_NUMBER > 1)
     {&tfm_fwu_test_common_006, "TFM_NS_FWU_TEST_1006",
      "Update two components which depends on each other."},
 #endif

tests_reg/test/secure_fw/suites/fwu/mcuboot/secure/psa_fwu_s_interface_testsuite.c

diff --git a/tests_reg/test/secure_fw/suites/fwu/mcuboot/secure/psa_fwu_s_interface_testsuite.c b/tests_reg/test/secure_fw/suites/fwu/mcuboot/secure/psa_fwu_s_interface_testsuite.c
index e50d0d0..d332ba1 100644
--- a/tests_reg/test/secure_fw/suites/fwu/mcuboot/secure/psa_fwu_s_interface_testsuite.c
+++ b/tests_reg/test/secure_fw/suites/fwu/mcuboot/secure/psa_fwu_s_interface_testsuite.c
@@ -22,7 +22,7 @@
 #if (MCUBOOT_IMAGE_NUMBER > 1)
     {&tfm_fwu_test_common_005, "TFM_S_FWU_TEST_1005",
      "Dependency pass in multiple components case."},
-#if (FWU_CONCURRENTLY_UPDATE_COMPONENTS > 1)
+#if (FWU_COMPONENT_NUMBER > 1)
     {&tfm_fwu_test_common_006, "TFM_S_FWU_TEST_1006",
      "Update two components which depends on each other."},
 #endif