commit 8c15c0474aa7cad88b403f050d6f32e2d073685b
author Antonio de Angelis <Antonio.deAngelis@arm.com> Tue Oct 15 11:46:25 2024 +0100
committer Antonio de Angelis <Antonio.deAngelis@arm.com> Tue Oct 15 13:18:49 2024 +0100
tree 010679a2c82ff86b19dbfbb7d13ca0f32015dc36
parent 3357119f597365c1fb9cde43f72b3667894d2d26

PS: Do not test PS_ROLLBACK_PROTECTION test suite if not built

If the PS_ROLLBACK_PROTECTION feature is not enabled, then do
not build and run the associated test suite.

Signed-off-by: Antonio de Angelis <antonio.deangelis@arm.com>
Change-Id: I29fb2bddf5e54be2f62d973236085bb77d060d54

tests_reg/test/secure_fw/suites/ps/secure/CMakeLists.txt

diff --git a/tests_reg/test/secure_fw/suites/ps/secure/CMakeLists.txt b/tests_reg/test/secure_fw/suites/ps/secure/CMakeLists.txt
index f6bda31..f023038 100644
--- a/tests_reg/test/secure_fw/suites/ps/secure/CMakeLists.txt
+++ b/tests_reg/test/secure_fw/suites/ps/secure/CMakeLists.txt
@@ -15,7 +15,7 @@
     PRIVATE
         psa_ps_s_interface_testsuite.c
         psa_ps_s_reliability_testsuite.c
-        $<$<BOOL:${PS_TEST_NV_COUNTERS}>:ps_rollback_protection_testsuite.c>
+        $<$<AND:$<BOOL:${PS_TEST_NV_COUNTERS}>,$<BOOL:${PS_ROLLBACK_PROTECTION}>>:ps_rollback_protection_testsuite.c>
 )
 
 target_sources(tfm_app_rot_partition_ps

tests_reg/test/secure_regression/secure_suites.c

diff --git a/tests_reg/test/secure_regression/secure_suites.c b/tests_reg/test/secure_regression/secure_suites.c
index 6a8c945..16c9e9c 100644
--- a/tests_reg/test/secure_regression/secure_suites.c
+++ b/tests_reg/test/secure_regression/secure_suites.c
@@ -54,11 +54,12 @@
 #ifdef TEST_S_PS
     {&register_testsuite_s_psa_ps_interface, 0, 0, 0},
     {&register_testsuite_s_psa_ps_reliability, 0, 0, 0},
-
 #ifdef PS_TEST_NV_COUNTERS
+#if defined(PS_ROLLBACK_PROTECTION) && (PS_ROLLBACK_PROTECTION == 1)
     {&register_testsuite_s_rollback_protection, 0, 0, 0},
-#endif
-#endif
+#endif /* PS_ROLLBACK_PROTECTION == 1 */
+#endif /* PS_TEST_NV_COUNTERS */
+#endif /* TEST_S_PS */
 
 #ifdef TEST_S_ITS
     /* Secure ITS test cases */