ci: fih: update TF-M version to 1.7.0 and adjust test suite (166075ef) · Commits · Wenxi XU / Mcuboot

ci/fih-tests_run.sh

+2 −2

Original line number	Diff line number	Diff line
		#!/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.
		@@ -19,7 +19,7 @@ set -e
		pushd .. &&\
		git clone https://git.trustedfirmware.org/TF-M/trusted-firmware-m.git &&\
		pushd trusted-firmware-m &&\
		git checkout TF-Mv1.4.0 &&\
		git checkout TF-Mv1.7.0 &&\
		popd

		if [[ $GITHUB_ACTIONS == true ]]; then

+2 −2

Original line number	Diff line number	Diff line
		#!/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 @@ cmake -B $TFM_BUILD_DIR \
		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

+6 −2

Original line number	Diff line number	Diff line
		#!/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 @@ function skip_instruction {

		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 @@ usage() {

		#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