commit d846013e24b7bff6447f0c7402aacb102e711f70
author Kevin Peng <kevin.peng@arm.com> Wed Sep 13 15:46:13 2023 +0800
committer Kevin Peng <kevin.peng@arm.com> Wed Oct 11 17:47:11 2023 +0800
tree 4c77b2aac7f75dbff1f3c0cc6cc62af841e9b889
parent 69433ad81e789960559027aac90e725ea2280e33

Update split build support

Signed-off-by: Kevin Peng <kevin.peng@arm.com>
Change-Id: I582379b4c133905575f28965ef656261e1204627

tfm_ci_pylib/tfm_build_manager.py

diff --git a/tfm_ci_pylib/tfm_build_manager.py b/tfm_ci_pylib/tfm_build_manager.py
index 6f25760..ed7cf3e 100644
--- a/tfm_ci_pylib/tfm_build_manager.py
+++ b/tfm_ci_pylib/tfm_build_manager.py
@@ -376,7 +376,9 @@
         build_cfg["set_compiler_path"] += " ;\n{} --version".format(self.get_compiler_name(i.compiler))
 
         # Overwrite parameters of build configs
-        overwrite_params = {"codebase_root_dir": build_cfg["codebase_root_dir"],
+        overwrite_params = {"codebase_root_dir":   build_cfg["codebase_root_dir"],
+                            "tfm_tests_root_dir":  build_cfg["codebase_root_dir"] + "/../tf-m-tests",
+                            "ci_build_root_dir":  build_cfg["codebase_root_dir"] + "/../ci_build",
                             "tfm_platform": i.tfm_platform,
                             "compiler": self.choose_toolchain(i.compiler),
                             "isolation_level": i.isolation_level,
@@ -396,6 +398,12 @@
         if i.tfm_platform == "arm/musca_b1":
             overwrite_params["test_psa_api"] += " -DOTP_NV_COUNTERS_RAM_EMULATION=ON"
 
+        # Test root dir
+        if i.test_psa_api != "OFF":
+            overwrite_params["test_root_dir"] = "tests_psa_arch"
+        else:
+            overwrite_params["test_root_dir"] = "tests_reg"
+
         # Overwrite commands for building TF-M image
         build_cfg["spe_config_template"] %= overwrite_params
         build_cfg["nspe_config_template"] %= overwrite_params