Generate valid configs before removing invalid configs
Configs in "valid" list could also be included in "invalid" list.
The "invalid" list should have higher priority.
Generate valid configs before removing invalid configs,
which could avoid adding invalid configs from "valid" list.
Signed-off-by: Xinyu Zhang <xinyu.zhang@arm.com>
Change-Id: I6786c705a09982aad47ee0a5dc4a8825b5e0d593
diff --git a/tfm_ci_pylib/tfm_build_manager.py b/tfm_ci_pylib/tfm_build_manager.py
index bcda2dc..5905ec8 100644
--- a/tfm_ci_pylib/tfm_build_manager.py
+++ b/tfm_ci_pylib/tfm_build_manager.py
@@ -489,6 +489,16 @@
ret_cfg = TFM_Build_Manager.generate_config_list(comb_cfg,
static_cfg)
+ # valid is an optional field. Do not proccess if it is missing
+ if "valid" in cfg:
+ # Valid configurations(Need to build)
+ valid_cfg = cfg["valid"]
+ # Add valid configs to build list
+ ret_cfg.update(TFM_Build_Manager.generate_optional_list(
+ comb_cfg,
+ static_cfg,
+ valid_cfg))
+
# invalid is an optional field. Do not proccess if it is missing
if "invalid" in cfg:
# Invalid configurations(Do not build)
@@ -502,15 +512,6 @@
# Subtract the two configurations
ret_cfg = {k: v for k, v in ret_cfg.items()
if k not in rejection_cfg}
- # valid is an optional field. Do not proccess if it is missing
- if "valid" in cfg:
- # Valid configurations(Need to build)
- valid_cfg = cfg["valid"]
- # Add valid configs to build list
- ret_cfg.update(TFM_Build_Manager.generate_optional_list(
- comb_cfg,
- static_cfg,
- valid_cfg))
self.simple_config = False
else:
self.simple_config = True