From 74b7f5b31a44fd5645a76c9c4303648467f2aab8 Mon Sep 17 00:00:00 2001
From: Michael Williamson <mike@zwobble.org>
Date: Sun, 29 Sep 2013 21:28:11 +0100
Subject: Add support for running tests using tox to makefile

---
 makefile              | 8 ++++++--
 test-requirements.txt | 1 +
 2 files changed, 7 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
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
-- 
cgit v1.2.3