[igt-dev] ✗ Fi.CI.BUILD: failure for Add support to collecr code coverage data (rev2)
Patchwork
patchwork at emeril.freedesktop.org
Thu Feb 24 05:06:28 UTC 2022
== Series Details ==
Series: Add support to collecr code coverage data (rev2)
URL : https://patchwork.freedesktop.org/series/100629/
State : failure
== Summary ==
Applying: runner: check if it has root permissions
Applying: runner: Add support for code coverage
Applying: scripts/code_cov_gather*/sh: add help scripts for code coverage
Applying: scripts/code_cov_gather_on_build.sh: Improve the script
Applying: scripts/code_cov_capture.sh: add a script to use lcov on build+test machine
Applying: scripts/code_cov_gen_report.sh: add a script to generate code coverage reports
Applying: scripts/run-tests.sh: add code coverage support
Applying: scripts:code_cov_gather_on_test: use a faster script
Applying: docs: add documentation for code coverage
Using index info to reconstruct a base tree...
A docs/code_coverage.md
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): docs/code_coverage.md deleted in HEAD and modified in docs: add documentation for code coverage. Version docs: add documentation for code coverage of docs/code_coverage.md left in tree.
Patch failed at 0009 docs: add documentation for code coverage
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