fvp_utils.sh: support Monitor LAVA Test actions
Monitor test actions [1] are useful to define multiple expect matches
through regular expressions and can work together with the current
interactive test actions [2], the latter commonly used for single
expect matches and interaction with the booted model.
The change implied a complete refactor of current defined expect
strings, where now these must define whether is a interactive or
monitor test action through a leading char: 'i' for interactive or 'm'
for monitor.
To provide an short example, if we define the following lava expect script
expect_string+=('m;Booting Trusted Firmware;\
Booting BL31;\
Digest(\s|\w)*:\s(\w{2}\s){16}@: (\w{2}\s){16}@Event(\s|\w)*:\s\w+\s')
expect_string+=('i;buildroot login:')
The CI processes it and converts it into the LAVA job definition [3]:
.
.
- test:
timeout:
minutes: 15
monitors:
- name: tests
start: 'Booting Trusted Firmware'
end: 'Booting BL31'
pattern: 'Digest(\s|\w)*:\s(\w{2}\s){16}'
pattern: ': (\w{2}\s){16}'
pattern: 'Event(\s|\w)*:\s\w+\s'
fixupdict:
PASS: pass
FAIL: fail
- test:
timeout:
minutes: 15
interactive:
- name: uart0_0
prompts: ['buildroot login:']
script:
- name: result
command:
Note that boht type of actions are defined. The lava-expects/README.md
has more information about the details implied on this change.
[1] https://validation.linaro.org/static/docs/v2/monitors.html
[2] https://validation.linaro.org/static/docs/v2/actions-test.html#interactive-test-action
[3] https://tf.validation.linaro.org/scheduler/job/312768
Signed-off-by: Leonardo Sandoval <leonardo.sandoval@linaro.org>
Change-Id: Icc05403abf59f30ded60565b8c942d53a91d3990
diff --git a/lava-expect/trusted-firmware.inc b/lava-expect/trusted-firmware.inc
index 7133da6..4d38e09 100644
--- a/lava-expect/trusted-firmware.inc
+++ b/lava-expect/trusted-firmware.inc
@@ -10,7 +10,7 @@
# for them by inspecting the environment variable 'skip_early_boot_msgs'.
if [ -z "$skip_early_boot_msgs" ]; then
- expect_string+=('Booting Trusted Firmware')
+ expect_string+=('i;Booting Trusted Firmware')
prompt='Booting BL2'
# Catch all 3 possible BL2 loading error messages, namely:
@@ -18,7 +18,7 @@
# "Failed to load BL2 firmware."
# "Failure in post image load handling of BL2"
failures='Fail.*load.*BL2'
- expect_string+=("${prompt};;${failures}")
+ expect_string+=("i;${prompt};;${failures}")
- expect_string+=('BL1: Booting BL31')
+ expect_string+=('i;BL1: Booting BL31')
fi