Merge branch 'master' into feature/pytest

[aubio.git] / Makefile

diff --git a/Makefile b/Makefile
index c23d57e..a21c0d6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -35,8 +35,8 @@ INCLUDEDIR?=$(PREFIX)/include
 DATAROOTDIR?=$(PREFIX)/share
 MANDIR?=$(DATAROOTDIR)/man
 
-# default nose2 command
-NOSE2?=nose2 -N 4 --verbose
+# default python test command
+PYTEST?=pytest --verbose
 
 SOX=sox
 
@@ -140,9 +140,7 @@ 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
-       # run with nose2, multiple processes
-       $(NOSE2)
+       $(PYTEST)
 
 clean_python:
        ./setup.py clean
@@ -253,7 +251,7 @@ coverage: force_uninstall_python deps_python \
        # build and test python
        pip install -v -e .
        # run tests, with python coverage
-       coverage run `which nose2`
+       coverage run `which pytest`
        # capture coverage again
        lcov $(LCOVOPTS) --capture --no-external --directory . \
                --output-file build/coverage_python.info
@@ -261,7 +259,7 @@ coverage: force_uninstall_python deps_python \
        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*' \
+       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