From: Brian Warner <warner@allmydata.com>
Date: Sat, 24 Jan 2009 00:28:12 +0000 (-0700)
Subject: rollback the #591 fix, since it breaks quicktest entirely
X-Git-Tag: allmydata-tahoe-1.3.0~148
X-Git-Url: https://git.rkrishnan.org/components/com_hotproperty/simplejson/encoder.py.html?a=commitdiff_plain;h=66b8190fb1892e1548672e9aafc59ef440a66815;p=tahoe-lafs%2Ftahoe-lafs.git

rollback the #591 fix, since it breaks quicktest entirely
---

diff --git a/Makefile b/Makefile
index a565b9ee..0bd4048d 100644
--- 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"