commit a527e31520c07dee2a4ae4f39652d1f27b583488
author David Hu <david.hu@arm.com> Tue Oct 18 17:18:06 2022 +0800
committer David Hu <david.hu@arm.com> Thu Oct 27 14:48:36 2022 +0800
tree 74fbc2cbc3b1082a2788e5d9071c172cb6aa096c
parent adddea574a86cd75791ebe58e06859d22059019c

Test: Move test configuration dump into test CMakeLists.txt

Move regression test configuration dump message from check_config.cmake into
test/secure_fw/CMakeLists.txt.
Therefore, the test flags are showed after other TF-M configurations, which
makes the build info more clear.
It also makes more sense to dump those flags after config check is done.

Signed-off-by: David Hu <david.hu@arm.com>
Change-Id: Iab986f4db55be6610f7bdda2a6ec05694e9f29ab

test/config/check_config.cmake

diff --git a/test/config/check_config.cmake b/test/config/check_config.cmake
index 5528c15..7eeb3d1 100644
--- a/test/config/check_config.cmake
+++ b/test/config/check_config.cmake
@@ -5,40 +5,6 @@
 #
 #-------------------------------------------------------------------------------
 
-########################## TEST Configuration ##################################
-
-include(utils)
-    dump_options("TEST Configuration"
-    "
-        TEST_NS;
-        TEST_S;
-        TEST_NS_ATTESTATION;
-        TEST_NS_CRYPTO;
-        TEST_NS_ITS;
-        TEST_NS_QCBOR;
-        TEST_NS_PS;
-        TEST_NS_T_COSE;
-        TEST_NS_PLATFORM;
-        TEST_NS_FWU;
-        TEST_NS_IPC;
-        TEST_NS_SLIH_IRQ;
-        TEST_NS_FLIH_IRQ;
-        TEST_NS_MULTI_CORE;
-        TEST_NS_MANAGE_NSID;
-        TEST_NS_SFN_BACKEND;
-        TEST_NS_FPU;
-        TEST_S_ATTESTATION;
-        TEST_S_CRYPTO;
-        TEST_S_ITS;
-        TEST_S_PS;
-        TEST_S_PLATFORM;
-        TEST_S_FWU;
-        TEST_S_IPC;
-        TEST_S_SFN_BACKEND;
-        TEST_S_FPU;
-    "
-    )
-
 ########################## Check Flags Input ###################################
 
 tfm_invalid_config((NOT TFM_PARTITION_PROTECTED_STORAGE) AND (TEST_NS_PS OR TEST_S_PS))

test/secure_fw/CMakeLists.txt

diff --git a/test/secure_fw/CMakeLists.txt b/test/secure_fw/CMakeLists.txt
index 78a683a..693aa03 100644
--- a/test/secure_fw/CMakeLists.txt
+++ b/test/secure_fw/CMakeLists.txt
@@ -7,6 +7,40 @@
 
 cmake_minimum_required(VERSION 3.13)
 
+########################## TEST Configuration ##################################
+
+include(utils)
+    dump_options("TEST Configuration"
+    "
+        TEST_NS;
+        TEST_S;
+        TEST_NS_ATTESTATION;
+        TEST_NS_CRYPTO;
+        TEST_NS_ITS;
+        TEST_NS_QCBOR;
+        TEST_NS_PS;
+        TEST_NS_T_COSE;
+        TEST_NS_PLATFORM;
+        TEST_NS_FWU;
+        TEST_NS_IPC;
+        TEST_NS_SLIH_IRQ;
+        TEST_NS_FLIH_IRQ;
+        TEST_NS_MULTI_CORE;
+        TEST_NS_MANAGE_NSID;
+        TEST_NS_SFN_BACKEND;
+        TEST_NS_FPU;
+        TEST_S_ATTESTATION;
+        TEST_S_CRYPTO;
+        TEST_S_ITS;
+        TEST_S_PS;
+        TEST_S_PLATFORM;
+        TEST_S_FWU;
+        TEST_S_IPC;
+        TEST_S_SFN_BACKEND;
+        TEST_S_FPU;
+    "
+    )
+
 include(secure_tests.cmake)
 
 # Include test suites at last after other targets are setup.