Skip to content

Commit 08f360d

Browse files
Spacetownlatk
Spacetown
and
latk
authored
Use pretty print for coveralls and cobertura (gcovr#606)
Co-authored-by: Lukas Atkinson <[email protected]>
1 parent bfd364e commit 08f360d

File tree

266 files changed

+29764
-432
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

266 files changed

+29764
-432
lines changed

Diff for: ‎.editorconfig

+3
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@ indent_size = 4
1818
[*.json]
1919
insert_final_newline = false
2020

21+
[*.xml]
22+
indent_size = 2
23+
2124
[*.sh]
2225
# Declare that the script files will always have LF line endings on checkout.
2326
# Otherwise using cygwin and WSL to execute these will fail if checkout is done on Windows.

Diff for: ‎CHANGELOG.rst

+1
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ Internal changes:
3737
- Change session black with no arguments to format all files. (:issue:`595`)
3838
- Add gcc-10 and gcc-11 to the test suite. (:issue:`597`)
3939
- Improved internal coverage data model to simplify processing. (:issue:`600`)
40+
- Use pretty print for cobertura and coveralls in test suite. (:issue:`606`)
4041

4142
5.1 (26 March 2022)
4243
-------------------

Diff for: ‎gcovr/tests/add_coverages/Makefile

+5-5
Original file line numberDiff line numberDiff line change
@@ -11,31 +11,31 @@ all:
1111

1212
run: txt xml html sonarqube json json_summary coveralls
1313

14-
# Enable JSON output via the --json-pretty mode.
14+
# Enable JSON output via the --json-pretty --json mode.
1515
# However, this option cannot take a filename directly
1616
# so that "-o" is used.
1717
coverage_foo.json:
1818
./testcase_foo
1919
$(GCOVR) -d --json-pretty -o $@
2020

21-
# Just use --json and pass the output filename directly.
21+
# Just use --json-pretty and --json and pass the output filename directly.
2222
coverage_bar.json:
2323
./testcase_bar
24-
$(GCOVR) -d --json $@
24+
$(GCOVR) -d --json-pretty --json $@
2525

2626
txt: coverage_foo.json coverage_bar.json
2727
$(GCOVR) -a coverage_foo.json -a coverage_bar.json -o coverage.txt
2828

2929
xml: coverage_foo.json coverage_bar.json
30-
$(GCOVR) -a coverage_foo.json -a coverage_bar.json -x -o coverage.xml
30+
$(GCOVR) -a coverage_foo.json -a coverage_bar.json --cobertura-pretty --cobertura coverage.xml
3131

3232
html: coverage_foo.json coverage_bar.json
3333
$(GCOVR) -a coverage_foo.json -a coverage_bar.json --html-details -o coverage.html
3434

3535
sonarqube: coverage_foo.json coverage_bar.json
3636
$(GCOVR) -a coverage_foo.json -a coverage_bar.json --sonarqube sonarqube.xml
3737

38-
# Use both --json and --json-pretty here
38+
# Use both --json-pretty --json here
3939
json: coverage_foo.json coverage_bar.json
4040
$(GCOVR) -a 'coverage_*.json' --json-pretty --json coverage.json
4141

Diff for: ‎gcovr/tests/add_coverages/reference/clang-10/coverage.xml

+38-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,40 @@
11
<?xml version='1.0' encoding='UTF-8'?>
22
<!DOCTYPE coverage SYSTEM 'http://cobertura.sourceforge.net/xml/coverage-04.dtd'>
3-
<coverage line-rate="1.0" function-rate="1.0" branch-rate="0.0" lines-covered="12" lines-valid="12" functions-covered="3" functions-valid="3" branches-covered="0" branches-valid="0" complexity="0.0" timestamp="1630936703" version="gcovr 5.0"><sources><source>.</source></sources><packages><package name="" line-rate="1.0" function-rate="1.0" branch-rate="0.0" complexity="0.0"><classes><class name="bar_cpp" filename="bar.cpp" line-rate="1.0" branch-rate="0.0" complexity="0.0"><methods/><lines><line number="1" hits="1" branch="false"/><line number="3" hits="1" branch="false"/><line number="4" hits="1" branch="false"/><line number="5" hits="1" branch="false"/></lines></class><class name="foo_cpp" filename="foo.cpp" line-rate="1.0" branch-rate="0.0" complexity="0.0"><methods/><lines><line number="1" hits="1" branch="false"/><line number="3" hits="1" branch="false"/><line number="4" hits="1" branch="false"/><line number="5" hits="1" branch="false"/></lines></class><class name="main_cpp" filename="main.cpp" line-rate="1.0" branch-rate="0.0" complexity="0.0"><methods/><lines><line number="10" hits="2" branch="false"/><line number="12" hits="1" branch="false"/><line number="15" hits="1" branch="false"/><line number="18" hits="2" branch="false"/></lines></class></classes></package></packages></coverage>
3+
<coverage line-rate="1.0" function-rate="1.0" branch-rate="0.0" lines-covered="12" lines-valid="12" functions-covered="3" functions-valid="3" branches-covered="0" branches-valid="0" complexity="0.0" timestamp="1649531559" version="gcovr 5.1">
4+
<sources>
5+
<source>.</source>
6+
</sources>
7+
<packages>
8+
<package name="" line-rate="1.0" function-rate="1.0" branch-rate="0.0" complexity="0.0">
9+
<classes>
10+
<class name="bar_cpp" filename="bar.cpp" line-rate="1.0" branch-rate="0.0" complexity="0.0">
11+
<methods/>
12+
<lines>
13+
<line number="1" hits="1" branch="false"/>
14+
<line number="3" hits="1" branch="false"/>
15+
<line number="4" hits="1" branch="false"/>
16+
<line number="5" hits="1" branch="false"/>
17+
</lines>
18+
</class>
19+
<class name="foo_cpp" filename="foo.cpp" line-rate="1.0" branch-rate="0.0" complexity="0.0">
20+
<methods/>
21+
<lines>
22+
<line number="1" hits="1" branch="false"/>
23+
<line number="3" hits="1" branch="false"/>
24+
<line number="4" hits="1" branch="false"/>
25+
<line number="5" hits="1" branch="false"/>
26+
</lines>
27+
</class>
28+
<class name="main_cpp" filename="main.cpp" line-rate="1.0" branch-rate="0.0" complexity="0.0">
29+
<methods/>
30+
<lines>
31+
<line number="10" hits="2" branch="false"/>
32+
<line number="12" hits="1" branch="false"/>
33+
<line number="15" hits="1" branch="false"/>
34+
<line number="18" hits="2" branch="false"/>
35+
</lines>
36+
</class>
37+
</classes>
38+
</package>
39+
</packages>
40+
</coverage>

Diff for: ‎gcovr/tests/add_coverages/reference/gcc-5/coverage.xml

+43-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,45 @@
11
<?xml version='1.0' encoding='UTF-8'?>
22
<!DOCTYPE coverage SYSTEM 'http://cobertura.sourceforge.net/xml/coverage-04.dtd'>
3-
<coverage line-rate="1.0" function-rate="1.0" branch-rate="0.5" lines-covered="13" lines-valid="13" functions-covered="3" functions-valid="3" branches-covered="2" branches-valid="4" complexity="0.0" timestamp="1645647235" version="gcovr 5.0"><sources><source>.</source></sources><packages><package name="" line-rate="1.0" function-rate="1.0" branch-rate="0.5" complexity="0.0"><classes><class name="bar_cpp" filename="bar.cpp" line-rate="1.0" branch-rate="0.0" complexity="0.0"><methods/><lines><line number="1" hits="1" branch="false"/><line number="3" hits="1" branch="false"/><line number="4" hits="1" branch="false"/><line number="5" hits="1" branch="false"/></lines></class><class name="foo_cpp" filename="foo.cpp" line-rate="1.0" branch-rate="0.0" complexity="0.0"><methods/><lines><line number="1" hits="1" branch="false"/><line number="3" hits="1" branch="false"/><line number="4" hits="1" branch="false"/><line number="5" hits="1" branch="false"/></lines></class><class name="main_cpp" filename="main.cpp" line-rate="1.0" branch-rate="0.5" complexity="0.0"><methods/><lines><line number="10" hits="2" branch="false"/><line number="12" hits="1" branch="false"/><line number="15" hits="1" branch="false"/><line number="18" hits="2" branch="false"/><line number="19" hits="6" branch="true" condition-coverage="50% (2/4)"><conditions><condition number="0" type="jump" coverage="50%"/></conditions></line></lines></class></classes></package></packages></coverage>
3+
<coverage line-rate="1.0" function-rate="1.0" branch-rate="0.5" lines-covered="13" lines-valid="13" functions-covered="3" functions-valid="3" branches-covered="2" branches-valid="4" complexity="0.0" timestamp="1649529308" version="gcovr 5.1">
4+
<sources>
5+
<source>.</source>
6+
</sources>
7+
<packages>
8+
<package name="" line-rate="1.0" function-rate="1.0" branch-rate="0.5" complexity="0.0">
9+
<classes>
10+
<class name="bar_cpp" filename="bar.cpp" line-rate="1.0" branch-rate="0.0" complexity="0.0">
11+
<methods/>
12+
<lines>
13+
<line number="1" hits="1" branch="false"/>
14+
<line number="3" hits="1" branch="false"/>
15+
<line number="4" hits="1" branch="false"/>
16+
<line number="5" hits="1" branch="false"/>
17+
</lines>
18+
</class>
19+
<class name="foo_cpp" filename="foo.cpp" line-rate="1.0" branch-rate="0.0" complexity="0.0">
20+
<methods/>
21+
<lines>
22+
<line number="1" hits="1" branch="false"/>
23+
<line number="3" hits="1" branch="false"/>
24+
<line number="4" hits="1" branch="false"/>
25+
<line number="5" hits="1" branch="false"/>
26+
</lines>
27+
</class>
28+
<class name="main_cpp" filename="main.cpp" line-rate="1.0" branch-rate="0.5" complexity="0.0">
29+
<methods/>
30+
<lines>
31+
<line number="10" hits="2" branch="false"/>
32+
<line number="12" hits="1" branch="false"/>
33+
<line number="15" hits="1" branch="false"/>
34+
<line number="18" hits="2" branch="false"/>
35+
<line number="19" hits="6" branch="true" condition-coverage="50% (2/4)">
36+
<conditions>
37+
<condition number="0" type="jump" coverage="50%"/>
38+
</conditions>
39+
</line>
40+
</lines>
41+
</class>
42+
</classes>
43+
</package>
44+
</packages>
45+
</coverage>

Diff for: ‎gcovr/tests/add_coverages/reference/gcc-8/coverage.xml

+38-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,40 @@
11
<?xml version='1.0' encoding='UTF-8'?>
22
<!DOCTYPE coverage SYSTEM 'http://cobertura.sourceforge.net/xml/coverage-04.dtd'>
3-
<coverage line-rate="1.0" function-rate="1.0" branch-rate="0.0" lines-covered="12" lines-valid="12" functions-covered="3" functions-valid="3" branches-covered="0" branches-valid="0" complexity="0.0" timestamp="1626723328" version="gcovr 5.0"><sources><source>.</source></sources><packages><package name="" line-rate="1.0" function-rate="1.0" branch-rate="0.0" complexity="0.0"><classes><class name="bar_cpp" filename="bar.cpp" line-rate="1.0" branch-rate="0.0" complexity="0.0"><methods/><lines><line number="1" hits="1" branch="false"/><line number="3" hits="1" branch="false"/><line number="4" hits="1" branch="false"/><line number="5" hits="1" branch="false"/></lines></class><class name="foo_cpp" filename="foo.cpp" line-rate="1.0" branch-rate="0.0" complexity="0.0"><methods/><lines><line number="1" hits="1" branch="false"/><line number="3" hits="1" branch="false"/><line number="4" hits="1" branch="false"/><line number="5" hits="1" branch="false"/></lines></class><class name="main_cpp" filename="main.cpp" line-rate="1.0" branch-rate="0.0" complexity="0.0"><methods/><lines><line number="10" hits="2" branch="false"/><line number="12" hits="1" branch="false"/><line number="15" hits="1" branch="false"/><line number="18" hits="2" branch="false"/></lines></class></classes></package></packages></coverage>
3+
<coverage line-rate="1.0" function-rate="1.0" branch-rate="0.0" lines-covered="12" lines-valid="12" functions-covered="3" functions-valid="3" branches-covered="0" branches-valid="0" complexity="0.0" timestamp="1649529904" version="gcovr 5.1">
4+
<sources>
5+
<source>.</source>
6+
</sources>
7+
<packages>
8+
<package name="" line-rate="1.0" function-rate="1.0" branch-rate="0.0" complexity="0.0">
9+
<classes>
10+
<class name="bar_cpp" filename="bar.cpp" line-rate="1.0" branch-rate="0.0" complexity="0.0">
11+
<methods/>
12+
<lines>
13+
<line number="1" hits="1" branch="false"/>
14+
<line number="3" hits="1" branch="false"/>
15+
<line number="4" hits="1" branch="false"/>
16+
<line number="5" hits="1" branch="false"/>
17+
</lines>
18+
</class>
19+
<class name="foo_cpp" filename="foo.cpp" line-rate="1.0" branch-rate="0.0" complexity="0.0">
20+
<methods/>
21+
<lines>
22+
<line number="1" hits="1" branch="false"/>
23+
<line number="3" hits="1" branch="false"/>
24+
<line number="4" hits="1" branch="false"/>
25+
<line number="5" hits="1" branch="false"/>
26+
</lines>
27+
</class>
28+
<class name="main_cpp" filename="main.cpp" line-rate="1.0" branch-rate="0.0" complexity="0.0">
29+
<methods/>
30+
<lines>
31+
<line number="10" hits="2" branch="false"/>
32+
<line number="12" hits="1" branch="false"/>
33+
<line number="15" hits="1" branch="false"/>
34+
<line number="18" hits="2" branch="false"/>
35+
</lines>
36+
</class>
37+
</classes>
38+
</package>
39+
</packages>
40+
</coverage>

Diff for: ‎gcovr/tests/bad++char/Makefile

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ run: txt xml html sonarqube json_summary coveralls
55

66
coverage.json:
77
./testcase
8-
$(GCOVR) --json coverage.json
8+
$(GCOVR) --json-pretty --json coverage.json
99

1010
txt: coverage.json
1111
$(GCOVR) -a $< -o coverage.txt
1212

1313
xml: coverage.json
14-
$(GCOVR) -a $< -x -o coverage.xml
14+
$(GCOVR) -a $< --cobertura-pretty --cobertura coverage.xml
1515

1616
html: coverage.json
1717
$(GCOVR) -a $< --html-details -o coverage.html
@@ -20,7 +20,7 @@ sonarqube: coverage.json
2020
$(GCOVR) -a $< --sonarqube -o sonarqube.xml
2121

2222
coveralls: coverage.json
23-
$(GCOVR) -a $< --coveralls coveralls.json
23+
$(GCOVR) -a $< --coveralls-pretty --coveralls coveralls.json
2424

2525
json_summary:
2626
./testcase

Diff for: ‎gcovr/tests/bad++char/reference/clang-10/coverage.xml

+28-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,30 @@
11
<?xml version='1.0' encoding='UTF-8'?>
22
<!DOCTYPE coverage SYSTEM 'http://cobertura.sourceforge.net/xml/coverage-04.dtd'>
3-
<coverage line-rate="0.875" function-rate="1.0" branch-rate="0.5" lines-covered="7" lines-valid="8" functions-covered="2" functions-valid="2" branches-covered="1" branches-valid="2" complexity="0.0" timestamp="1630936704" version="gcovr 5.0"><sources><source>.</source></sources><packages><package name="" line-rate="0.875" function-rate="1.0" branch-rate="0.5" complexity="0.0"><classes><class name="main_cpp" filename="main.cpp" line-rate="0.875" branch-rate="0.5" complexity="0.0"><methods/><lines><line number="4" hits="1" branch="false"/><line number="5" hits="1" branch="true" condition-coverage="50% (1/2)"><conditions><condition number="0" type="jump" coverage="50%"/></conditions></line><line number="6" hits="0" branch="false"/><line number="8" hits="1" branch="false"/><line number="10" hits="1" branch="false"/><line number="13" hits="1" branch="false"/><line number="14" hits="1" branch="false"/><line number="16" hits="1" branch="false"/></lines></class></classes></package></packages></coverage>
3+
<coverage line-rate="0.875" function-rate="1.0" branch-rate="0.5" lines-covered="7" lines-valid="8" functions-covered="2" functions-valid="2" branches-covered="1" branches-valid="2" complexity="0.0" timestamp="1649531561" version="gcovr 5.1">
4+
<sources>
5+
<source>.</source>
6+
</sources>
7+
<packages>
8+
<package name="" line-rate="0.875" function-rate="1.0" branch-rate="0.5" complexity="0.0">
9+
<classes>
10+
<class name="main_cpp" filename="main.cpp" line-rate="0.875" branch-rate="0.5" complexity="0.0">
11+
<methods/>
12+
<lines>
13+
<line number="4" hits="1" branch="false"/>
14+
<line number="5" hits="1" branch="true" condition-coverage="50% (1/2)">
15+
<conditions>
16+
<condition number="0" type="jump" coverage="50%"/>
17+
</conditions>
18+
</line>
19+
<line number="6" hits="0" branch="false"/>
20+
<line number="8" hits="1" branch="false"/>
21+
<line number="10" hits="1" branch="false"/>
22+
<line number="13" hits="1" branch="false"/>
23+
<line number="14" hits="1" branch="false"/>
24+
<line number="16" hits="1" branch="false"/>
25+
</lines>
26+
</class>
27+
</classes>
28+
</package>
29+
</packages>
30+
</coverage>

Diff for: ‎gcovr/tests/bad++char/reference/clang-10/coveralls.json

+32-1
Original file line numberDiff line numberDiff line change
@@ -1 +1,32 @@
1-
{"run_at": "2021-11-09 20:20:14 UTC", "service_job_id": "id", "service_name": "gcovr-test-suite", "service_number": "number", "service_pull_request": "pr", "source_files": [{"coverage": [null, null, null, 1, 1, 0, null, 1, null, 1, null, null, 1, 1, null, 1, null], "name": "main.cpp", "source_digest": "695c05ab307ae9bfa7069b920dca93ad"}]}
1+
{
2+
"run_at": "2022-04-08 21:30:44 UTC",
3+
"service_job_id": "id",
4+
"service_name": "gcovr-test-suite",
5+
"service_number": "number",
6+
"service_pull_request": "pr",
7+
"source_files": [
8+
{
9+
"coverage": [
10+
null,
11+
null,
12+
null,
13+
1,
14+
1,
15+
0,
16+
null,
17+
1,
18+
null,
19+
1,
20+
null,
21+
null,
22+
1,
23+
1,
24+
null,
25+
1,
26+
null
27+
],
28+
"name": "main.cpp",
29+
"source_digest": "695c05ab307ae9bfa7069b920dca93ad"
30+
}
31+
]
32+
}

Diff for: ‎gcovr/tests/bad++char/reference/gcc-5/coverage.xml

+32-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,34 @@
11
<?xml version='1.0' encoding='UTF-8'?>
22
<!DOCTYPE coverage SYSTEM 'http://cobertura.sourceforge.net/xml/coverage-04.dtd'>
3-
<coverage line-rate="0.875" function-rate="1.0" branch-rate="0.5" lines-covered="7" lines-valid="8" functions-covered="2" functions-valid="2" branches-covered="3" branches-valid="6" complexity="0.0" timestamp="1645647237" version="gcovr 5.0"><sources><source>.</source></sources><packages><package name="" line-rate="0.875" function-rate="1.0" branch-rate="0.5" complexity="0.0"><classes><class name="main_cpp" filename="main.cpp" line-rate="0.875" branch-rate="0.5" complexity="0.0"><methods/><lines><line number="4" hits="1" branch="false"/><line number="5" hits="1" branch="true" condition-coverage="50% (1/2)"><conditions><condition number="0" type="jump" coverage="50%"/></conditions></line><line number="6" hits="0" branch="false"/><line number="8" hits="1" branch="false"/><line number="13" hits="1" branch="false"/><line number="14" hits="1" branch="false"/><line number="16" hits="1" branch="false"/><line number="17" hits="3" branch="true" condition-coverage="50% (2/4)"><conditions><condition number="0" type="jump" coverage="50%"/></conditions></line></lines></class></classes></package></packages></coverage>
3+
<coverage line-rate="0.875" function-rate="1.0" branch-rate="0.5" lines-covered="7" lines-valid="8" functions-covered="2" functions-valid="2" branches-covered="3" branches-valid="6" complexity="0.0" timestamp="1649529310" version="gcovr 5.1">
4+
<sources>
5+
<source>.</source>
6+
</sources>
7+
<packages>
8+
<package name="" line-rate="0.875" function-rate="1.0" branch-rate="0.5" complexity="0.0">
9+
<classes>
10+
<class name="main_cpp" filename="main.cpp" line-rate="0.875" branch-rate="0.5" complexity="0.0">
11+
<methods/>
12+
<lines>
13+
<line number="4" hits="1" branch="false"/>
14+
<line number="5" hits="1" branch="true" condition-coverage="50% (1/2)">
15+
<conditions>
16+
<condition number="0" type="jump" coverage="50%"/>
17+
</conditions>
18+
</line>
19+
<line number="6" hits="0" branch="false"/>
20+
<line number="8" hits="1" branch="false"/>
21+
<line number="13" hits="1" branch="false"/>
22+
<line number="14" hits="1" branch="false"/>
23+
<line number="16" hits="1" branch="false"/>
24+
<line number="17" hits="3" branch="true" condition-coverage="50% (2/4)">
25+
<conditions>
26+
<condition number="0" type="jump" coverage="50%"/>
27+
</conditions>
28+
</line>
29+
</lines>
30+
</class>
31+
</classes>
32+
</package>
33+
</packages>
34+
</coverage>

Diff for: ‎gcovr/tests/bad++char/reference/gcc-5/coveralls.json

+32-1
Original file line numberDiff line numberDiff line change
@@ -1 +1,32 @@
1-
{"run_at": "2022-02-23 20:13:58 UTC", "service_job_id": "id", "service_name": "gcovr-test-suite", "service_number": "number", "service_pull_request": "pr", "source_files": [{"coverage": [null, null, null, 1, 1, 0, null, 1, null, null, null, null, 1, 1, null, 1, 3], "name": "main.cpp", "source_digest": "695c05ab307ae9bfa7069b920dca93ad"}]}
1+
{
2+
"run_at": "2022-04-08 20:57:59 UTC",
3+
"service_job_id": "id",
4+
"service_name": "gcovr-test-suite",
5+
"service_number": "number",
6+
"service_pull_request": "pr",
7+
"source_files": [
8+
{
9+
"coverage": [
10+
null,
11+
null,
12+
null,
13+
1,
14+
1,
15+
0,
16+
null,
17+
1,
18+
null,
19+
null,
20+
null,
21+
null,
22+
1,
23+
1,
24+
null,
25+
1,
26+
3
27+
],
28+
"name": "main.cpp",
29+
"source_digest": "695c05ab307ae9bfa7069b920dca93ad"
30+
}
31+
]
32+
}

0 commit comments

Comments
 (0)