diff options
| author | Michael Williamson <mike@zwobble.org> | 2013-09-29 21:28:11 +0100 |
|---|---|---|
| committer | Michael Williamson <mike@zwobble.org> | 2013-09-29 21:29:36 +0100 |
| commit | 74b7f5b31a44fd5645a76c9c4303648467f2aab8 (patch) | |
| tree | 7f77f06dea476be365cb18805c9e8dd3b7eb4d58 | |
| parent | 3e427720a6cc7c7347e70b2c1e993a3ec34d5401 (diff) | |
Add support for running tests using tox to makefile
| -rw-r--r-- | makefile | 8 | ||||
| -rw-r--r-- | test-requirements.txt | 1 |
2 files changed, 7 insertions, 2 deletions
@@ -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 diff --git a/test-requirements.txt b/test-requirements.txt index 0798378..194ee54 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1 +1,2 @@ nose>=1.3.0,<2 +tox>=1.6.1,<2.0 |