From: david-sarah <david-sarah@jacaranda.org>
Date: Thu, 23 Jun 2011 20:55:28 +0000 (-0700)
Subject: Makefile: add 'make check' as an alias for 'make test'. Also remove an unnecessary... 
X-Git-Url: https://git.rkrishnan.org/%3C?a=commitdiff_plain;h=082731f45b5bda05a7ea1b7a4a942388a91f581c;p=tahoe-lafs%2Ftahoe-lafs.git

Makefile: add 'make check' as an alias for 'make test'. Also remove an unnecessary dependency of 'test' on 'build' and 'src/allmydata/_version.py'. fixes #1344
---

diff --git a/Makefile b/Makefile
index 0917f5fd..fddd092c 100644
--- a/Makefile
+++ b/Makefile
@@ -70,7 +70,7 @@ endif
 
 # TESTING
 
-.PHONY: signal-error-deps test test-coverage quicktest quicktest-coverage
+.PHONY: signal-error-deps test check test-coverage quicktest quicktest-coverage
 .PHONY: coverage-output get-old-coverage-coverage coverage-delta-output
 
 
@@ -97,8 +97,13 @@ TEST=allmydata
 # use 'make test TRIALARGS=--reporter=bwverbose' from buildbot, to
 # suppress the ansi color sequences
 
-test: build src/allmydata/_version.py
+# It is unnecessary to have this depend on build or src/allmydata/_version.py,
+# since 'setup.py test' always updates the version and builds before testing.
+test:
 	$(PYTHON) setup.py test $(TRIALARGS) -s $(TEST)
+	touch .built
+
+check: test
 
 fuse-test: .built .checked-deps
 	$(RUNPP) -d contrib/fuse -p -c runtests.py