commit 0b371b03711a801a5ab5e96d51dbcba7edf5aa08
author Xinyu Zhang <xinyu.zhang@arm.com> Mon Oct 30 18:28:43 2023 +0800
committer Xinyu Zhang <xinyu.zhang@arm.com> Mon Oct 30 18:59:14 2023 +0800
tree cf4d1b12581fab6263e995c1d8a6622a878b7508
parent bff12efc3788318db3eaa76fcd7281e7b8a22598

Build: Do not generate NSPE CMake commands for NSOFF configs

When TF-M config disables NS applications, NSPE CMake commands should
not be generated and run in CI job.

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

run-build.sh

diff --git a/run-build.sh b/run-build.sh
index cf905ae..744084f 100755
--- a/run-build.sh
+++ b/run-build.sh
@@ -119,5 +119,9 @@
     rm -rf ci_build/*
     eval $spe_cmake_config_cmd
 fi
+eval $spe_cmake_build_cmd
 
-eval "$spe_cmake_build_cmd; $nspe_cmake_config_cmd; $nspe_cmake_build_cmd; $post_build_cmd"
+eval $nspe_cmake_config_cmd
+eval $nspe_cmake_build_cmd
+
+eval $post_build_cmd

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 7721a8c..75a2cd8 100644
--- a/tfm_ci_pylib/tfm_build_manager.py
+++ b/tfm_ci_pylib/tfm_build_manager.py
@@ -418,6 +418,11 @@
         build_cfg["nspe_cmake_build"] %= overwrite_params
         build_cfg["post_build"] %= overwrite_params
 
+        # Disable NSPE CMake commands when NS is OFF
+        if "NSOFF" in i.extra_params:
+            build_cfg["nspe_config_template"] = ""
+            build_cfg["nspe_cmake_build"] = ""
+
         return build_cfg
 
     def post_eval(self):