Show More
@@ -211,6 +211,10 b' def run_one(test):' | |||||
211 | sys.stdout.write('.') |
|
211 | sys.stdout.write('.') | |
212 | sys.stdout.flush() |
|
212 | sys.stdout.flush() | |
213 |
|
213 | |||
|
214 | # create a fresh hgrc | |||
|
215 | hgrc = file(HGRCPATH, 'w+') | |||
|
216 | hgrc.close() | |||
|
217 | ||||
214 | err = os.path.join(TESTDIR, test+".err") |
|
218 | err = os.path.join(TESTDIR, test+".err") | |
215 | ref = os.path.join(TESTDIR, test+".out") |
|
219 | ref = os.path.join(TESTDIR, test+".out") | |
216 |
|
220 | |||
@@ -319,11 +323,11 b" os.environ['TZ'] = 'GMT'" | |||||
319 | os.environ["HGEDITOR"] = sys.executable + ' -c "import sys; sys.exit(0)"' |
|
323 | os.environ["HGEDITOR"] = sys.executable + ' -c "import sys; sys.exit(0)"' | |
320 | os.environ["HGMERGE"] = sys.executable + ' -c "import sys; sys.exit(0)"' |
|
324 | os.environ["HGMERGE"] = sys.executable + ' -c "import sys; sys.exit(0)"' | |
321 | os.environ["HGUSER"] = "test" |
|
325 | os.environ["HGUSER"] = "test" | |
322 | os.environ["HGRCPATH"] = "" |
|
|||
323 |
|
326 | |||
324 | TESTDIR = os.environ["TESTDIR"] = os.getcwd() |
|
327 | TESTDIR = os.environ["TESTDIR"] = os.getcwd() | |
325 | HGTMP = os.environ["HGTMP"] = tempfile.mkdtemp("", "hgtests.") |
|
328 | HGTMP = os.environ["HGTMP"] = tempfile.mkdtemp("", "hgtests.") | |
326 | DAEMON_PIDS = os.environ["DAEMON_PIDS"] = os.path.join(HGTMP, 'daemon.pids') |
|
329 | DAEMON_PIDS = os.environ["DAEMON_PIDS"] = os.path.join(HGTMP, 'daemon.pids') | |
|
330 | HGRCPATH = os.environ["HGRCPATH"] = os.path.join(HGTMP, '.hgrc') | |||
327 |
|
331 | |||
328 | vlog("# Using TESTDIR", TESTDIR) |
|
332 | vlog("# Using TESTDIR", TESTDIR) | |
329 | vlog("# Using HGTMP", HGTMP) |
|
333 | vlog("# Using HGTMP", HGTMP) |
General Comments 0
You need to be logged in to leave comments.
Login now