Steve Lhomme pushed to branch master at VideoLAN / VLC
Commits: d844cada by Ahmed Sobhy at 2026-06-11T08:36:43+00:00 ci: update gcovr command to use separate merge mode for functions The MR !8610 added the egl.c module for wayland. Before, egl.c was compiled for X11 only. Each platform defines its own per-platform static Resize(), so the function lands at a different line number depending on the platform. When gcovr merges coverage data, it sees the same function defined on two different lines and errors out. Passing --merge-mode-functions=separate tells gcovr to keep such functions as separate entries instead of merging them, so coverage from all platforms is combined successfully. Refer to https://gcovr.com/en/8.3/guide/merging.html - - - - - 1 changed file: - extras/ci/gitlab-ci.yml Changes: ===================================== extras/ci/gitlab-ci.yml ===================================== @@ -385,11 +385,12 @@ debian-meson: # Note: qt generated files need to be remove from the report since their # coverage should not be checked. It leads to gcovr having trouble # parsing the coverage otherwise. - gcovr -r "${CI_PROJECT_DIR}/" --json "${CI_PROJECT_DIR}/${CI_JOB_NAME}.cov.json" -j$NCPU --gcov-ignore-parse-errors=negative_hits.warn_once_per_file --exclude "build-meson/modules/gui/qt/.*_qrc.cpp" --exclude "build-meson/modules/gui/qt/.*_assets.cpp" + gcovr -r "${CI_PROJECT_DIR}/" --json "${CI_PROJECT_DIR}/${CI_JOB_NAME}.cov.json" -j$NCPU --merge-mode-functions=separate --gcov-ignore-parse-errors=negative_hits.warn_once_per_file --exclude "build-meson/modules/gui/qt/.*_qrc.cpp" --exclude "build-meson/modules/gui/qt/.*_assets.cpp" - mkdir html-coverage - > gcovr --add-tracefile "${CI_PROJECT_DIR}/${CI_JOB_NAME}.cov.json" + --merge-mode-functions=separate --xml="cobertura.xml" --html="html-coverage/vlc.html" --html-details -s -j$NCPU View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/d844cada6167d2c730abbfe3c6e578d5f47fe147 -- View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/d844cada6167d2c730abbfe3c6e578d5f47fe147 You're receiving this email because of your account on code.videolan.org. Manage all notifications: https://code.videolan.org/-/profile/notifications | Help: https://code.videolan.org/help
_______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
