Changeset dfe6ab6 for Makefile

Timestamp:

Mar 31, 2019, 9:58:02 PM (6 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

feature/constantq

Children:

9492313a

Parents:

868c6b8 (diff), f55630c (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/constantq

File:

• Makefile (modified) (3 diffs)

Makefile

@@ -36 +36 @@
 MANDIR?=$(DATAROOTDIR)/man
 
-# default nose2 command
-NOSE2?=nose2 -N 4 --verbose
+# default python test command
+PYTEST?=pytest --verbose
 
 SOX=sox
@@ -141 +141 @@
 test_python: local_dylib
         # run test with installed package
-        # ./python/tests/run_all_tests --verbose
-        # run with nose2, multiple processes
-        $(NOSE2)
+        $(PYTEST)
 
 clean_python:
@@ -254 +252 @@
         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 . \