commit b18ae7477bd2cb14edc746d563d9b571b61db1c6
author Xinyu Zhang <xinyu.zhang@arm.com> Tue Apr 25 14:33:27 2023 +0800
committer Xinyu Zhang <xinyu.zhang@arm.com> Mon May 08 04:25:48 2023 +0200
tree cd4fe9583983b6811b0c80e685207bb5803afa3e
parent 8c2de82b583b868a0476a66ebfe66f42ad64e665

Build: Decouple S/NS test control in build configs

Regression tests for both Secure and Non-Secure are currently controlled
by the same boolean seed param "test_regression", which makes the tests
can only be enabled/disable at the same time.

Now that it is needed by some platforms such as Corstone1000 to only
enable Secure tests without Non-Secure tests, the test control needs to
be decoupled.

This patch converts "test_regression" from boolean to string to indicate
which tests should be enabled.

Signed-off-by: Xinyu Zhang <xinyu.zhang@arm.com>
Change-Id: I1e73dc5d7bca7239fcdd2050bb5e58389a79ad95

build_helper/build_helper_config_maps.py

diff --git a/build_helper/build_helper_config_maps.py b/build_helper/build_helper_config_maps.py
index 146d48a..649ddbb 100644
--- a/build_helper/build_helper_config_maps.py
+++ b/build_helper/build_helper_config_maps.py
@@ -36,6 +36,13 @@
     "stm/nucleo_l552ze_q"                : "nucleo_l552ze_q",
 }
 
+# Map regression test parameters to short format
+mapRegTest = {
+    "OFF"       : "-DTEST_S=OFF -DTEST_NS=OFF ",
+    "RegS"      : "-DTEST_S=ON ",
+    "RegNS"     : "-DTEST_NS=ON ",
+}
+
 # Map PSA Arch Tests to short format
 mapTestPsaApi = {
     "IPC"                : "FF",
@@ -80,7 +87,7 @@
     # Corstone1000 support
     "FVP"          : "-DPLATFORM_IS_FVP=True ",
     "FPGA"         : "-DPLATFORM_IS_FVP=False -DTEST_S_PS=OFF -DTEST_S_PLATFORM=OFF ",
-    "CS1K_TEST"    : ("-DTEST_BL2=ON -DTEST_S=ON -DTEST_S_IPC=OFF "
+    "CS1K_TEST"    : ("-DTEST_S_IPC=OFF "
                       "-DEXTRA_S_TEST_SUITE_PATH=%(codebase_root_dir)s/platform/ext/target/arm/corstone1000/ci_regression_tests/ "),
 
     # Extra test cases