summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSoren Hansen <soren.hansen@rackspace.com>2010-07-27 12:26:53 +0200
committerSoren Hansen <soren.hansen@rackspace.com>2010-07-27 12:26:53 +0200
commit3365987ee5bc8ec66676f838d7eeefce377a76b9 (patch)
tree908ea44d651cddc04cda8f670d26c70cfd266471
parentfae70b1a769f52cc4730e04fcec8fe82cc8bd1c6 (diff)
downloadnova-3365987ee5bc8ec66676f838d7eeefce377a76b9.tar.gz
nova-3365987ee5bc8ec66676f838d7eeefce377a76b9.tar.xz
nova-3365987ee5bc8ec66676f838d7eeefce377a76b9.zip
Automatically choose the correct type of test (virtualenv or system).
-rw-r--r--Makefile6
1 files changed, 5 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index fa11cf335..cd7e233e1 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,11 @@ with_venv=tools/with_venv.sh
build:
# Nothing to do
-test: $(venv)
+default_test_type:= $(shell if [ -e $(venv) ]; then echo venv; else echo system; fi)
+
+test: test-$(default_test_type)
+
+test-venv: $(venv)
$(with_venv) python run_tests.py
test-system: