10000 Fix globbing of reference data by Spacetown · Pull Request #533 · gcovr/gcovr · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Fix globbing of reference data #533

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Dec 13, 2021
Merged

Fix globbing of reference data #533

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
27d0c9a
Extend globing for reference with wildcards.
Spacetown Dec 8, 2021
34361b7
Update references because of fixed test driver.
Spacetown Dec 8, 2021
bde994b
Update changelog.
Spacetown Dec 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ Internal changes:
- Change test and reference for XML diff to be the same as for the unified diff. (:issue:`509`)
- New parser for ``.gcov`` file format, should be more robust. (:issue:`512`)
- Add option to run all comiler versions at once. (:issue:`514`)
- Fix globing of reference data in tests. (:issue:`533`)

5.0 (11 June 2021)
------------------
Expand Down
6 changes: 3 additions & 3 deletions gcovr/tests/exclude-throw-branches/reference/clang-10/coverage-excl-throw.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
GCC Code Coverage Report
Directory: .
------------------------------------------------------------------------------
File Branches Taken Cover Missing
File Lines Exec Cover Missing
------------------------------------------------------------------------------
main.cpp 13 9 69% 28,29,33
main.cpp 23 22 95% 38
------------------------------------------------------------------------------
TOTAL 13 9 69%
TOTAL 23 22 95%
------------------------------------------------------------------------------
72 changes: 3 additions & 69 deletions gcovr/tests/exclude-throw-branches/reference/clang-10/coverage-excl-throw.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,69 +1,3 @@
<?xml version="1.0" ?>
<!DOCTYPE coverage
SYSTEM 'http://cobertura.sourceforge.net/xml/coverage-04.dtd'>
<coverage branch-rate="0.6923076923076923" branches-covered="9" branches-valid="13" complexity="0.0" line-rate="0.9047619047619048" lines-covered="19" lines-valid="21" timestamp="1539371666" version="gcovr 4.1">
<sources>
<source>.</source>
</sources>
<packages>
<package branch-rate="0.6923076923076923" complexity="0.0" line-rate="0.9047619047619048" name="">
<classes>
<class branch-rate="0.6923076923076923" complexity="0.0" filename="main.cpp" line-rate="0.9047619047619048" name="main_cpp">
<methods/>
<lines>
<line branch="false" hits="3" number="3"/>
<line branch="true" condition-coverage="100% (2/2)" hits="3" number="4">
<conditions>
<condition coverage="100%" number="0" type="jump"/>
</conditions>
</line>
<line branch="true" condition-coverage="100% (2/2)" hits="1" number="5">
<conditions>
<condition coverage="100%" number="0" type="jump"/>
</conditions>
</line>
<line branch="false" hits="2" number="7"/>
<line branch="false" hits="1" number="16"/>
<line branch="false" hits="1" number="17"/>
<line branch="false" hits="1" number="21"/>
<line branch="false" hits="1" number="22"/>
<line branch="false" hits="1" number="24"/>
<line branch="false" hits="1" number="25"/>
<line branch="true" condition-coverage="0% (0/1)" hits="1" number="28">
<conditions>
<condition coverage="0%" number="0" type="jump"/>
</conditions>
</line>
<line branch="true" condition-coverage="0% (0/2)" hits="2" number="29">
<conditions>
<condition coverage="0%" number="0" type="jump"/>
</conditions>
</line>
<line branch="false" hits="1" number="30"/>
<line branch="true" condition-coverage="75% (3/4)" hits="2" number="33">
<conditions>
<condition coverage="75%" number="0" type="jump"/>
</conditions>
</line>
<line branch="true" condition-coverage="100% (1/1)" hits="1" number="36">
<conditions>
<condition coverage="100%" number="0" type="jump"/>
</conditions>
</line>
<line branch="false" hits="0" number="37"/>
<line branch="false" hits="0" number="38"/>
<line branch="true" condition-coverage="100% (1/1)" hits="1" number="41">
<conditions>
<condition coverage="100%" number="0" type="jump"/>
</conditions>
</line>
<line branch="false" hits="1" number="43"/>
<line branch="false" hits="1" number="47"/>
<line branch="false" hits="1" number="48"/>
</lines>
</class>
</classes>
</package>
</packages>
</coverage>

