Changeset e893e6fe for Makefile

Timestamp:

Nov 22, 2018, 6:41:41 PM (6 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

feature/autosink, feature/cnn, feature/cnn_org, feature/constantq, feature/crepe, feature/crepe_org, feature/pitchshift, feature/timestretch, fix/ffmpeg5, master

Children:

263dd04

Parents:

bf3f09b (diff), c4a8bc1 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into feature/pytest

File:

• Makefile (modified) (2 diffs)

Makefile

@@ -43 +43 @@
 TESTSOUNDS := python/tests/sounds
 
+LCOVOPTS += --rc lcov_branch_coverage=1
+
 all: build
 
@@ -244 +246 @@
 coverage: force_uninstall_python deps_python \
         clean_python clean distclean build local_dylib
-        lcov --capture --no-external --directory . --output-file build/coverage_lib.info
+        # capture coverage after running c tests
+        lcov $(LCOVOPTS) --capture --no-external --directory . \
+                --output-file build/coverage_lib.info
+        # build and test python
         pip install -v -e .
+        # run tests, with python coverage
         coverage run `which pytest`
-        lcov --capture --no-external --directory . --output-file build/coverage_python.info
-        lcov -a build/coverage_python.info -a build/coverage_lib.info -o build/coverage.info
+        # capture coverage again
+        lcov $(LCOVOPTS) --capture --no-external --directory . \
+                --output-file build/coverage_python.info
+        # merge both coverage info files
+        lcov $(LCOVOPTS) -a build/coverage_python.info -a build/coverage_lib.info \
+                --output-file build/coverage.info
+        # remove tests
+        lcov $(LCOVOPTS) --remove build/coverage.info '*/tests/*' '*/ooura_fft8g*' \
+                --output-file build/coverage_lib.info
 
 # make sure we don't build the doc, which builds a temporary python module
 coverage_report: export WAFOPTS += --disable-docs
 coverage_report: coverage
-        genhtml build/coverage.info --output-directory lcov_html
-        mkdir -p gcovr_html/
-        gcovr -r . --html --html-details \
-                --output gcovr_html/index.html \
-                --exclude ".*tests/.*" --exclude ".*examples/.*"
+        # create coverage report dir
+        mkdir -p build/coverage/
+        # generate report with lcov's genhtml
+        genhtml build/coverage_lib.info --output-directory build/coverage/lcov \
+                --branch-coverage --highlight --legend
+        # generate python report with coverage python package
         coverage report
-        coverage html
+        coverage html -d build/coverage/coverage
+        # show links to generated reports
+        for i in $$(ls build/coverage/*/index.html); do echo file://$(PWD)/$$i; done
 
 sphinx: configure