Makefile: use 'setup.py test' for test/quicktest targets (instead of

'setup.py trial'). 'setup.py trial' clobbers the tahoe .egg's PKG-INFO
"Version:" field (resetting it to 0.0.0), possibly because it isn't invoking
the darcsver subcommand that 'setup.py test' does before it runs the 'trial'
subcommand.

This slows down quicktest by another couple of seconds (see #591) and adds
more noise to its output, but without this change, 'make test' and 'make
quicktest' fail on test_runner (which spawns bin/tahoe as a subprocess, and
with a mangled Version:, the setuptools-based entry point script refuses to
recognize our source tree as a usable version of Tahoe).

diff --git a/Makefile b/Makefile
index 5693fa898d4c95678edf909b64f29b85d2e63b48..c93d8285c0b7d8a995a57ec76009f539b89c94fc 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -109,10 +109,10 @@ TEST=allmydata
 # suppress the ansi color sequences
 
 test: build src/allmydata/_version.py
-       $(PYTHON) setup.py trial $(TRIALARGS) -s $(TEST)
+       $(PYTHON) setup.py test $(TRIALARGS) -s $(TEST)
 
 quicktest: .built .checked-deps
-       $(PYTHON) setup.py trial $(TRIALARGS) -s $(TEST)
+       $(PYTHON) setup.py test $(TRIALARGS) -s $(TEST)
 
 fuse-test: .built .checked-deps
        $(RUNPP) -d contrib/fuse -p -c runtests.py