##// END OF EJS Templates
tests: save the original PATH and PYTHONPATH variables...
Adam Simpkins -
r33115:fa9a90d5 default
parent child Browse files
Show More
@@ -2274,6 +2274,9 b' class TestRunner(object):'
2274 sepb = _bytespath(os.pathsep)
2274 sepb = _bytespath(os.pathsep)
2275 else:
2275 else:
2276 sepb = os.pathsep
2276 sepb = os.pathsep
2277 # save the original path, for tests that need to invoke the
2278 # system python
2279 osenvironb[b"ORIG_PATH"] = osenvironb[b"PATH"]
2277 path = [self._bindir, runtestdir] + osenvironb[b"PATH"].split(sepb)
2280 path = [self._bindir, runtestdir] + osenvironb[b"PATH"].split(sepb)
2278 if os.path.islink(__file__):
2281 if os.path.islink(__file__):
2279 # test helper will likely be at the end of the symlink
2282 # test helper will likely be at the end of the symlink
@@ -2299,6 +2302,7 b' class TestRunner(object):'
2299 # are in /opt/subversion.)
2302 # are in /opt/subversion.)
2300 oldpypath = osenvironb.get(IMPL_PATH)
2303 oldpypath = osenvironb.get(IMPL_PATH)
2301 if oldpypath:
2304 if oldpypath:
2305 osenvironb['ORIG_' + IMPL_PATH] = oldpypath
2302 pypath.append(oldpypath)
2306 pypath.append(oldpypath)
2303 osenvironb[IMPL_PATH] = sepb.join(pypath)
2307 osenvironb[IMPL_PATH] = sepb.join(pypath)
2304
2308
General Comments 0
You need to be logged in to leave comments. Login now