<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE coverage SYSTEM 'http://cobertura.sourceforge.net/xml/coverage-04.dtd'>
<coverage line-rate="0.9565217391304348" function-rate="1.0" branch-rate="0.4375" lines-covered="22" lines-valid="23" functions-covered="6" functions-valid="6" branches-covered="7" branches-valid="16" complexity="0.0" timestamp="1638647466" version="gcovr 5.0"><sources><source>.</source></sources><packages><package name="" line-rate="0.9565217391304348" function-rate="1.0" branch-rate="0.5" complexity="0.0"><classes><class name="main_cpp" filename="main.cpp" line-rate="0.9565217391304348" branch-rate="0.5" complexity="0.0"><methods/><lines><line number="3" hits="3" branch="false"/><line number="4" hits="3" branch="true" condition-coverage="100% (2/2)"><conditions><condition number="0" type="jump" coverage="100%"/></conditions></line><line number="5" hits="1" branch="true" condition-coverage="50% (1/2)"><conditions><condition number="0" type="jump" coverage="50%"/></conditions></line><line number="7" hits="2" branch="false"/><line number="16" hits="1" branch="false"/><line number="17" hits="1" branch="false"/><line number="21" hits="1" branch="false"/><line number="22" hits="1" branch="false"/><line number="24" hits="1" branch="false"/><line number="25" hits="1" branch="false"/><line number="28" hits="1" branch="true" condition-coverage="50% (1/2)"><conditions><condition number="0" type="jump" coverage="50%"/></conditions></line><line number="29" hits="1" branch="true" condition-coverage="50% (1/2)"><conditions><condition number="0" type="jump" coverage="50%"/></conditions></line><line number="30" hits="1" branch="false"/><line number="31" hits="1" branch="false"/><line number="33" hits="1" branch="false"/><line number="36" hits="1" branch="true" condition-coverage="50% (1/2)"><conditions><condition number="0" type="jump" coverage="50%"/></conditions></line><line number="37" hits="1" branch="true" condition-coverage="0% (0/2)"><conditions><condition number="0" type="jump" coverage="0%"/></conditions></line><line number="38" hits="0" branch="false&quo 6D4E t;/><line number="41" hits="1" branch="true" condition-coverage="50% (1/2)"><conditions><condition number="0" type="jump" coverage="50%"/></conditions></line><line number="43" hits="1" branch="false"/><line number="44" hits="2" branch="false"/><line number="47" hits="1" branch="false"/><line number="48" hits="1" branch="false"/></lines></class></classes></package></packages></coverage>
6 changes: 3 additions & 3 deletions gcovr/tests/exclude-throw-branches/reference/clang-10/coverage-throw.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
GCC Code Coverage Report
Directory: .
------------------------------------------------------------------------------
File Branches Taken Cover Missing
File Lines Exec Cover Missing
------------------------------------------------------------------------------
main.cpp 20 10 50% 5,28,29,33,36,41
main.cpp 23 22 95% 38
------------------------------------------------------------------------------
TOTAL 20 10 50%
TOTAL 23 22 95%
------------------------------------------------------------------------------
72 changes: 3 additions & 69 deletions gcovr/tests/exclude-throw-branches/reference/clang-10/coverage-throw.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,69 +1,3 @@
<?xml version="1.0" ?>
<!DOCTYPE coverage
SYSTEM 'http://cobertura.sourceforge.net/xml/coverage-04.dtd'>
<coverage branch-rate="0.5" branches-covered="10" branches-valid="20" complexity="0.0" line-rate="0.9047619047619048" lines-covered="19" lines-valid="21" timestamp="1539371665" version="gcovr 4.1">
<sources>
<source>.</source>
</sources>
<packages>
<package branch-rate="0.5" complexity="0.0" line-rate="0.9047619047619048" name="">
<classes>
<class branch-rate="0.5" complexity="0.0" filename="main.cpp" line-rate="0.9047619047619048" name="main_cpp">
<methods/>
<lines>
<line branch="false" hits="3" number="3"/>
<line branch="true" condition-coverage="100% (2/2)" hits="3" number="4">
<conditions>
<condition coverage="100%" number="0" type="jump"/>
</conditions>
</line>
<line branch="true" condition-coverage="50% (2/4)" hits="1" number="5">
<conditions>
<condition coverage="50%" number="0" type="jump"/>
</conditions>
</line>
<line branch="false" hits="2" number="7"/>
<line branch="false" hits="1" number="16"/>
<line branch="false" hits="1" number="17"/>
<line branch="false" hits="1" number="21"/>
<line branch="false" hits="1" number="22"/>
<line branch="false" hits="1" number="24"/>
<line branch="false" hits="1" number="25"/>
<line branch="true" condition-coverage="50% (1/2)" hits="1" number="28">
<conditions>
<condition coverage="50%" number="0" type="jump"/>
</conditions>
</line>
<line branch="true" condition-coverage="0% (0/2)" hits="2" number="29">
<conditions>
<condition coverage="0%" number="0" type="jump"/>
</conditions>
</line>
<line branch="false" hits="1" number="30"/>
<line branch="true" condition-coverage="50% (3/6)" hits="2" number="33">
<conditions>
<condition coverage="50%" number="0" type="jump"/>
</conditions>
</line>
<line branch="true" condition-coverage="50% (1/2)" hits="1" number="36">
<conditions>
<condition coverage="50%" number="0" type="jump"/>
</conditions>
</line>
<line branch="false" hits="0" number="37"/>
<line branch="false" hits="0" number="38"/>
<line branch="true" condition-coverage="50% (1/2)" hits="1" number="41">
<conditions>
<condition coverage="50%" number="0" type="jump"/>
</conditions>
</line>
<line branch="false" hits="1" number="43"/>
<line branch="false" hits="1" number="47"/>
<line branch="false" hits="1" number="48"/>
</lines>
</class>
</classes>
</package>
</packages>
</coverage>

<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE coverage SYSTEM 'http://cobertura.sourceforge.net/xml/coverage-04.dtd'>
<coverage line-rate="0.9565217391304348" function-rate="1.0" branch-rate="0.4375" lines-covered="22" lines-valid="23" functions-covered="6" functions-valid="6" branches-covered="7" branches-valid="16" complexity="0.0" timestamp="1638647466" version="gcovr 5.0"><sources><source>.</source></sources><packages><package name="" line-rate="0.9565217391304348" function-rate="1.0" branch-rate="0.5" complexity="0.0"><classes><class name="main_cpp" filename="main.cpp" line-rate="0.9565217391304348" branch-rate="0.5" complexity="0.0"><methods/><lines><line number="3" hits="3" branch="false"/><line number="4" hits="3" branch="true" condition-coverage="100% (2/2)"><conditions><condition number="0" type="jump" coverage="100%"/></conditions></line><line number="5" hits="1" branch="true" condition-coverage="50% (1/2)"><conditions><condition number="0" type="jump" coverage="50%"/></conditions></line><line number="7" hits="2" branch="false"/><line number="16" hits="1" branch="false"/><line number="17" hits="1" branch="false"/><line number="21" hits="1" branch="false"/><line number="22" hits="1" branch="false"/><line number="24" hits="1" branch="false"/><line number="25" hits="1" branch="false"/><line number="28" hits="1" branch="true" condition-coverage="50% (1/2)"><conditions><condition number="0" type="jump" coverage="50%"/></conditions></line><line number="29" hits="1" branch="true" condition-coverage="50% (1/2)"><conditions><condition number="0" type="jump" coverage="50%"/></conditions></line><line number="30" hits="1" branch="false"/><line number="31" hits="1" branch="false"/><line number="33" hits="1" branch="false"/><line number="36" hits="1" branch="true" condition-coverage="50% (1/2)"><conditions><condition number="0" type="jump" coverage="50%"/></conditions></line><line number="37" hits="1" branch="true" condition-coverage="0% (0/2)"><conditions><condition number="0" type="jump" coverage="0%"/></conditions></line><line number="38" hits="0" branch="false"/><line number="41" hits="1" branch="true" condition-coverage="50% (1/2)"><conditions><condition number="0" type="jump" coverage="50%"/></conditions></line><line number="43" hits="1" branch="false"/><line number="44" hits="2" branch="false"/><line number="47" hits="1" branch="false"/><line number="48" hits="1" branch="false"/></lines></class></classes></package></packages></coverage>
29 changes: 2 additions & 27 deletions gcovr/tests/exclude-throw-branches/reference/clang-10/sonarqube-excl-throw.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,2 @@
<?xml version="1.0" ?>
<coverage version="1">
<file path="main.cpp">
<lineToCover covered="true" lineNumber="3"/>
<lineToCover branchesToCover="2" covered="true" coveredBranches="2" lineNumber="4"/>
<lineToCover branchesToCover="1" covered="true" coveredBranches="1" lineNumber="5"/>
<lineToCover covered="true" lineNumber="7"/>
<lineToCover covered="true" lineNumber="16"/>
<lineToCover covered="true" lineNumber="17"/>
<lineToCover covered="true" lineNumber="21"/>
<lineToCover covered="true" lineNumber="22"/>
<lineToCover covered="true" lineNumber="24"/>
<lineToCover covered="true" lineNumber="25"/>
<lineToCover branchesToCover="1" covered="true" coveredBranches="0" lineNumber="28"/>
<lineToCover branchesToCover="2" covered="true" coveredBranches="0" lineNumber="29"/>
<lineToCover covered="true" lineNumber="30"/>
<lineToCover branchesToCover="2" covered="true" coveredBranches="1" lineNumber="33"/>
<lineToCover branchesToCover="1" covered="true" coveredBranches="1" lineNumber="36"/>
<lineToCover covered="false" lineNumber="37"/>
<lineToCover covered="false" lineNumber="38"/>
<lineToCover branchesToCover="1" covered="true" coveredBranches="1" lineNumber="41"/>
<lineToCover covered="true" lineNumber="43"/>
<lineToCover covered="true" lineNumber="47"/>
<lineToCover covered="true" lineNumber="48"/>
</file>
</coverage>

