From a766736b79f794f745438dd597f2aa529ad62ddc Mon Sep 17 00:00:00 2001
From: Andy Smith <termie@preciousroy.local>
Date: Fri, 23 Jul 2010 04:44:23 +0200
Subject: Adds a Makefile to fill dependencies for testing.

Depends upon pip being installed, but pip is pretty much
the standard nowadays and is just an easy_install away if
it isn't there.

The only dependency installed on to the system is
virtualenv which is used to make the other dependencies
local to the current environment.

Does not remove the need to install redis by hand, though
I am in favor of making that possible (using aptitude on
linux and brew on os x)

I look forward to cutting away at some of these
dependencies in further commits.
---
 Makefile | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 Makefile

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
new file mode 100644
index 000000000..da69f2b72
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,27 @@
+venv=.venv
+with_venv=source $(venv)/bin/activate
+installed=$(venv)/lib/python2.6/site-packages
+twisted=$(installed)/twisted/__init__.py
+
+
+test: python-dependencies $(twisted)
+	$(with_venv) && python run_tests.py
+
+clean:
+	rm -rf _trial_temp
+	rm -rf keys
+	rm -rf instances
+	rm -rf networks
+
+clean-all: clean
+	rm -rf $(venv)
+
+python-dependencies: $(venv)
+	pip install -q -E $(venv) -r tools/pip-requires
+
+$(venv):
+	pip install -q virtualenv
+	virtualenv -q --no-site-packages $(venv)
+
+$(twisted):
+	pip install -q -E $(venv) http://nova.openstack.org/Twisted-10.0.0Nova.tar.gz
-- 
cgit 


From 6d3331e831ec147916d0d605958f61ca69eee9a8 Mon Sep 17 00:00:00 2001
From: andy <github@anarkystic.com>
Date: Mon, 26 Jul 2010 23:16:49 +0200
Subject: Move virtualenv installation out of the makefile.

Also adds some tools for dealing with virtualenvs to the tools
directory.
---
 Makefile | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index da69f2b72..5fb512610 100644
--- a/Makefile
+++ b/Makefile
@@ -1,27 +1,27 @@
-venv=.venv
-with_venv=source $(venv)/bin/activate
-installed=$(venv)/lib/python2.6/site-packages
-twisted=$(installed)/twisted/__init__.py
+venv=.nova-venv
+with_venv=tools/with_venv.sh
 
+build:
+	# Nothing to do
 
-test: python-dependencies $(twisted)
-	$(with_venv) && python run_tests.py
+test: $(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 run_tests.err.log
 
 clean-all: clean
 	rm -rf $(venv)
 
-python-dependencies: $(venv)
-	pip install -q -E $(venv) -r tools/pip-requires
-
 $(venv):
-	pip install -q virtualenv
-	virtualenv -q --no-site-packages $(venv)
-
-$(twisted):
-	pip install -q -E $(venv) http://nova.openstack.org/Twisted-10.0.0Nova.tar.gz
+	@echo "You need to install the Nova virtualenv before you can run this."
+	@echo ""
+	@echo "Please run tools/install_venv.py"
+	@exit 1
-- 
cgit 


From 4373ca830fe93ddff70cf02bc366303d6b001ae9 Mon Sep 17 00:00:00 2001
From: Vishvananda Ishaya <vishvananda@gmail.com>
Date: Mon, 26 Jul 2010 18:57:24 -0700
Subject: Fixes to the virtualenv installer

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 5fb512610..fa11cf335 100644
--- a/Makefile
+++ b/Makefile
@@ -15,7 +15,7 @@ clean:
 	rm -rf keys
 	rm -rf instances
 	rm -rf networks
-	rm run_tests.err.log
+	rm -f run_tests.err.log
 
 clean-all: clean
 	rm -rf $(venv)
-- 
cgit