fix: use lower el panic expect message.
Both brbe and trf tests from tftf try to trigger a panic
in bl31 with recent panic cleanup changes[1] any panic from lower EL
is treated seperately and has a panic string message indicating
panic was triggered from lower EL.
https: //review.trustedfirmware.org/q/topic:%22panic_cleanup%22+(status:open%20OR%20status:merged)
Change-Id: I32df1ff8e8cf9b47adc0fc9c7c212f29d64523fe
diff --git a/expect-lava/panic_in_el3.exp b/expect-lava/panic_in_lower_el.exp
similarity index 83%
rename from expect-lava/panic_in_el3.exp
rename to expect-lava/panic_in_lower_el.exp
index 869334e..c1a530b 100644
--- a/expect-lava/panic_in_el3.exp
+++ b/expect-lava/panic_in_lower_el.exp
@@ -6,7 +6,7 @@
# Expect script for Trusted Firmware Test Framework
#
-expect_string+=("i;PANIC in EL3.")
+expect_string+=("i;Unhandled Exception from lower EL.")
expect_string+=("i;x30")
source $ci_root/expect-lava/exception_gp_regs.inc
source $ci_root/expect-lava/exception_sys_regs.inc
diff --git a/expect/panic_in_el3.exp b/expect/panic_in_lower_el.exp
similarity index 88%
rename from expect/panic_in_el3.exp
rename to expect/panic_in_lower_el.exp
index 80756d8..65e8233 100644
--- a/expect/panic_in_el3.exp
+++ b/expect/panic_in_lower_el.exp
@@ -8,7 +8,7 @@
source [file join [file dirname [info script]] handle-arguments.inc]
-expect_string "PANIC in EL3."
+expect_string "Unhandled Exception from lower EL."
expect_string "x30"
source [file join [file dirname [info script]] exception_gp_regs.inc]
diff --git a/run_config/fvp-aemva.ete_trace_ext.bl31_panic b/run_config/fvp-aemva.ete_trace_ext.bl31_panic
index e2f0eec..e30cbdd 100644
--- a/run_config/fvp-aemva.ete_trace_ext.bl31_panic
+++ b/run_config/fvp-aemva.ete_trace_ext.bl31_panic
@@ -9,7 +9,7 @@
local model="base-aemva"
uart="0" timeout="60" file="timeout_test.exp" track_expect
- uart="1" timeout="60" file="panic_in_el3.exp" \
+ uart="1" timeout="60" file="panic_in_lower_el.exp" \
set_primary="1" track_expect
model="$model" \
diff --git a/run_config/fvp-aemva.feat_brbe.bl31_panic b/run_config/fvp-aemva.feat_brbe.bl31_panic
index 91954b8..89e9106 100644
--- a/run_config/fvp-aemva.feat_brbe.bl31_panic
+++ b/run_config/fvp-aemva.feat_brbe.bl31_panic
@@ -9,7 +9,7 @@
local model="base-aemva"
uart="0" timeout="60" file="timeout_test.exp" track_expect
- uart="1" timeout="60" file="panic_in_el3.exp" \
+ uart="1" timeout="60" file="panic_in_lower_el.exp" \
set_primary="1" track_expect
model="$model" \