rollback the #591 fix, since it breaks quicktest entirely

diff --git a/Makefile b/Makefile
index a565b9ee86f6f325cacab9e8dc34e0e4eb92b7f9..0bd4048d95e5d4d9e339144ade9f9d2ff430d718 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
-       trial $(TRIALARGS) $(TEST)
+       $(PYTHON) setup.py trial $(TRIALARGS) -s $(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
-       trial --reporter=bwverbose-figleaf $(TRIALARGS) $(TEST)
+       $(PYTHON) setup.py trial --reporter=bwverbose-figleaf -s $(TEST)
 
 figleaf-output:
        $(RUNPP) -p -c "misc/figleaf2html -d coverage-html -r src -x misc/figleaf.excludes"