ci: fih: update TF-M version to 1.7.0 and adjust test suite
Signed-off-by: Tamas Ban <tamas.ban@arm.com>
Change-Id: I1a810bac6e0409ff06af80c8151b8d37a97effdc
diff --git a/ci/fih_test_docker/execute_test.sh b/ci/fih_test_docker/execute_test.sh
index 3d09993..b013a09 100755
--- a/ci/fih_test_docker/execute_test.sh
+++ b/ci/fih_test_docker/execute_test.sh
@@ -1,6 +1,6 @@
#!/bin/bash -x
-# Copyright (c) 2020-2021 Arm Limited
+# Copyright (c) 2020-2022 Arm Limited
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -51,7 +51,7 @@
cd $TFM_BUILD_DIR
make -j install
-BOOTLOADER_AXF='./install/outputs/ARM/MPS2/AN521/bl2.axf'
+BOOTLOADER_AXF='./install/outputs/bl2.axf'
$MCUBOOT_PATH/ci/fih_test_docker/run_fi_test.sh $BOOTLOADER_AXF $SKIP_SIZE $DAMAGE_TYPE> fih_test_output.yaml
diff --git a/ci/fih_test_docker/fi_tester_gdb.sh b/ci/fih_test_docker/fi_tester_gdb.sh
index 2a20a1d..a68aa66 100755
--- a/ci/fih_test_docker/fi_tester_gdb.sh
+++ b/ci/fih_test_docker/fi_tester_gdb.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright (c) 2020-2021 Arm Limited
+# Copyright (c) 2020-2022 Arm Limited
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -40,6 +40,10 @@
cat >commands.gdb <<EOF
target remote localhost: 1234
+file $IMAGE_DIR/bl2.axf
+b boot_go_for_image_id if image_id == 0
+continue
+delete breakpoints 1
b *$SKIP_ADDRESS
continue&
eval "shell sleep 0.5"
@@ -138,7 +142,7 @@
#defaults
SKIP=2
-BIN_DIR=$(pwd)/install/outputs/ARM/MPS2/AN521
+BIN_DIR=$(pwd)/install/outputs
AXF_FILE=$BIN_DIR/bl2.axf
GDB=gdb-multiarch
BOOTLOADER=true