From: Zooko O'Whielacronx <zooko@zooko.com>
Date: Tue, 1 May 2007 06:19:47 +0000 (-0700)
Subject: transfer any PYTHONPATH environment variable to the environment of the foolscap tests
X-Git-Tag: allmydata-tahoe-0.2.0~32
X-Git-Url: https://git.rkrishnan.org/(%5B%5E?a=commitdiff_plain;h=cf331e4d9f9aebe8d6d091b03feb369cdac4cd4a;p=tahoe-lafs%2Ftahoe-lafs.git

transfer any PYTHONPATH environment variable to the environment of the foolscap tests
---

diff --git a/GNUmakefile b/GNUmakefile
index 41f684a7..07b187d8 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -35,6 +35,8 @@ else
  endif
 endif
 
+ORIGPYTHONPATH=$(PYTHONPATH)
+
 # Append instdir/lib instead of prepending it so that people can override
 # things from lib with alternate packages of their choosing by setting their
 # PYTHONPATH.
@@ -119,7 +121,7 @@ REPORTER=
 test: build test-foolscap test-TEST
 
 test-foolscap:
-	cd src/foolscap && $(TRIAL) $(REPORTER) foolscap
+	cd src/foolscap && PYTHONPATH=$(ORIGPYTHONPATH) $(TRIAL) $(REPORTER) foolscap
 
 test-TEST:
 	$(PP) $(TRIAL) $(REPORTER) $(TEST)