expect-lava/expect-lava/trusted-firmware*.inc: Catch another failure message
Occurs e.g. in https://tf.validation.linaro.org/scheduler/job/1591316
- {"dt": "2023-05-10T20:17:59.902980", "lvl": "target", "msg": "WARNING: Image id=4 size out of bounds"}
- {"dt": "2023-05-10T20:17:59.903230", "lvl": "target", "msg": "ERROR: BL2: Failed to load image id 4 (-27)"}
Signed-off-by: Paul Sokolovsky <paul.sokolovsky@linaro.org>
Change-Id: Ie714ab865bfd11629a6278c99608d11e539e395d
diff --git a/expect-lava/trusted-firmware-aarch32.inc b/expect-lava/trusted-firmware-aarch32.inc
index ae02ec4..bfbabda 100644
--- a/expect-lava/trusted-firmware-aarch32.inc
+++ b/expect-lava/trusted-firmware-aarch32.inc
@@ -18,7 +18,8 @@
# "Failure in pre image load handling of BL2"
# "Failed to load BL2 firmware."
# "Failure in post image load handling of BL2"
- failures='Fail.*load.*BL2'
+ # "BL2: Failed to load image id"
+ failures='Fail.*load.*BL2|BL2.*Fail.*load'
expect_string+=("i;${prompt};;${failures}")
expect_string+=('i;BL1: Booting BL32')
diff --git a/expect-lava/trusted-firmware.inc b/expect-lava/trusted-firmware.inc
index 4d38e09..7fb68bb 100644
--- a/expect-lava/trusted-firmware.inc
+++ b/expect-lava/trusted-firmware.inc
@@ -17,7 +17,8 @@
# "Failure in pre image load handling of BL2"
# "Failed to load BL2 firmware."
# "Failure in post image load handling of BL2"
- failures='Fail.*load.*BL2'
+ # "BL2: Failed to load image id"
+ failures='Fail.*load.*BL2|BL2.*Fail.*load'
expect_string+=("i;${prompt};;${failures}")
expect_string+=('i;BL1: Booting BL31')