commit f8b3980a4d5e16898383a1d517579c20907df0d0
author Emekcan Aras <emekcan.aras@arm.com> Mon Apr 24 10:15:22 2023 +0100
committer David Hu <david.hu@arm.com> Fri Aug 18 10:49:33 2023 +0200
tree c188578046cdcf335d1fe7d0dd776d93841a774a
parent a713972552a10fcf57ff48313222dc883a268804

Build: Turn off TEST_BL2 & TEST_S_PS for corstone1000

With the new changes on corstone1000, we don't have enough RAM to run
both TEST_BL2 and TEST_S_PS. Turning off these tests so that corstone1000 can
build the tfm test configuration in the CI.

Signed-off-by: Emekcan Aras <emekcan.aras@arm.com>
Change-Id: I441336e3b8f34b21b4e139202a94bae5fa896ee1

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 91429ba..58fed95 100644
--- a/build_helper/build_helper_config_maps.py
+++ b/build_helper/build_helper_config_maps.py
@@ -87,8 +87,8 @@
                       "-DTEST_NS_CRYPTO=ON "),
     # Corstone1000 support
     "FVP"          : "-DPLATFORM_IS_FVP=True ",
-    "FPGA"         : "-DPLATFORM_IS_FVP=False -DTEST_S_PS=OFF -DTEST_S_PLATFORM=OFF ",
-    "CS1K_TEST"    : ("-DTEST_S_IPC=OFF "
+    "FPGA"         : "-DPLATFORM_IS_FVP=False -DTEST_S_PLATFORM=OFF ",
+    "CS1K_TEST"    : ("-DTEST_S_PS=OFF "
                       "-DEXTRA_S_TEST_SUITE_PATH=%(codebase_root_dir)s/platform/ext/target/arm/corstone1000/ci_regression_tests/ "),
 
     # Extra test cases

build_helper/build_helper_configs.py

diff --git a/build_helper/build_helper_configs.py b/build_helper/build_helper_configs.py
index 4d7f4e4..fe7d80b 100755
--- a/build_helper/build_helper_configs.py
+++ b/build_helper/build_helper_configs.py
@@ -805,7 +805,7 @@
                 "tfm_platform":     ["arm/corstone1000"],
                 "compiler":         ["GCC_10_3"],
                 "isolation_level":  ["1"],
-                "test_regression":  ["RegBL2, RegS"],
+                "test_regression":  ["RegS"],
                 "test_psa_api":     ["OFF"],
                 "cmake_build_type": ["Debug"],
                 "with_bl2":         [True],