From aaf5e3e988fb188a6e2edcd851a7578bad8a1951 Mon Sep 17 00:00:00 2001 From: Bronek Kozicki Date: Thu, 14 Dec 2023 18:26:07 +0000 Subject: [PATCH] Install gcovr and alias llvm-cov (#2) --- ubuntu-22.04/install.sh | 8 ++++++-- ubuntu-22.04/metadata.sh | 1 + 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ubuntu-22.04/install.sh b/ubuntu-22.04/install.sh index d208fdf..cd63146 100755 --- a/ubuntu-22.04/install.sh +++ b/ubuntu-22.04/install.sh @@ -13,6 +13,7 @@ cmake_sha256=1c511d09516af493694ed9baf13c55947a36389674d657a2d5e0ccedc6b291d8 doxygen_version=${DOXYGEN_VERSION:-1.9.5} doxygen_md5=1edb77277a84cf07972ffcd60acb8c1d conan_version=${CONAN_VERSION:-1.58} +gcovr_version=${GCOVR_VERSION:-6.0} # Do not add a stanza to this script without explaining why it is here. @@ -81,7 +82,8 @@ apt install --yes ${dependencies} # Give us nice unversioned aliases for clang and company. update-alternatives --install \ /usr/bin/clang clang /usr/bin/clang-${clang_version} 100 \ - --slave /usr/bin/clang++ clang++ /usr/bin/clang++-${clang_version} + --slave /usr/bin/clang++ clang++ /usr/bin/clang++-${clang_version} \ + --slave /usr/bin/llvm-cov llvm-cov /usr/bin/llvm-cov-${clang_version} update-alternatives --auto clang update-alternatives --install \ /usr/bin/clang-tidy clang-tidy /usr/bin/clang-tidy-${clang_version} 100 @@ -127,7 +129,7 @@ cd ../.. rm --recursive --force ${doxygen_slug} # Install Conan. -pip3 install conan==${conan_version} +pip3 --no-cache-dir install conan==${conan_version} conan profile new --detect gcc conan profile update settings.compiler=gcc gcc @@ -145,5 +147,7 @@ conan profile update settings.compiler.cppstd=20 clang conan profile update env.CC=/usr/bin/clang clang conan profile update env.CXX=/usr/bin/clang++ clang +pip3 --no-cache-dir install gcovr==${gcovr_version} + # Clean up. apt clean diff --git a/ubuntu-22.04/metadata.sh b/ubuntu-22.04/metadata.sh index 15a6d4e..4f2e64e 100755 --- a/ubuntu-22.04/metadata.sh +++ b/ubuntu-22.04/metadata.sh @@ -16,3 +16,4 @@ clang --version cmake --version doxygen --version conan --version +gcovr --version