equal
deleted
inserted
replaced
930 replacements.append((re.escape(testtmp), '$TESTTMP')) |
930 replacements.append((re.escape(testtmp), '$TESTTMP')) |
931 |
931 |
932 env = os.environ.copy() |
932 env = os.environ.copy() |
933 env['TESTTMP'] = testtmp |
933 env['TESTTMP'] = testtmp |
934 env['HOME'] = testtmp |
934 env['HOME'] = testtmp |
|
935 env["HGPORT"] = str(options.port) |
|
936 env["HGPORT1"] = str(options.port + 1) |
|
937 env["HGPORT2"] = str(options.port + 2) |
935 |
938 |
936 if options.time: |
939 if options.time: |
937 starttime = time.time() |
940 starttime = time.time() |
938 ret, out = runner(testpath, testtmp, options, replacements, env) |
941 ret, out = runner(testpath, testtmp, options, replacements, env) |
939 if options.time: |
942 if options.time: |
1303 os.environ["HGEDITOR"] = sys.executable + ' -c "import sys; sys.exit(0)"' |
1306 os.environ["HGEDITOR"] = sys.executable + ' -c "import sys; sys.exit(0)"' |
1304 os.environ["HGMERGE"] = "internal:merge" |
1307 os.environ["HGMERGE"] = "internal:merge" |
1305 os.environ["HGUSER"] = "test" |
1308 os.environ["HGUSER"] = "test" |
1306 os.environ["HGENCODING"] = "ascii" |
1309 os.environ["HGENCODING"] = "ascii" |
1307 os.environ["HGENCODINGMODE"] = "strict" |
1310 os.environ["HGENCODINGMODE"] = "strict" |
1308 os.environ["HGPORT"] = str(options.port) |
|
1309 os.environ["HGPORT1"] = str(options.port + 1) |
|
1310 os.environ["HGPORT2"] = str(options.port + 2) |
|
1311 |
1311 |
1312 if options.with_hg: |
1312 if options.with_hg: |
1313 INST = None |
1313 INST = None |
1314 BINDIR = os.path.dirname(os.path.realpath(options.with_hg)) |
1314 BINDIR = os.path.dirname(os.path.realpath(options.with_hg)) |
1315 |
1315 |