<?xml version='1.0' encoding='UTF-8'?>
<coverage version="1"><file path="main.cpp"><functionToCover functionName="_Z22function_with_catchersi" lineNumber="24" covered="true"/><functionToCover functionName="_Z23function_that_may_throwb" lineNumber="3" covered="true"/><functionToCover functionName="_ZN4RAIIC2Eb" lineNumber="21" covered="true"/><functionToCover functionName="_ZN4RAIID2Ev" lineNumber="22" covered="true"/><functionToCover functionName="_ZNK4RAII21method_that_may_throwEv" lineNumber="16" covered="true"/><functionToCover functionName="main" lineNumber="47" covered="true"/><lineToCover lineNumber="3" covered="true"/><lineToCover lineNumber="4" covered="true" branchesToCover="2" coveredBranches="2"/><lineToCover lineNumber="5" covered="true" branchesToCover="2" coveredBranches="1"/><lineToCover lineNumber="7" covered="true"/><lineToCover lineNumber="16" covered="true"/><lineToCover lineNumber="17" covered="true"/><lineToCover lineNumber="21" covered="true"/><lineToCover lineNumber="22" covered="true"/><lineToCover lineNumber="24" covered="true"/><lineToCover lineNumber="25" covered="true"/><lineToCover lineNumber="28" covered="true" branchesToCover="2" coveredBranches="1"/><lineToCover lineNumber="29" covered="true" branchesToCover="2" coveredBranches="1"/><lineToCover lineNumber="30" covered="true"/><lineToCover lineNumber="31" covered="true"/><lineToCover lineNumber="33" covered="true"/><lineToCover lineNumber="36" covered="true" branchesToCover="2" coveredBranches="1"/><lineToCover lineNumber="37" covered="true" branchesToCover="2" coveredBranches="0"/><lineToCover lineNumber="38" covered="false"/><lineToCover lineNumber="41" covered="true" branchesToCover="2" coveredBranches="1"/><lineToCover lineNumber="43" covered="true"/><lineToCover lineNumber="44" covered="true"/><lineToCover lineNumber="47" covered="true"/><lineToCover lineNumber="48" covered="true"/></file></coverage>
29 changes: 2 additions & 27 deletions gcovr/tests/exclude-throw-branches/reference/clang-10/sonarqube-throw.xml
View file
Open in desktop
E14D
Original file line number Diff line number Diff line change
@@ -1,27 +1,2 @@
<?xml version="1.0" ?>
<coverage version="1">
<file path="main.cpp">
<lineToCover covered="true" lineNumber="3"/>
<lineToCover branchesToCover="2" covered="true" coveredBranches="2" lineNumber="4"/>
<lineToCover branchesToCover="2" covered="true" coveredBranches="1" lineNumber="5"/>
<lineToCover covered="true" lineNumber="7"/>
<lineToCover covered="true" lineNumber="16"/>
<lineToCover covered="true" lineNumber="17"/>
<lineToCover covered="true" lineNumber="21"/>
<lineToCover covered="true" lineNumber="22"/>
<lineToCover covered="true" lineNumber="24"/>
<lineToCover covered="true" lineNumber="25"/>
<lineToCover branchesToCover="2" covered="true" coveredBranches="1" lineNumber="28"/>
<lineToCover branchesToCover="2" covered="true" coveredBranches="0" lineNumber="29"/>
<lineToCover covered="true" lineNumber="30"/>
<lineToCover branchesToCover="2" covered="true" coveredBranches="1" lineNumber="33"/>
<lineToCover branchesToCover="2" covered="true" coveredBranches="1" lineNumber="36"/>
<lineToCover covered="false" lineNumber="37"/>
<lineToCover covered="false" lineNumber="38"/>
<lineToCover branchesToCover="2" covered="true" coveredBranches="1" lineNumber="41"/>
<lineToCover covered="true" lineNumber="43"/>
<lineToCover covered="true" lineNumber="47"/>
<lineToCover covered="true" lineNumber="48"/>
</file>
</coverage>

