summaryrefslogtreecommitdiff
path: root/makefile
diff options
context:
space:
mode:
authorMichael Williamson <mike@zwobble.org>2013-09-29 21:28:11 +0100
committerMichael Williamson <mike@zwobble.org>2013-09-29 21:29:36 +0100
commit74b7f5b31a44fd5645a76c9c4303648467f2aab8 (patch)
tree7f77f06dea476be365cb18805c9e8dd3b7eb4d58 /makefile
parent3e427720a6cc7c7347e70b2c1e993a3ec34d5401 (diff)
Add support for running tests using tox to makefile
Diffstat (limited to 'makefile')
-rw-r--r--makefile8
1 files changed, 6 insertions, 2 deletions
diff --git a/makefile b/makefile
index 692bf41..7de020e 100644
--- a/makefile
+++ b/makefile
@@ -1,7 +1,11 @@
.PHONY: test upload clean bootstrap setup
-test: bootstrap
- sh -c '. _virtualenv/bin/activate; nosetests -m'\''^$$'\'' `find tests -name '\''*.py'\''`'
+test:
+ _virtualenv/bin/nosetests tests
+
+test-all: setup
+ _virtualenv/bin/tox
+ make clean
upload: setup
python setup.py sdist upload