From 61da02ee4318c5e2718fecf922b53e7bfee6d54c Mon Sep 17 00:00:00 2001
From: Joshua Harlow <harlowja@gmail.com>
Date: Fri, 17 Jan 2014 23:46:19 -0800
Subject: Update makefile to install from updated requirements files

---
 Makefile | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 8cf1659a..db582ffc 100644
--- a/Makefile
+++ b/Makefile
@@ -23,7 +23,15 @@ pylint:
 pyflakes:
 	pyflakes $(PY_FILES)
 
-test:
+requirements:
+	@echo "Installing cloud-init dependencies..."
+	sudo pip install -r "$@.txt" -q
+
+test-requirements:
+	@echo "Installing cloud-init test dependencies..."
+	sudo pip install -r "$@.txt" -q
+
+test: requirements test-requirements
 	@nosetests $(noseopts) tests/
 
 check_version:
@@ -36,8 +44,8 @@ check_version:
 	2to3 $(PY_FILES)
 
 clean:
-	rm -rf /var/log/cloud-init.log \
-		   /var/lib/cloud/
+	rm -rf /var/log/cloud-init.log /var/lib/cloud/
+	find . -type f -name "*.pyc" -delete
 
 yaml:
 	@$(CWD)/tools/validate-yaml.py $(YAML_FILES)
@@ -49,4 +57,5 @@ deb:
 	./packages/bddeb
 
 .PHONY: test pylint pyflakes 2to3 clean pep8 rpm deb yaml check_version
+.PHONE: test-requirements requirements
 
-- 
cgit v1.2.3


From 8ddcef3f02edc99398aa85d1449b8780ce9d070c Mon Sep 17 00:00:00 2001
From: Joshua Harlow <harlowja@gmail.com>
Date: Fri, 17 Jan 2014 23:49:59 -0800
Subject: Run pyc cleaning before running tests

---
 Makefile | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index db582ffc..0be3c0bc 100644
--- a/Makefile
+++ b/Makefile
@@ -31,7 +31,7 @@ test-requirements:
 	@echo "Installing cloud-init test dependencies..."
 	sudo pip install -r "$@.txt" -q
 
-test: requirements test-requirements
+test: clean_pyc requirements test-requirements
 	@nosetests $(noseopts) tests/
 
 check_version:
@@ -40,12 +40,14 @@ check_version:
 	    "not equal to code version $(CODE_VERSION)"; exit 2; \
 	    else true; fi
 
+clean_pyc:
+	@find . -type f -name "*.pyc" -delete
+
 2to3:
 	2to3 $(PY_FILES)
 
-clean:
+clean: clean_pyc
 	rm -rf /var/log/cloud-init.log /var/lib/cloud/
-	find . -type f -name "*.pyc" -delete
 
 yaml:
 	@$(CWD)/tools/validate-yaml.py $(YAML_FILES)
@@ -57,5 +59,5 @@ deb:
 	./packages/bddeb
 
 .PHONY: test pylint pyflakes 2to3 clean pep8 rpm deb yaml check_version
-.PHONE: test-requirements requirements
+.PHONE: test-requirements requirements clean_pyc
 
-- 
cgit v1.2.3


From 145419f5be1660f2a8ad7b65f7fac029e987f102 Mon Sep 17 00:00:00 2001
From: Joshua Harlow <harlowja@gmail.com>
Date: Sun, 19 Jan 2014 09:14:25 -0800
Subject: Phony not phone

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

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 0be3c0bc..977b6fb2 100644
--- a/Makefile
+++ b/Makefile
@@ -59,5 +59,5 @@ deb:
 	./packages/bddeb
 
 .PHONY: test pylint pyflakes 2to3 clean pep8 rpm deb yaml check_version
-.PHONE: test-requirements requirements clean_pyc
+.PHONY: test-requirements requirements clean_pyc
 
-- 
cgit v1.2.3


From 5f3bb991ac48e31075e32167efa9aad74cdc1296 Mon Sep 17 00:00:00 2001
From: Joshua Harlow <harlowja@gmail.com>
Date: Sun, 19 Jan 2014 09:23:41 -0800
Subject: Add output when starting to run tests

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

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 977b6fb2..12fe8bd8 100644
--- a/Makefile
+++ b/Makefile
@@ -32,6 +32,7 @@ test-requirements:
 	sudo pip install -r "$@.txt" -q
 
 test: clean_pyc requirements test-requirements
+	@echo "Running tests..."
 	@nosetests $(noseopts) tests/
 
 check_version:
-- 
cgit v1.2.3