ci: Update the TF-M version in fih test (3c4f69cb) · 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 Arm Limited
		# Copyright (c) 2020-2021 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 7ad5c5f23f4619add4aa6c88f4b25fc6fd84ec6e &&\
		git checkout TF-Mv1.4.0 &&\
		popd

		if test -z "$FIH_LEVEL"; then

+3 −4

Original line number	Diff line number	Diff line
		#!/bin/bash -x

		# Copyright (c) 2020 Arm Limited
		# Copyright (c) 2020-2021 Arm Limited
		#
		# Licensed under the Apache License, Version 2.0 (the "License");
		# you may not use this file except in compliance with the License.
		@@ -39,19 +39,18 @@ cd $TFM_DIR
		cmake -B $TFM_BUILD_DIR \
		-DCMAKE_BUILD_TYPE=$BUILD_TYPE \
		-DTFM_TOOLCHAIN_FILE=toolchain_GNUARM.cmake \
		-DTFM_PLATFORM=mps2/an521 \
		-DTFM_PLATFORM=arm/mps2/an521 \
		-DTEST_NS=ON \
		-DTEST_S=ON \
		-DTFM_PSA_API=ON \
		-DMCUBOOT_PATH=$MCUBOOT_PATH \
		-DMCUBOOT_LOG_LEVEL=INFO \
		-DTFM_TEST_REPO_VERSION=93ce2f59c0c4a9cba6062834496b5f45deee4010 \
		$CMAKE_FIH_LEVEL \
		.
		cd $TFM_BUILD_DIR
		make -j install

		BOOTLOADER_AXF='./install/outputs/MPS2/AN521/bl2.axf'
		BOOTLOADER_AXF='./install/outputs/ARM/MPS2/AN521/bl2.axf'

		$MCUBOOT_PATH/ci/fih_test_docker/run_fi_test.sh $BOOTLOADER_AXF $SKIP_SIZE $DAMAGE_TYPE> fih_test_output.yaml

+2 −2

Original line number	Diff line number	Diff line
		#!/bin/bash

		# Copyright (c) 2020 Arm Limited
		# Copyright (c) 2020-2021 Arm Limited
		#
		# Licensed under the Apache License, Version 2.0 (the "License");
		# you may not use this file except in compliance with the License.
		@@ -138,7 +138,7 @@ usage() {

		#defaults
		SKIP=2
		BIN_DIR=$(pwd)/install/outputs/MPS2/AN521
		BIN_DIR=$(pwd)/install/outputs/ARM/MPS2/AN521
		AXF_FILE=$BIN_DIR/bl2.axf
		GDB=gdb-multiarch
		BOOTLOADER=true

100644 → 100755

+1 −0

Original line number	Diff line number	Diff line
		@@ -1311,6 +1311,7 @@ So, running the test on the host looks like the following (The commands below
		are issued from the MCUboot source directory):

		```sh
		$ mkdir docker
		$ ./ci/fih-tests_install.sh
		$ FIH_LEVEL=MCUBOOT_FIH_PROFILE_MEDIUM BUILD_TYPE=RELEASE SKIP_SIZE=2 \
		DAMAGE_TYPE=SIGNATURE ./ci/fih-tests_run.sh