summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorDevin Carlen <devin.carlen@gmail.com>2010-07-28 18:24:52 +0000
committerDevin Carlen <devin.carlen@gmail.com>2010-07-28 18:24:52 +0000
commitd425ee86d389e8972a4e30ce5d26f1b3de96ebb7 (patch)
tree0117336e3e0aa0295895ff8fcd8853dbc933f81c /Makefile
parente53caccb7a242bdabd4ea6aed914ab77cb1fca32 (diff)
parenta72fb79080df79306d947347e0ceb9be238c5cd8 (diff)
Merged trunk
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile31
1 files changed, 0 insertions, 31 deletions
diff --git a/Makefile b/Makefile
deleted file mode 100644
index cd7e233e1..000000000
--- a/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-venv=.nova-venv
-with_venv=tools/with_venv.sh
-
-build:
- # Nothing to do
-
-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:
- python run_tests.py
-
-clean:
- rm -rf _trial_temp
- rm -rf keys
- rm -rf instances
- rm -rf networks
- rm -f run_tests.err.log
-
-clean-all: clean
- rm -rf $(venv)
-
-$(venv):
- @echo "You need to install the Nova virtualenv before you can run this."
- @echo ""
- @echo "Please run tools/install_venv.py"
- @exit 1