[pitch] fix memory leak in specacf

[aubio.git] / Makefile

diff --git a/Makefile b/Makefile
index 4f68487..0f81a41 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -10,7 +10,6 @@
 # $ make test_python
 
 WAFCMD=python waf
-WAFURL=https://waf.io/waf-1.8.22
 
 #WAFOPTS:=
 # turn on verbose mode
@@ -36,10 +35,15 @@ INCLUDEDIR?=$(PREFIX)/include
 DATAROOTDIR?=$(PREFIX)/share
 MANDIR?=$(DATAROOTDIR)/man
 
+# default nose2 command
+NOSE2?=nose2 -N 4 --verbose
+
 SOX=sox
 
 TESTSOUNDS := python/tests/sounds
 
+LCOVOPTS += --rc lcov_branch_coverage=1
+
 all: build
 
 checkwaf:
@@ -53,7 +57,7 @@ expandwaf: getwaf
        $(WAFCMD) --help > /dev/null
        mv .waf*/waflib . && rm -fr .waf*
        sed '/^#==>$$/,$$d' waf > waf2 && mv waf2 waf
-       chmod +x waf
+       chmod +x waf && chmod -R go-w waflib
 
 cleanwaf:
        rm -rf waf waflib .waf*
@@ -113,7 +117,8 @@ install_python_with_pip:
 
 uninstall_python_with_pip:
        # uninstall package
-       pip uninstall -y -v aubio || make uninstall_python_with_distutils
+       ( pip show aubio | grep -l aubio > /dev/null ) && \
+       pip uninstall -y -v aubio || echo "info: aubio package is not installed"
 
 install_python_with_distutils:
        ./setup.py install $(PIPOPTS) $(DISTUTILSOPTS)
@@ -135,9 +140,9 @@ test_python: export LD_LIBRARY_PATH=$(DESTDIR)/$(LIBDIR)
 test_python: export PYTHONPATH=$(PYDESTDIR)/$(LIBDIR)
 test_python: local_dylib
        # run test with installed package
-       ./python/tests/run_all_tests --verbose
-       # also run with nose, multiple processes
-       nose2 -N 4
+       # ./python/tests/run_all_tests --verbose
+       # run with nose2, multiple processes
+       $(NOSE2)
 
 clean_python:
        ./setup.py clean
@@ -161,6 +166,8 @@ check_clean:
 
 distclean:
        $(WAFCMD) distclean
+       -rm -rf doc/_build/
+       -rm -rf doc/web/
 
 check_distclean:
        make distclean
@@ -229,6 +236,46 @@ test_python_only_clean: test_python_only \
        uninstall_python \
        check_clean_python
 
+coverage_cycle: coverage_zero_counters coverage_report
+
+coverage_zero_counters:
+       lcov --zerocounters --directory .
+
+coverage: export CFLAGS=--coverage
+coverage: export LDFLAGS=--coverage
+coverage: export PYTHONPATH=$(PWD)/python/lib
+coverage: export LD_LIBRARY_PATH=$(PWD)/build/src
+coverage: force_uninstall_python deps_python \
+       clean_python clean distclean build local_dylib
+       # 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 nose2`
+       # 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 '*/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
+       # generate report with lcov's genhtml
+       genhtml build/coverage_lib.info --output-directory build/coverage_c \
+               --branch-coverage --highlight --legend
+       # generate python report with coverage python package
+       coverage report
+       coverage html -d build/coverage_python
+       # show links to generated reports
+       for i in $$(ls build/coverage_*/index.html); do echo file://$(PWD)/$$i; done
+
 sphinx: configure
        $(WAFCMD) sphinx $(WAFOPTS)