Sync scripts with Arm internal CI
This patch syncs utility scripts and scripts
in the script directory with the internal CI.
Where a path update is required,
the changes have been commented out.
Signed-off-by: Zelalem <zelalem.aweke@arm.com>
Change-Id: Ifa4bd805e345184d1378e8423e5f878a2fbfbcd4
diff --git a/script/gen_test_desc.py b/script/gen_test_desc.py
index 5913c32..d729a9f 100755
--- a/script/gen_test_desc.py
+++ b/script/gen_test_desc.py
@@ -35,9 +35,9 @@
# config_list contains build configs as read from the test config
if group.startswith("scp-"):
# SCP configs would be specified in the following format:
- # scp_config, tf_config, tftf_config
+ # scp_config, tf_config, tftf_config, scp_tools
# Reshuffle them into the canonical format
- config_list = [config_list[1], config_list[2], config_list[0]]
+ config_list = [config_list[1], config_list[2], config_list[0], config_list[3]]
return config_list
@@ -48,9 +48,9 @@
build_config, run_config = test.split(":")
# Test descriptors are always generated in the following order:
- # tf_config, tftf_config, scp_config
+ # tf_config, tftf_config, scp_config, scp_tools
# Fill missing configs to the right with "nil".
- config_list = (build_config.split(",") + ["nil"] * 3)[:3]
+ config_list = (build_config.split(",") + ["nil"] * 4)[:4]
# Perform any group-specific translation on the config
config_list = translate_build_config(group, config_list)