commit 8579aa0d8fa686115a2287e028ff298cd8e4eb4f
author Xinyu Zhang <xinyu.zhang@arm.com> Tue Apr 25 11:55:19 2023 +0800
committer Xinyu Zhang <xinyu.zhang@arm.com> Tue Apr 25 17:04:32 2023 +0800
tree cfbb4e39b297297a6540665065de80b49225e433
parent 09fa3ec89fa6e9a287047bf271ad75776898036e

Build: Update Corstone1000 build commands

Update build commands for Corstone1000 to support:
 -DTEST_NS=OFF
 -DTEST_S=ON -DTEST_S_IPC=OFF
 -DEXTRA_S_TEST_SUITE_PATH=corstone1000/ci_regression_tests

When built for FPGA:
 -DTEST_S_PS=OFF
 -DTEST_S_PLATFORM=OFF

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

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 c19e297..146d48a 100644
--- a/build_helper/build_helper_config_maps.py
+++ b/build_helper/build_helper_config_maps.py
@@ -79,8 +79,9 @@
                       "-DTEST_NS_CRYPTO=ON "),
     # Corstone1000 support
     "FVP"          : "-DPLATFORM_IS_FVP=True ",
-    "FPGA"         : "-DPLATFORM_IS_FVP=False ",
-    "S_PS_OFF"     : "-DTEST_S_PS=OFF ",
+    "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 "
+                      "-DEXTRA_S_TEST_SUITE_PATH=%(codebase_root_dir)s/platform/ext/target/arm/corstone1000/ci_regression_tests/ "),
 
     # Extra test cases
     "TEST_CBOR"    : "-DTEST_NS_QCBOR=ON ",

build_helper/build_helper_configs.py

diff --git a/build_helper/build_helper_configs.py b/build_helper/build_helper_configs.py
index 4e2acd2..4be21f0 100755
--- a/build_helper/build_helper_configs.py
+++ b/build_helper/build_helper_configs.py
@@ -742,12 +742,12 @@
                 "tfm_platform":     ["arm/corstone1000"],
                 "compiler":         ["GCC_10_3"],
                 "isolation_level":  ["1"],
-                "test_regression":  [True],
+                "test_regression":  [False],
                 "test_psa_api":     ["OFF"],
                 "cmake_build_type": ["Debug"],
                 "with_bl2":         [True],
                 "profile":          [""],
-                "extra_params":     ["S_PS_OFF, FVP", "FPGA"]
+                "extra_params":     ["CS1K_TEST, FVP", "CS1K_TEST, FPGA"]
                 },
                 "common_params": _common_tfm_builder_cfg,
                 "invalid": _common_tfm_invalid_configs + []