fix(expect): update crash test expectations
This change updates the crash test expectations to reflect the real
output of their tests, as they've become outdated. We haven't noticed
because these scripts were not attached to the payload UART of any
tests, which is the only situation in which the result of the Expect
script could determine the success of the test.
This change also ensures that tests using these scripts have them set as
the payload script, as opposed to the timeout scripts they typically
use.
Signed-off-by: Chris Kay <chris.kay@arm.com>
Change-Id: Ic9870a0aa6a191cdb6b02fcedeaea0490377704c
(cherry picked from commit 62b4f78bbed522c13675b5411aac91acd32d8eff)
diff --git a/run_config/fvp-aemv8a.aarch32.roxlattables.spmin_panic b/run_config/fvp-aemv8a.aarch32.roxlattables.spmin_panic
index 73c0567..6b0face 100644
--- a/run_config/fvp-aemv8a.aarch32.roxlattables.spmin_panic
+++ b/run_config/fvp-aemv8a.aarch32.roxlattables.spmin_panic
@@ -19,7 +19,7 @@
local model="base-aemv8a"
uart="0" timeout="60" file="timeout_spmin_roxlattables.exp" track_expect
- uart="1" timeout="60" file="crash_panic.exp" track_expect
+ uart="1" timeout="60" file="crash_panic.exp" set_primary="1" track_expect
model="$model" aarch32="1" gen_model_params
model="$model" gen_fvp_yaml
diff --git a/run_config/fvp-aemv8a.crash b/run_config/fvp-aemv8a.crash
index 9568454..fa46a57 100644
--- a/run_config/fvp-aemv8a.crash
+++ b/run_config/fvp-aemv8a.crash
@@ -15,7 +15,7 @@
local model="base-aemv8a"
uart="0" timeout="60" file="timeout_test.exp" track_expect
- uart="1" timeout="60" file="crash_test.exp" track_expect
+ uart="1" timeout="60" file="crash_test.exp" set_primary="1" track_expect
model="$model" arch_version="8.4" fault_inject="1" gen_model_params
model="$model" gen_fvp_yaml
diff --git a/run_config/fvp-aemv8a.rng_trap.bl31_panic b/run_config/fvp-aemv8a.rng_trap.bl31_panic
index 4b2f29c..2e31b34 100644
--- a/run_config/fvp-aemv8a.rng_trap.bl31_panic
+++ b/run_config/fvp-aemv8a.rng_trap.bl31_panic
@@ -9,7 +9,8 @@
local model="base-aemv8a"
uart="0" timeout="60" file="timeout.exp" track_expect
- uart="1" timeout="60" file="crash_rng_trap_unhandled_exception_at_el3.exp" track_expect
+ uart="1" timeout="60" file="crash_rng_trap_unhandled_exception_at_el3.exp" \
+ set_primary="1" track_expect
# Due to a bug in the model, the FEAT_RNG_TRAP feature is not available
# in models that implement versions lower than 8.8, even though this is
diff --git a/run_config/fvp-aemv8a.roxlattables.bl31_panic b/run_config/fvp-aemv8a.roxlattables.bl31_panic
index 7b66ba3..888015e 100644
--- a/run_config/fvp-aemv8a.roxlattables.bl31_panic
+++ b/run_config/fvp-aemv8a.roxlattables.bl31_panic
@@ -17,7 +17,8 @@
local model="base-aemv8a"
uart="0" timeout="60" file="timeout.exp" track_expect
- uart="1" timeout="60" file="crash_roxlattables_unhandled_exception_at_el3.exp" track_expect
+ uart="1" timeout="60" file="crash_roxlattables_unhandled_exception_at_el3.exp" \
+ set_primary="1" track_expect
model="$model" gen_model_params
model="$model" gen_fvp_yaml
diff --git a/run_config/fvp-aemv8a.roxlattables.tspd_panic b/run_config/fvp-aemv8a.roxlattables.tspd_panic
index 5ca3407..6ca26a7 100644
--- a/run_config/fvp-aemv8a.roxlattables.tspd_panic
+++ b/run_config/fvp-aemv8a.roxlattables.tspd_panic
@@ -20,7 +20,7 @@
local model="base-aemv8a"
uart="0" timeout="60" file="timeout.exp" track_expect
- uart="1" timeout="60" file="crash_panic.exp" track_expect
+ uart="1" timeout="60" file="crash_panic.exp" set_primary="1" track_expect
uart="2" timeout="60" file="readonly_el1_xlat_tables.exp" track_expect
model="$model" gen_model_params
diff --git a/run_config/fvp-aemva.ete_trace_ext.bl31_panic b/run_config/fvp-aemva.ete_trace_ext.bl31_panic
index a8e24c9..c6c3abf 100644
--- a/run_config/fvp-aemva.ete_trace_ext.bl31_panic
+++ b/run_config/fvp-aemva.ete_trace_ext.bl31_panic
@@ -9,7 +9,8 @@
local model="base-aemva"
uart="0" timeout="60" file="timeout_test.exp" track_expect
- uart="1" timeout="60" file="unhandled_exception_at_el3.exp" track_expect
+ uart="1" timeout="60" file="unhandled_exception_at_el3.exp" \
+ set_primary="1" track_expect
model="$model" \
ete_plugin="1" \
diff --git a/run_config/fvp-aemva.feat_brbe.bl31_panic b/run_config/fvp-aemva.feat_brbe.bl31_panic
index ec35d77..7367aa2 100644
--- a/run_config/fvp-aemva.feat_brbe.bl31_panic
+++ b/run_config/fvp-aemva.feat_brbe.bl31_panic
@@ -9,7 +9,8 @@
local model="base-aemva"
uart="0" timeout="60" file="timeout_test.exp" track_expect
- uart="1" timeout="60" file="unhandled_exception_at_el3.exp" track_expect
+ uart="1" timeout="60" file="unhandled_exception_at_el3.exp" \
+ set_primary="1" track_expect
model="$model" \
supports_branch_record_buffer_control_regs="1" \