Skip to content
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.

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

Remove too greedy gcov/lcov ignores from .gitignore #81120

Merged
merged 1 commit into from
Aug 29, 2023

Conversation

akien-mga
Copy link
Member

@akien-mga akien-mga commented Aug 29, 2023

This would cause updown.png to be ignored in our default theme in 3.x.

These ignores were added in #36800 for #36572 (see that PR for usage
instructions).

From a quick test, using --output-file for lcov and --output-directory
for genhtml let us output the files in a way that won't conflict with the
Git repository (e.g. in bin/, or outside the Git repo).

Needed for the 3.x and 3.5 branch to cherry-pick #78908.


Tested locally with:

scons -j7 p=linuxbsd dev_build=yes dev_mode=yes linker=mold scu_build=all use_coverage=yes
lcov --directory ./ --capture --output-file bin/godot.info
genhtml bin/godot.info --ignore-errors source --output-directory bin/

Output:

$ ls bin/*
bin/amber.png    bin/gcov.css   bin/godot.info                         bin/index.html         bin/index-sort-l.html  bin/snow.png
bin/emerald.png  bin/glass.png  bin/godot.linuxbsd.editor.dev.x86_64*  bin/index-sort-f.html  bin/ruby.png           bin/updown.png

bin/godot.git:
core/                                                   hb-buffer-deserialize-text-unicode.hh.gcov.html         hb-ot-shaper-khmer-machine.hh.func-sort-c.html    index.html
drivers/                                                hb-buffer-deserialize-text-unicode.rl.func.html         hb-ot-shaper-khmer-machine.hh.gcov.html           index-sort-f.html
editor/                                                 hb-buffer-deserialize-text-unicode.rl.func-sort-c.html  hb-ot-shaper-khmer-machine.rl.func.html           index-sort-l.html
hb-buffer-deserialize-json.hh.func.html                 hb-buffer-deserialize-text-unicode.rl.gcov.html         hb-ot-shaper-khmer-machine.rl.func-sort-c.html    MachineIndependent/
hb-buffer-deserialize-json.hh.func-sort-c.html          hb-number-parser.hh.func.html                           hb-ot-shaper-khmer-machine.rl.gcov.html           main/
hb-buffer-deserialize-json.hh.gcov.html                 hb-number-parser.hh.func-sort-c.html                    hb-ot-shaper-myanmar-machine.hh.func.html         modules/
hb-buffer-deserialize-json.rl.func.html                 hb-number-parser.hh.gcov.html                           hb-ot-shaper-myanmar-machine.hh.func-sort-c.html  NONE.func.html
hb-buffer-deserialize-json.rl.func-sort-c.html          hb-number-parser.rl.func.html                           hb-ot-shaper-myanmar-machine.hh.gcov.html         NONE.func-sort-c.html
hb-buffer-deserialize-json.rl.gcov.html                 hb-number-parser.rl.func-sort-c.html                    hb-ot-shaper-myanmar-machine.rl.func.html         NONE.gcov.html
hb-buffer-deserialize-text-glyphs.hh.func.html          hb-number-parser.rl.gcov.html                           hb-ot-shaper-myanmar-machine.rl.func-sort-c.html  platform/
hb-buffer-deserialize-text-glyphs.hh.func-sort-c.html   hb-ot-shaper-indic-machine.hh.func.html                 hb-ot-shaper-myanmar-machine.rl.gcov.html         scene/
hb-buffer-deserialize-text-glyphs.hh.gcov.html          hb-ot-shaper-indic-machine.hh.func-sort-c.html          hb-ot-shaper-use-machine.hh.func.html             servers/
hb-buffer-deserialize-text-glyphs.rl.func.html          hb-ot-shaper-indic-machine.hh.gcov.html                 hb-ot-shaper-use-machine.hh.func-sort-c.html      tests/
hb-buffer-deserialize-text-glyphs.rl.func-sort-c.html   hb-ot-shaper-indic-machine.rl.func.html                 hb-ot-shaper-use-machine.hh.gcov.html             thirdparty/
hb-buffer-deserialize-text-glyphs.rl.gcov.html          hb-ot-shaper-indic-machine.rl.func-sort-c.html          hb-ot-shaper-use-machine.rl.func.html
hb-buffer-deserialize-text-unicode.hh.func.html         hb-ot-shaper-indic-machine.rl.gcov.html                 hb-ot-shaper-use-machine.rl.func-sort-c.html
hb-buffer-deserialize-text-unicode.hh.func-sort-c.html  hb-ot-shaper-khmer-machine.hh.func.html                 hb-ot-shaper-use-machine.rl.gcov.html

bin/usr:
include/  lib/

All this is in bin/ which is .gitignored, no untracked file in git status.

@akien-mga akien-mga added enhancement topic:buildsystem cherrypick:3.x Considered for cherry-picking into a future 3.x release cherrypick:3.5 Considered for cherry-picking into a future 3.5.x release cherrypick:4.0 cherrypick:4.1 Considered for cherry-picking into a future 4.1.x release labels Aug 29, 2023
@akien-mga akien-mga added this to the 4.2 milestone Aug 29, 2023
@akien-mga akien-mga requested a review from a team as a code owner August 29, 2023 11:19
This would cause `updown.png` to be ignored in our default theme in 3.x.

These ignores were added in godotengine#36800 for godotengine#36572 (see that PR for usage
instructions).

From a quick test, using `--output-file` for `lcov` and `--output-directory`
for genhtml let us output the files in a way that won't conflict with the
Git repository (e.g. in `bin/`, or outside the Git repo).
@akien-mga akien-mga force-pushed the gitignore-cleanup-gcov-lcov branch from 8d090ae to 5c38e42 Compare August 29, 2023 11:40
@akien-mga akien-mga merged commit 4878ff2 into godotengine:master Aug 29, 2023
@akien-mga akien-mga deleted the gitignore-cleanup-gcov-lcov branch August 29, 2023 13:25
@akien-mga
Copy link
Member Author

Cherry-picked for 3.6.

@akien-mga akien-mga removed the cherrypick:3.x Considered for cherry-picking into a future 3.x release label Aug 29, 2023
@akien-mga
Copy link
Member Author

Cherry-picked for 3.5.3.

@akien-mga akien-mga removed the cherrypick:3.5 Considered for cherry-picking into a future 3.5.x release label Sep 6, 2023
@YuriSizov YuriSizov removed the cherrypick:4.1 Considered for cherry-picking into a future 4.1.x release label Jan 23, 2024
@YuriSizov
Copy link
Contributor

Cherry-picked for 4.1.4.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants