Show More
@@ -371,6 +371,11 b' def createenv(options, testtmp):' | |||||
371 | env["HGPORT2"] = str(options.port + 2) |
|
371 | env["HGPORT2"] = str(options.port + 2) | |
372 | env["HGRCPATH"] = os.path.join(HGTMP, '.hgrc') |
|
372 | env["HGRCPATH"] = os.path.join(HGTMP, '.hgrc') | |
373 | env["DAEMON_PIDS"] = os.path.join(HGTMP, 'daemon.pids') |
|
373 | env["DAEMON_PIDS"] = os.path.join(HGTMP, 'daemon.pids') | |
|
374 | env["HGEDITOR"] = sys.executable + ' -c "import sys; sys.exit(0)"' | |||
|
375 | env["HGMERGE"] = "internal:merge" | |||
|
376 | env["HGUSER"] = "test" | |||
|
377 | env["HGENCODING"] = "ascii" | |||
|
378 | env["HGENCODINGMODE"] = "strict" | |||
374 |
|
379 | |||
375 | # Reset some environment variables to well-known values so that |
|
380 | # Reset some environment variables to well-known values so that | |
376 | # the tests produce repeatable output. |
|
381 | # the tests produce repeatable output. | |
@@ -1294,12 +1299,6 b' def main():' | |||||
1294 | tmpdir = tempfile.mkdtemp('', 'hgtests.', d) |
|
1299 | tmpdir = tempfile.mkdtemp('', 'hgtests.', d) | |
1295 | HGTMP = os.environ['HGTMP'] = os.path.realpath(tmpdir) |
|
1300 | HGTMP = os.environ['HGTMP'] = os.path.realpath(tmpdir) | |
1296 |
|
1301 | |||
1297 | os.environ["HGEDITOR"] = sys.executable + ' -c "import sys; sys.exit(0)"' |
|
|||
1298 | os.environ["HGMERGE"] = "internal:merge" |
|
|||
1299 | os.environ["HGUSER"] = "test" |
|
|||
1300 | os.environ["HGENCODING"] = "ascii" |
|
|||
1301 | os.environ["HGENCODINGMODE"] = "strict" |
|
|||
1302 |
|
||||
1303 | if options.with_hg: |
|
1302 | if options.with_hg: | |
1304 | INST = None |
|
1303 | INST = None | |
1305 | BINDIR = os.path.dirname(os.path.realpath(options.with_hg)) |
|
1304 | BINDIR = os.path.dirname(os.path.realpath(options.with_hg)) |
General Comments 0
You need to be logged in to leave comments.
Login now