fix quicktest: stop using setuptools, add misc/run-with-pythonpath.py, to make it...

[tahoe-lafs/tahoe-lafs.git] / Makefile

diff --git a/Makefile b/Makefile
index 02ab25ad5941e4751169c01c130dea14540bf122..1cc40fcf81b20962bba219dc7818b15caf5b157c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -112,9 +112,6 @@ TEST=allmydata
 test: build src/allmydata/_version.py
        $(PYTHON) setup.py test $(TRIALARGS) -s $(TEST)
 
-quicktest: .built .checked-deps
-       $(PYTHON) setup.py test $(TRIALARGS) -s $(TEST)
-
 fuse-test: .built .checked-deps
        $(RUNPP) -d contrib/fuse -p -c runtests.py
 
@@ -122,9 +119,12 @@ test-figleaf: build src/allmydata/_version.py
        rm -f .figleaf
        $(PYTHON) setup.py trial --reporter=bwverbose-figleaf -s $(TEST)
 
-quicktest-figleaf: src/allmydata/_version.py
+quicktest:
+       $(PYTHON) misc/run-with-pythonpath.py trial $(TRIALARGS) $(TEST)
+
+quicktest-figleaf:
        rm -f .figleaf
-       $(PYTHON) setup.py trial --reporter=bwverbose-figleaf -s $(TEST)
+       $(PYTHON) misc/run-with-pythonpath.py trial --reporter=bwverbose-figleaf $(TEST)
 
 figleaf-output:
        $(RUNPP) -p -c "misc/figleaf2html -d coverage-html -r src -x misc/figleaf.excludes"