Changes in Makefile [adde1ba:9a1df7f]

File:

• Makefile (modified) (4 diffs)

Makefile

@@ -36 +36 @@
 MANDIR?=$(DATAROOTDIR)/man
 
-# default nose2 command
-NOSE2?=nose2 -N 4 --verbose
+# default python test command
+PYTEST?=pytest --verbose
 
 SOX=sox
@@ -139 +139 @@
 test_python: local_dylib
         # run test with installed package
-        # ./python/tests/run_all_tests --verbose
-        # run with nose2, multiple processes
-        $(NOSE2)
+        $(PYTEST)
 
 clean_python:
@@ -235 +233 @@
         check_clean_python
 
-coverage_cycle: coverage_zero_counters coverage_report
-
-coverage_zero_counters:
-        lcov --zerocounters --directory .
-
 coverage: export CFLAGS=--coverage
 coverage: export LDFLAGS=--coverage
@@ -248 +241 @@
         lcov --capture --no-external --directory . --output-file build/coverage_lib.info
         pip install -v -e .
-        coverage run `which nose2`
+        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
 
-# 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