comparison tests/run-tests.py @ 5253:fd371f99f20b

Automated merge with http://hg.intevation.org/mercurial/crew
author Bryan O'Sullivan <bos@serpentine.com>
date Mon, 27 Aug 2007 13:38:34 -0700
parents 90919a6f5c8f
children b817d17c7ee5
comparison
equal deleted inserted replaced
5252:0b0caffcf175 5253:fd371f99f20b
150 f.close() 150 f.close()
151 sys.exit(1) 151 sys.exit(1)
152 os.chdir(TESTDIR) 152 os.chdir(TESTDIR)
153 153
154 os.environ["PATH"] = "%s%s%s" % (BINDIR, os.pathsep, os.environ["PATH"]) 154 os.environ["PATH"] = "%s%s%s" % (BINDIR, os.pathsep, os.environ["PATH"])
155 os.environ["PYTHONPATH"] = PYTHONDIR 155
156 pythonpath = os.environ.get("PYTHONPATH")
157 if pythonpath:
158 pythonpath = PYTHONDIR + os.pathsep + pythonpath
159 else:
160 pythonpath = PYTHONDIR
161 os.environ["PYTHONPATH"] = pythonpath
156 162
157 use_correct_python() 163 use_correct_python()
158 164
159 if coverage: 165 if coverage:
160 vlog("# Installing coverage wrapper") 166 vlog("# Installing coverage wrapper")