fix: populate test environment variables before first use in run fragment
Commit 4e8aaf1a mistakenly changes the order of declaration of few
environment variables necessary for NVM based FVP reboot tests.
Signed-off-by: Madhukar Pappireddy <madhukar.pappireddy@arm.com>
Change-Id: If057f6f8bf1ff69e2881de4534a66f851b84f846
diff --git a/run_config/fvp-aemv8a.NVM_reboot b/run_config/fvp-aemv8a.NVM_reboot
index 7d8ca77..d7c8918 100644
--- a/run_config/fvp-aemv8a.NVM_reboot
+++ b/run_config/fvp-aemv8a.NVM_reboot
@@ -11,11 +11,20 @@
rm -f "$archive/flash1"
touch "$archive/flash0"
touch "$archive/flash1"
+
+ set_run_env "run_tftf_reboot_tests" "1"
+ # Contents of Non Volatile Memory are written to this file
+ set_run_env "NVM_file" "flash0"
}
generate_lava_job() {
local model="base-aemv8a"
+ uart0_log=$(echo uart-0-$(date "+%H:%M:%S").log)
+ uart1_log=$(echo uart-1-$(date "+%H:%M:%S").log)
+ set_run_env "uart0_file" "$uart0_log"
+ set_run_env "uart1_file" "$uart1_log"
+
model="$model" \
cache_state_modelled="0" \
cluster_0_num_cores="1" \
@@ -29,13 +38,4 @@
gen_model_params
model="$model" gen_fvp_yaml
-
- uart0_log=$(echo uart-0-$(date "+%H:%M:%S").log)
- uart1_log=$(echo uart-1-$(date "+%H:%M:%S").log)
- set_run_env "uart0_file" "$uart0_log"
- set_run_env "uart1_file" "$uart1_log"
-
- set_run_env "run_tftf_reboot_tests" "1"
- # Contents of Non Volatile Memory are written to this file
- set_run_env "NVM_file" "flash0"
}