Changes in Makefile [9a1df7f:adde1ba]

File:

• Makefile (modified) (4 diffs)

Makefile ¶

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