Commit d7f372b9 authored by Fabio Utzig's avatar Fabio Utzig Committed by David Brown
Browse files

ci: pull trusted-firmware-m repo on Travis run 



Update volume maps so local directories in the Travis VM map correctly
to the Docker expected PATH for script running. Misc cleanups.

Signed-off-by: default avatarFabio Utzig <fabio.utzig@nordicsemi.no>
Signed-off-by: default avatarDavid Brown <david.brown@linaro.org>
parent a29546a1

ci/fih-tests_run.sh

+9 −3
Original line number Diff line number Diff line
@@ -16,8 +16,14 @@ 


set -e



pushd .. &&\

   git clone https://git.trustedfirmware.org/TF-M/trusted-firmware-m.git &&\

   pushd trusted-firmware-m &&\

   git checkout 8501b37db8e038ce39eb7f1039a514edea92c96e &&\

   popd



if test -z "$FIH_LEVEL"; then

    docker run mcuboot/fih-test /bin/sh -c '/root/execute_test.sh $0 $1 $2' $SKIP_SIZE $BUILD_TYPE $DAMAGE_TYPE

    docker run --rm -v $(pwd):/root/work/tfm:rw,z mcuboot/fih-test /bin/sh -c '/root/work/tfm/mcuboot/ci/fih_test_docker/execute_test.sh $0 $1 $2' $SKIP_SIZE $BUILD_TYPE $DAMAGE_TYPE

else

    docker run mcuboot/fih-test /bin/sh -c '/root/execute_test.sh $0 $1 $2 $3' $SKIP_SIZE $BUILD_TYPE $DAMAGE_TYPE $FIH_LEVEL

    docker run --rm -v $(pwd):/root/work/tfm:rw,z mcuboot/fih-test /bin/sh -c '/root/work/tfm/mcuboot/ci/fih_test_docker/execute_test.sh $0 $1 $2 $3' $SKIP_SIZE $BUILD_TYPE $DAMAGE_TYPE $FIH_LEVEL

fi

ci/fih_test_docker/execute_test.sh

+0 −2
Original line number Diff line number Diff line
@@ -26,8 +26,6 @@ BUILD_TYPE=$2 
DAMAGE_TYPE=$3

FIH_LEVEL=$4



source ~/.bashrc



if test -z "$FIH_LEVEL"; then

    # Use the default level

    CMAKE_FIH_LEVEL=""

CRA Git | Maintained and supported by SUSTech CRA and CCSE