Skip to content

Commit 887dc4e

Browse files
committed
Try ignoring errors
Signed-off-by: Darby Johnston <[email protected]>
1 parent caa7fbe commit 887dc4e

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

.github/workflows/python-package.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ jobs:
6565
if: matrix.os == env.GH_COV_OS && github.actor != env.GH_DEPENDABOT
6666
run: |
6767
cd ${{ env.OTIO_BUILD_DIR }}
68-
lcov --rc lcov_branch_coverage=1 --rc no_exception_branch=1 --capture -b . --directory . --output-file=coverage.info -q
68+
lcov --rc lcov_branch_coverage=1 --rc no_exception_branch=1 --ignore-errors mismatch --capture -b . --directory . --output-file=coverage.info -q
6969
cat coverage.info | sed "s/SF:.*src/SF:src/g" > coverage.filtered.info
7070
lcov --remove coverage.filtered.info '*/tests/*' --output-file=coverage.filtered.info -q
7171
lcov --list coverage.filtered.info

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ if(OTIO_CXX_COVERAGE AND NOT MSVC)
153153
# Note that we exclude some OTIO files from code coverage since they are
154154
# causing errors like this:
155155
# geninfo: ERROR: mismatched end line for PyInit__opentime at opentime_bindings.cpp:
156-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --coverage -fprofile-update=atomic -fprofile-exclude-files='/usr/*;src/deps/*;src/py-opentimelineio/opentime-bindings/opentime_bindings.cpp;src/py-opentimelineio/opentimelineio-bindings/otio_bindings.cpp'")
156+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --coverage -fprofile-update=atomic -fprofile-exclude-files='/usr/*;src/deps/*'")
157157
# this causes cmake to produce file.gcno instead of file.cpp.gcno
158158
set(CMAKE_CXX_OUTPUT_EXTENSION_REPLACE 1)
159159
message(STATUS "Building C++ with Coverage: ON")

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ ifndef OTIO_CXX_BUILD_TMP_DIR
9292
C++ coverage will not work, because intermediate build products will \
9393
not be found.)
9494
endif
95-
lcov --rc lcov_branch_coverage=1 --rc no_exception_branch=1 --capture -b . --directory ${OTIO_CXX_BUILD_TMP_DIR} \
95+
lcov --rc lcov_branch_coverage=1 --rc no_exception_branch=1 --ignore-errors mismatch --capture -b . --directory ${OTIO_CXX_BUILD_TMP_DIR} \
9696
--output-file=${OTIO_CXX_BUILD_TMP_DIR}/coverage.info -q
9797
cat ${OTIO_CXX_BUILD_TMP_DIR}/coverage.info | sed "s/SF:.*src/SF:src/g" \
9898
> ${OTIO_CXX_BUILD_TMP_DIR}/coverage.filtered.info

0 commit comments

Comments
 (0)