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
(cherry picked from commit 78ea2c38582da41eb8f9509a2130e702cdf0f1c9)
diff --git a/expect/disable_dyn_auth.inc b/expect/disable_dyn_auth.inc
index 73e7497..d0d8264 100644
--- a/expect/disable_dyn_auth.inc
+++ b/expect/disable_dyn_auth.inc
@@ -10,8 +10,8 @@
# This script tries to catch if dynamic authentication of images is enabled
# during trusted board boot(BL2). The authentication is done using certificates.
-expect_string "BL1: Booting BL2" "BL2 booting"
-expect_string "Disabling authentication of images dynamically" "Authentication disabled dynamically"
+expect_string "BL1: Booting BL2" "BL2 is booting"
+expect_string "Disabling authentication of images dynamically" "dynamic authentication was disabled"
expect {
# Catch all loading of authentication certificates i.e.,
# TRUSTED_BOOT_FW_CERT_ID U(6)
@@ -26,10 +26,10 @@
# NON_TRUSTED_FW_CONTENT_CERT_ID U(15)
-re "Loading image id=(6|7|8|9|10|11|12|13|14|15) at address " {
- puts "<<Dynamic Authentication not disabled>>"
+ message "dynamic authentication is still enabled"
exit_uart -1
}
"BL1: Booting BL31" {
- puts "BL31 Booting"
+ message "BL31 is booting"
}
}