<?xml version='1.0' encoding='UTF-8'?>
<coverage version="1"><file path="main.cpp"><functionToCover functionName="_Z22function_with_catchersi" lineNumber="24" covered="true"/><functionToCover functionName="_Z23function_that_may_throwb" lineNumber="3" covered="true"/><functionToCover functionName="_ZN4RAIIC2Eb" lineNumber="21" covered="true"/><functionToCover functionName="_ZN4RAIID2Ev" lineNumber="22" covered="true"/><functionToCover functionName="_ZNK4RAII21method_that_may_throwEv" lineNumber="16" covered="true"/><functionToCover functionName="main" lineNumber="47" covered="true"/><lineToCover lineNumber="3" covered="true"/><lineToCover lineNumber="4" covered="true" branchesToCover="2" coveredBranches="2"/><lineToCover lineNumber="5" covered="true" branchesToCover="2" coveredBranches="1"/><lineToCover lineNumber="7" covered="true"/><lineToCover lineNumber="16" covered="true"/><lineToCover lineNumber="17" covered="true"/><lineToCover lineNumber="21" covered="true"/><lineToCover lineNumber="22" covered="true"/><lineToCover lineNumber="24" covered="true"/><lineToCover lineNumber="25" covered="true"/><lineToCover lineNumber="28" covered="true" branchesToCover="2" coveredBranches="1"/><lineToCover lineNumber="29" covered="true" branchesToCover="2" coveredBranches="1"/><lineToCover lineNumber="30" covered="true"/><lineToCover lineNumber="31" covered="true"/><lineToCover lineNumber="33" covered="true"/><lineToCover lineNumber="36" covered="true" branchesToCover="2" coveredBranches="1"/><lineToCover lineNumber="37" covered="true" branchesToCover="2" coveredBranches="0"/><lineToCover lineNumber="38" covered="false"/><lineToCover lineNumber="41" covered="true" branchesToCover="2" coveredBranches="1"/><lineToCover lineNumber="43" covered="true"/><lineToCover lineNumber="44" covered="true"/><lineToCover lineNumber="47" covered="true"/><lineToCover lineNumber="48" covered="true"/></file></coverage>
6 changes: 3 additions & 3 deletions gcovr/tests/exclude-throw-branches/reference/gcc-5/coverage-excl-throw.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
GCC Code Coverage Report
Directory: .
------------------------------------------------------------------------------
File Branches Taken Cover Missing
File Lines Exec Cover Missing
------------------------------------------------------------------------------
main.cpp 13 9 69% 28,29,33
main.cpp 21 19 90% 37-38
------------------------------------------------------------------------------
TOTAL 13 9 69%
TOTAL 21 19 90%
------------------------------------------------------------------------------
Loading
0