Docker: Fix coverage test

This commit is contained in:
Ole Schütt 2019-01-11 13:57:37 +01:00 committed by Ole Schütt
parent 32f1989d56
commit 34b43fc68a
2 changed files with 6 additions and 4 deletions

View file

@ -105,7 +105,10 @@ fi
if $TOOLCHAIN_OK ; then
echo -e "\n========== Running Test ==========" | tee -a $REPORT
cd /workspace
"$@" |& tee -a $REPORT
if ! "$@" |& tee -a $REPORT ; then
echo -e "\nSummary: Test had non-zero exit status." | tee -a $REPORT
echo -e "Status: FAILED\n" | tee -a $REPORT
fi
fi
# Wrap up.

View file

@ -23,9 +23,8 @@ make ARCH="${ARCH}" VERSION="${VERSION}" TESTOPTS="${TESTOPTS}" test
# gcov gets stuck on some files...
# Maybe related: https://bugs.launchpad.net/gcc-arm-embedded/+bug/1694644
# As a workaround we'll simply remove the offending files for now.
rm -v "/workspace/cp2k/obj/${ARCH}/${VERSION}"/almo_scf_types.gcda
rm -v "/workspace/cp2k/obj/${ARCH}/${VERSION}"/dbcsr_tensor_types.gcda
rm -v "/workspace/cp2k/obj/${ARCH}/${VERSION}"/mp2_types.gcda
rm -fv "/workspace/cp2k/obj/${ARCH}/${VERSION}"/almo_scf_types.gcda
rm -fv "/workspace/cp2k/obj/${ARCH}/${VERSION}"/mp2_types.gcda
#cd /tmp
#for i in /workspace/cp2k/obj/${ARCH}/${VERSION}/*.gcda; do
# timeout 30 gcov $i >/dev/null 2>&1 || rm -v $i