setup: use "trial" executable instead of the setuptools_trial plugin for "make quicktest"

This is to fix #591 ("make quicktest" could be quicker and less noisy).  This means that "make quicktest" won't work unless the user has manually installed Twisted already such that the "trial" executable is on their PATH and the Twisted package is on their PYTHONPATH.  This bypasses the behavior of setuptools_trial which builds and checks package dependencies before executing the tests.

diff --git a/Makefile b/Makefile
index 0bd4048d95e5d4d9e339144ade9f9d2ff430d718..a565b9ee86f6f325cacab9e8dc34e0e4eb92b7f9 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -121,7 +121,7 @@ test: build src/allmydata/_version.py
        $(PYTHON) setup.py trial $(TRIALARGS) -s $(TEST)
 
 quicktest: .built .checked-deps
-       $(PYTHON) setup.py trial $(TRIALARGS) -s $(TEST)
+       trial $(TRIALARGS) $(TEST)
 
 fuse-test: .built .checked-deps
        $(RUNPP) -d contrib/fuse -p -c runtests.py
@@ -132,7 +132,7 @@ test-figleaf: build src/allmydata/_version.py
 
 quicktest-figleaf: src/allmydata/_version.py
        rm -f .figleaf
-       $(PYTHON) setup.py trial --reporter=bwverbose-figleaf -s $(TEST)
+       trial --reporter=bwverbose-figleaf $(TRIALARGS) $(TEST)
 
 figleaf-output:
        $(RUNPP) -p -c "misc/figleaf2html -d coverage-html -r src -x misc/figleaf.excludes"