diff options
| author | Monty Taylor <mordred@inaugust.com> | 2010-07-27 21:35:55 -0700 |
|---|---|---|
| committer | Monty Taylor <mordred@inaugust.com> | 2010-07-27 21:35:55 -0700 |
| commit | 849a4062cdf8af50b8c3d44611f10857fedf6813 (patch) | |
| tree | a0fd352f97c096c6bc7bcce32863b846a97ed774 | |
| parent | 0d32008ea944071b99dea5a88805d78736e5f21e (diff) | |
| download | nova-849a4062cdf8af50b8c3d44611f10857fedf6813.tar.gz | |
Changed Makefile to shell script. The Makefile approach completely broke
debhelper's ability to figure out that this was a python package.
| -rw-r--r-- | Makefile | 40 | ||||
| -rw-r--r-- | run_tests.sh | 13 |
2 files changed, 13 insertions, 40 deletions
diff --git a/Makefile b/Makefile deleted file mode 100644 index 847da779f7..0000000000 --- a/Makefile +++ /dev/null @@ -1,40 +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) - -MANIFEST.in: - [ -d .bzr ] || (echo "Must be a bzr checkout" ; exit 1) - bzr ls --kind=file -VR | while read f; do echo include "$$f"; done > $@ - -sdist: MANIFEST.in - python setup.py sdist - -$(venv): - @echo "You need to install the Nova virtualenv before you can run this." - @echo "" - @echo "Please run tools/install_venv.py" - @exit 1 - -.PHONY: MANIFEST.in diff --git a/run_tests.sh b/run_tests.sh new file mode 100644 index 0000000000..1bf3d1a791 --- /dev/null +++ b/run_tests.sh @@ -0,0 +1,13 @@ +#!/bin/bash + +venv=.nova-venv +with_venv=tools/with_venv.sh + +if [ -e ${venv} ]; then + ${with_venv} python run_tests.py +else + echo "You need to install the Nova virtualenv before you can run this." + echo "" + echo "Please run tools/install_venv.py" + exit 1 +fi |