[igt-dev] ✗ Fi.CI.BUILD: failure for code coverage: some improvements (rev3)

Patchwork patchwork at emeril.freedesktop.org
Thu Apr 14 07:28:26 UTC 2022


== Series Details ==

Series: code coverage: some improvements (rev3)
URL   : https://patchwork.freedesktop.org/series/102136/
State : failure

== Summary ==

Applying: scripts/code_cov*: remove the extensions from them
Applying: scripts/code_cov_parse_info: add a tool to parse code coverage info files
Applying: scripts/code_cov_gen_report: add support for filtering info files
Applying: runner: execute code coverage script also from PATH
Applying: scripts/meson.build: install code coverage scripts
Applying: scripts/code_cov_selftest.sh: test if IGT code coverage is working
Applying: docs/code_coverage.md: document the code coverage filter script
Applying: scripts/code_cov_parse_info: better handle test name
Applying: code_cov_parse_info: fix error handling when opening files
Applying: code_cov_parse_info: fix --show-lines logic
Applying: code_cov_parse_info: add support for exclude filters
Using index info to reconstruct a base tree...
M	scripts/code_cov_parse_info
Falling back to patching base and 3-way merge...
Auto-merging scripts/code_cov_parse_info
CONFLICT (content): Merge conflict in scripts/code_cov_parse_info
Patch failed at 0011 code_cov_parse_info: add support for exclude filters
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".




More information about the igt-dev mailing list