fix: fix FTPM test expectations on OpenCI
The expectations for the FTPM tests need to run in an explicit order
because of an implicit dependency between two UART expectations. This
change reorders the port numbering to enforce that order.
Signed-off-by: Chris Kay <chris.kay@arm.com>
Change-Id: Idc264bcc19ea71e23622979b3750ed334a3f1004
(cherry picked from commit 07756bc04502128d9d933860b999f87cdeada8b9)
diff --git a/run_config/fvp-linux.rootfs+ftpm_384 b/run_config/fvp-linux.rootfs+ftpm_384
index c8fefe1..aa0e02a 100644
--- a/run_config/fvp-linux.rootfs+ftpm_384
+++ b/run_config/fvp-linux.rootfs+ftpm_384
@@ -17,8 +17,10 @@
}
generate_lava_job_template() {
- uart="0" timeout="600" file="linux-tpm-384.exp" track_expect
- uart="1" timeout="600" file="tpm-logs.exp" track_expect
+ # These UARTs are swapped because of an Expect script order requirement
+ uart="1" port="5000" timeout="600" file="linux-tpm-384.exp" \
+ set_primary="1" track_expect
+ uart="0" port="5001" timeout="600" file="tpm-logs.exp" track_expect
set_run_env "ports_script" "$ci_root/model/ftpm-ports.awk"
set_run_env "num_uarts" "2"