fix coverage report for cmake / ninja combination #453

theKBro · 2021-01-14T16:38:04Z

path to sourcefile is given relative from object dictionary

codecov · 2021-01-14T17:11:23Z

Codecov Report

Merging #453 (c590416) into master (a51a7fe) will increase coverage by 0.41%.
The diff coverage is 75.00%.

@@            Coverage Diff             @@
##           master     #453      +/-   ##
==========================================
+ Coverage   95.08%   95.50%   +0.41%     
==========================================
  Files          20       20              
  Lines        2420     2445      +25     
  Branches      418      420       +2     
==========================================
+ Hits         2301     2335      +34     
+ Misses         54       48       -6     
+ Partials       65       62       -3

Flag	Coverage Δ
ubuntu-18.04	`95.00% <75.00%> (?)`
windows-2019	`95.09% <75.00%> (?)`

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files	Coverage Δ
gcovr/gcov.py	`87.79% <75.00%> (+0.43%)`	⬆️
gcovr/tests/test_config.py	`100.00% <0.00%> (ø)`
gcovr/tests/test_gcov_parser.py	`100.00% <0.00%> (ø)`
gcovr/tests/test_html_generator.py	`100.00% <0.00%> (ø)`
gcovr/configuration.py	`99.28% <0.00%> (+<0.01%)`	⬆️
gcovr/workers.py	`98.82% <0.00%> (+0.01%)`	⬆️
gcovr/coverage.py	`99.13% <0.00%> (+0.02%)`	⬆️
gcovr/html_generator.py	`96.98% <0.00%> (+0.08%)`	⬆️
gcovr/tests/test_gcovr.py	`92.94% <0.00%> (+0.69%)`	⬆️
... and 1 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update a51a7fe...c590416. Read the comment docs.

theKBro · 2021-01-14T17:17:42Z

+1 for someone who knows the repo and is willing to write tests for this :-)

Spacetown · 2021-01-14T18:51:27Z

We have a test with CMake. I don't understand your problem?

theKBro · 2021-01-15T08:51:01Z

I've added an addtional test, but unfortunately my development environment is also windows and thats why I cannot run the tests, the reference dir is copied from the other cmake test but maybe with the tests you understand why the changes are necessary

theKBro · 2021-01-15T08:54:35Z

Or could you support me on running the test with mingw for windows -> I got a problem on the tests make clean with the rm call

theKBro · 2021-01-18T10:31:12Z

@Spacetown now I really don't know how to proceed here anymore, could you please help out?

Spacetown · 2021-01-18T18:51:15Z

@theKBro I'll try to find a slot to look at this. Please be patient.

Spacetown · 2021-01-19T20:32:07Z

@theKBro I've done several changes:

Replace the addition of a key to options with the use of the original key in process_gcov_data.
Install ninja in Docker container.
Run ninja with option verbose to get info about command line and working directory.
Add option --object-directory=... to gcovr call.

Spacetown · 2021-01-19T20:41:23Z

@theKBro Please can you rebase the branch?

fix format check if object directory is passed - added test for cmake and ninja - cleaned up obj_dir usage fix options.obj_dir initialization reenable target clean install ninja Install ninja in Docker container. Call ninja directly to be able to set verbose mode.

gcovr/tests/cmake_oos_ninja/Makefile

Spacetown

Please add yourself to the list of contributors and the issue to the changelog.
Why did you remove me as co author? 😢

gcovr/gcov.py

gcovr/tests/cmake_oos_ninja/Makefile

Co-authored-by: Michael Förderer <40258682+Spacetown@users.noreply.github.com>

gcovr/tests/cmake_oos_ninja/Makefile

-fix path to toolchain file - remove not necessary mkdir

theKBro · 2021-01-20T21:24:55Z

Please add yourself to the list of contributors and the issue to the changelog.
Why did you remove me as co author? 😢

sry im not used to git, as i'm working with svn...
how to readd you?

Co-authored-by: Michael Förderer <40258682+Spacetown@users.noreply.github.com>

Spacetown · 2021-01-20T21:27:31Z

Please add yourself to the list of contributors and the issue to the changelog.
Why did you remove me as co author? 😢

sry im not used to git, as i'm working with svn...
how to readd you?

You did it already by accepting my suggestion. This is done by adding the following line to the commit message:

Co-authored-by: Michael Förderer <40258682+Spacetown@users.noreply.github.com>

return original path if none of the source file guesses exists Co-authored-by: Michael Förderer <40258682+Spacetown@users.noreply.github.com>

gcovr/gcov.py

This reverts commit 41d0468.

Spacetown marked this pull request as draft January 19, 2021 18:33

Spacetown force-pushed the master branch from fd71a42 to f0a32ed Compare January 19, 2021 20:15

Spacetown marked this pull request as ready for review January 19, 2021 20:22

Spacetown force-pushed the master branch 2 times, most recently from bf8a420 to 9f53bfb Compare January 19, 2021 20:31

theKBro force-pushed the master branch from 9f53bfb to 9d1d789 Compare January 20, 2021 08:05

theKBro commented Jan 20, 2021

View reviewed changes

gcovr/tests/cmake_oos_ninja/Makefile Outdated Show resolved Hide resolved

Spacetown requested changes Jan 20, 2021

View reviewed changes

gcovr/gcov.py Show resolved Hide resolved

gcovr/tests/cmake_oos_ninja/Makefile Outdated Show resolved Hide resolved

Update gcovr/tests/cmake_oos_ninja/Makefile

a361713

Co-authored-by: Michael Förderer <40258682+Spacetown@users.noreply.github.com>

Spacetown reviewed Jan 20, 2021

View reviewed changes

gcovr/tests/cmake_oos_ninja/Makefile Outdated Show resolved Hide resolved

fix makefile

c6ab97e

-fix path to toolchain file - remove not necessary mkdir

Update gcovr/tests/cmake_oos_ninja/Makefile

4d1c92b

Co-authored-by: Michael Förderer <40258682+Spacetown@users.noreply.github.com>

theKBro and others added 2 commits January 20, 2021 22:43

add documentation of the changes

44bf5e8

Update gcovr/gcov.py

41d0468

return original path if none of the source file guesses exists Co-authored-by: Michael Förderer <40258682+Spacetown@users.noreply.github.com>

theKBro commented Jan 21, 2021

View reviewed changes

gcovr/gcov.py Outdated Show resolved Hide resolved

Revert "Update gcovr/gcov.py "

c590416

This reverts commit 41d0468.

Spacetown approved these changes Jan 22, 2021

View reviewed changes

Spacetown merged commit bbd97a6 into gcovr:master Jan 22, 2021

Spacetown added this to the 4.3 milestone Feb 2, 2021

fix coverage report for cmake / ninja combination #453

fix coverage report for cmake / ninja combination #453

theKBro commented Jan 14, 2021

codecov bot commented Jan 14, 2021 •

edited

theKBro commented Jan 14, 2021

Spacetown commented Jan 14, 2021

theKBro commented Jan 15, 2021

theKBro commented Jan 15, 2021 •

edited

theKBro commented Jan 18, 2021

Spacetown commented Jan 18, 2021

Spacetown commented Jan 19, 2021 •

edited

Spacetown commented Jan 19, 2021

Spacetown left a comment

theKBro commented Jan 20, 2021

Spacetown commented Jan 20, 2021

fix coverage report for cmake / ninja combination #453

fix coverage report for cmake / ninja combination #453

Conversation

theKBro commented Jan 14, 2021

codecov bot commented Jan 14, 2021 • edited

Codecov Report

theKBro commented Jan 14, 2021

Spacetown commented Jan 14, 2021

theKBro commented Jan 15, 2021

theKBro commented Jan 15, 2021 • edited

theKBro commented Jan 18, 2021

Spacetown commented Jan 18, 2021

Spacetown commented Jan 19, 2021 • edited

Spacetown commented Jan 19, 2021

Spacetown left a comment

Choose a reason for hiding this comment

theKBro commented Jan 20, 2021

Spacetown commented Jan 20, 2021

codecov bot commented Jan 14, 2021 •

edited

theKBro commented Jan 15, 2021 •

edited

Spacetown commented Jan 19, 2021 •

edited