From 4014e37dc9b17c35a3553450e18a3d63bebe8e0c Mon Sep 17 00:00:00 2001 From: Saikrishna Arcot Date: Fri, 23 Dec 2022 11:11:33 -0800 Subject: [PATCH] Switch to using stock gcovr 5.2 (#726) * Switch to using stock gcovr 5.2 The custom branch we were using previously has since been deleted. That branch appears to have some fix for searching for the source file (for a gcda file) recursively. I don't know if it's needed or not today, but using the stock gcovr 5.2 (from the official repo) appears to work. Signed-off-by: Saikrishna Arcot --- .azure-pipelines/build-template.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.azure-pipelines/build-template.yml b/.azure-pipelines/build-template.yml index 0f67b8287..f1220a224 100644 --- a/.azure-pipelines/build-template.yml +++ b/.azure-pipelines/build-template.yml @@ -111,14 +111,14 @@ jobs: - ${{ if eq(parameters.run_unit_test, true) }}: - script: | set -ex - git clone https://github.com/Spacetown/gcovr.git + git clone https://github.com/gcovr/gcovr.git cd gcovr/ - git checkout origin/recursive_search_file + git checkout 5.2 sudo pip3 install setuptools sudo python3 setup.py install cd .. sudo rm -rf gcovr - displayName: "Install gcovr 5.0 with recursive fix" + displayName: "Install gcovr 5.2 (for --exclude-throw-branches support)" - script: | set -ex sudo pip install Pympler==0.8 @@ -138,7 +138,7 @@ jobs: redis-cli FLUSHALL pytest --cov=. --cov-report=xml mv coverage.xml tests/coverage.xml - gcovr -r ./ -e ".*/swsscommon_wrap.cpp" --exclude-unreachable-branches --exclude-throw-branches -x --xml-pretty -o coverage.xml + gcovr -r ./ -e ".*/swsscommon_wrap.cpp" --exclude-unreachable-branches --exclude-throw-branches --gcov-ignore-parse-errors -x --xml-pretty -o coverage.xml make -C goext redis-cli FLUSHALL make -C goext check