Skip to content

Commit

Permalink
Merge pull request cyclus#1759 from bennibbelink/gtest-coverage
Browse files Browse the repository at this point in the history
Remove GTest source from code coverage
  • Loading branch information
gonuke authored Jun 13, 2024
2 parents 2aeca7c + 8265d8b commit 57729fb
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,10 @@ Since last release
* Removed the ResourceBuff class and replaced its instances with ResBuf (#1755)

**Fixed:**

* Removed unnecessary records being added to the Resource database by packaging process (#1761)
* Removed GTest source code from code coverage reports (#1759)


v1.6.0
====================
Expand Down
4 changes: 2 additions & 2 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -105,12 +105,12 @@ WORKDIR /cyclus
RUN python3 install.py -j ${make_cores} --allow-milps --code-coverage

ENV PATH /root/.local/bin:$PATH
ENV LD_LIBRARY_PATH /root/.local/lib:/root/.local/lib/cyclus
RUN lcov -c -d /cyclus -o initial_coverage.info --gcov-tool ${GCOV} --initial --no-external && \
cyclus_unit_tests && \
cd tests && python3 -m pytest && cd .. && \
lcov -c -d /cyclus -o test_coverage.info --gcov-tool ${GCOV} --no-external && \
lcov --add-tracefile initial_coverage.info --add-tracefile test_coverage.info -o total_coverage.info && \
lcov --add-tracefile initial_coverage.info --add-tracefile test_coverage.info -o temp_coverage.info && \
lcov --remove temp_coverage.info -o total_coverage.info '/cyclus/build/_deps/**' && \
mkdir -p html && genhtml total_coverage.info --output-directory html

FROM scratch as coverage-report
Expand Down

0 comments on commit 57729fb

Please sign in to comment.