style(expect): normalize debugging messages
A minor style cleanup to the messages printed by the Expect scripts to
make them a bit more consistent and descriptive.
Signed-off-by: Chris Kay <chris.kay@arm.com>
Change-Id: Ibd8ccb4423bd5aaeffc99c2f3602123794dc6200
diff --git a/expect/trusted-firmware-aarch32.inc b/expect/trusted-firmware-aarch32.inc
index 8d309c9..ad57f56 100644
--- a/expect/trusted-firmware-aarch32.inc
+++ b/expect/trusted-firmware-aarch32.inc
@@ -15,21 +15,21 @@
expect_string "Booting Trusted Firmware"
expect {
- "BL1: Booting BL2" { puts "<<BL2 booting>>" }
+ "BL1: Booting BL2" { message "BL2 booting" }
# Catch all 3 possible BL2 loading error messages, namely:
# "Failure in pre image load handling of BL2"
# "Failed to load BL2 firmware."
# "Failure in post image load handling of BL2"
-re "Fail.*load.*BL2" {
- puts "<<BL2 loading error>>"
+ message "BL2 loading error"
exit_uart -1
}
}
expect_string "BL1: Booting BL32"
} else {
- puts "<<Skipping early boot messages from BL1 and BL2>>"
+ message "Skipping early boot messages from BL1 and BL2"
}
-expect_string "SP_MIN:" "Booting SP_MIN"
+expect_string "SP_MIN:" "SP_MIN is booting"