Merge changes Iaa2d833a,Ia0f19785
* changes:
fix(runtime_services/ffa): dynamically calculate array size
fix(cactus_tests/ffa): dynamically calculate array size
diff --git a/spm/cactus/cactus_tests/cactus_test_ffa.c b/spm/cactus/cactus_tests/cactus_test_ffa.c
index 2dc264e..c580ee4 100644
--- a/spm/cactus/cactus_tests/cactus_test_ffa.c
+++ b/spm/cactus/cactus_tests/cactus_test_ffa.c
@@ -121,7 +121,8 @@
&ffa_expected_partition_info[0], 1), true);
expect(ffa_partition_info_helper(mb, null_uuid,
- ffa_expected_partition_info, 4), true);
+ ffa_expected_partition_info,
+ ARRAY_SIZE(ffa_expected_partition_info)), true);
ffa_partition_info_wrong_test();
diff --git a/tftf/tests/runtime_services/secure_service/test_ffa_setup_and_discovery.c b/tftf/tests/runtime_services/secure_service/test_ffa_setup_and_discovery.c
index 9907284..e2929fc 100644
--- a/tftf/tests/runtime_services/secure_service/test_ffa_setup_and_discovery.c
+++ b/tftf/tests/runtime_services/secure_service/test_ffa_setup_and_discovery.c
@@ -352,7 +352,8 @@
return TEST_RESULT_FAIL;
}
if (!ffa_partition_info_helper(&mb, null_uuid,
- ffa_expected_partition_info, 4)) {
+ ffa_expected_partition_info,
+ ARRAY_SIZE(ffa_expected_partition_info))) {
return TEST_RESULT_FAIL;
}