diff --git a/.ci/script.sh b/.ci/script.sh index 3e5cd18cd8d4a6e7a36be486658211356a2059ca..f2fe0981690d2ddc81807a53052731f24cee4275 100755 --- a/.ci/script.sh +++ b/.ci/script.sh @@ -8,9 +8,11 @@ if [ $TRAVIS_OS_NAME == linux ]; then sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/${CC_VERSION} 10 sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/${CXX_VERSION} 10 + sudo update-alternatives --install /usr/bin/gcov gcov /usr/bin/gcov-8 10 sudo update-alternatives --set gcc "/usr/bin/${CC_VERSION}" sudo update-alternatives --set g++ "/usr/bin/${CXX_VERSION}" + sudo update-alternatives --set gcov "/usr/bin/gcov-8" # Build the library. cmake -H. -Bbuild -DCMAKE_BUILD_TYPE=Debug \ diff --git a/.travis.yml b/.travis.yml index 1661291115c0547fe0a9ca0df119a4acab7e9383..390a58258826c80aaf4c1a537cffb40eed15cd48 100644 --- a/.travis.yml +++ b/.travis.yml @@ -68,6 +68,6 @@ after_success: if [ $COVERAGE == ON ]; then docker run -v `pwd`:/build \ --net=host nheko-reborn/mtxclient \ - /bin/bash -c "make -C build -j1 test_coverage && ./.ci/coverage.sh" && \ + /bin/bash -c "make -C build -j1 test && ./.ci/coverage.sh" && \ bash <(curl -s https://codecov.io/bash) -f "!*tests*" || echo "Codecov failed" fi diff --git a/Dockerfile b/Dockerfile index b87283c0754c74aa414310ecbcf587662dbc049b..2510ec0d7e1a8f0f54f85fee9bd3d65defe50fba 100644 --- a/Dockerfile +++ b/Dockerfile @@ -34,8 +34,10 @@ RUN \ openssl && \ sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-8 10 && \ sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-8 10 && \ + sudo update-alternatives --install /usr/bin/gcov gcov /usr/bin/gcov-8 10 && \ sudo update-alternatives --set gcc "/usr/bin/gcc-8" && \ sudo update-alternatives --set g++ "/usr/bin/g++-8" && \ + sudo update-alternatives --set gcov "/usr/bin/gcov-8" && \ # libsodium mkdir -p /build/libsodium && cd /build/libsodium && \ curl -L https://download.libsodium.org/libsodium/releases/libsodium-${LIBSODIUM_VERSION}.tar.gz -o libsodium-${LIBSODIUM_VERSION}.tar.gz && \