From 4fcf9d2d3f3e538db2010491c592c6e0ff0a3808 Mon Sep 17 00:00:00 2001
From: David Aguilar <davvid@gmail.com>
Date: Sat, 10 Oct 2009 06:35:41 -0700
Subject: [PATCH] tests: Remove the need for test/Makefile

The main Makefile now has the logic that previously lived in
test/Makefile.

Signed-off-by: David Aguilar <davvid@gmail.com>
---
 Makefile      | 16 +++++++++-------
 test/Makefile | 11 -----------
 2 files changed, 9 insertions(+), 18 deletions(-)
 delete mode 100644 test/Makefile

diff --git a/Makefile b/Makefile
index 431e01c3..396625f8 100644
--- a/Makefile
+++ b/Makefile
@@ -52,18 +52,20 @@ uninstall:
 		$(DESTDIR)$(prefix)/share/git-cola \
 		$(DESTDIR)$(prefix)/share/doc/git-cola
 
-test: all
-	$(MAKE) -C test all
+test_flags	?=
+all_test_flags	?= --with-doctest $(test_flags)
+
+test:
+	@env PYTHONPATH="$(CURDIR)":"$(PYTHONPATH)" \
+	nosetests $(all_test_flags)
 
 coverage:
 	@env PYTHONPATH=$(CURDIR):$(PYTHONPATH) \
-		nosetests --verbose --with-doctest --with-id --with-coverage \
-		--cover-package=cola
+	nosetests $(all_test_flags) \
+		--with-coverage --cover-package=cola
 
 clean:
-	for dir in share/doc/git-cola test; do \
-		(cd $$dir && $(MAKE) clean); \
-	done
+	$(MAKE) -C share/doc/git-cola clean
 	find . -name .noseids -print0 | xargs -0 rm -f
 	find . -name '*.py[co]' -print0 | xargs -0 rm -f
 	find share -name '*.qm' -print0 | xargs -0 rm -f
diff --git a/test/Makefile b/test/Makefile
deleted file mode 100644
index 5c6cb1ca..00000000
--- a/test/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-test_flags ?=
-
-all_test_flags ?= --with-doctest --verbose --with-id $(test_flags)
-
-all:
-	@cd .. && \
-	env PYTHONPATH=$(CURDIR)/..:$(PYTHONPATH) \
-	nosetests $(all_test_flags)
-
-clean:
-	find $(CURDIR) -name '*.py[co]' -print0 | xargs -0 rm -f
-- 
2.11.4.GIT