Show More
@@ -905,8 +905,6 b' def runone(options, test):' | |||
|
905 | 905 | |
|
906 | 906 | vlog("# Test", test) |
|
907 | 907 | |
|
908 | createhgrc(HGRCPATH, options) | |
|
909 | ||
|
910 | 908 | if os.path.exists(err): |
|
911 | 909 | os.remove(err) # Remove any previous output files |
|
912 | 910 | |
@@ -935,8 +933,11 b' def runone(options, test):' | |||
|
935 | 933 | env["HGPORT"] = str(options.port) |
|
936 | 934 | env["HGPORT1"] = str(options.port + 1) |
|
937 | 935 | env["HGPORT2"] = str(options.port + 2) |
|
936 | env["HGRCPATH"] = os.path.join(HGTMP, '.hgrc') | |
|
938 | 937 | env["DAEMON_PIDS"] = os.path.join(HGTMP, 'daemon.pids') |
|
939 | 938 | |
|
939 | createhgrc(env['HGRCPATH'], options) | |
|
940 | ||
|
940 | 941 | if options.time: |
|
941 | 942 | starttime = time.time() |
|
942 | 943 | ret, out = runner(testpath, testtmp, options, replacements, env) |
@@ -1167,9 +1168,6 b' def runqueue(options, tests):' | |||
|
1167 | 1168 | break |
|
1168 | 1169 | |
|
1169 | 1170 | def runtests(options, tests): |
|
1170 | global HGRCPATH | |
|
1171 | HGRCPATH = os.environ["HGRCPATH"] = os.path.join(HGTMP, '.hgrc') | |
|
1172 | ||
|
1173 | 1171 | try: |
|
1174 | 1172 | if INST: |
|
1175 | 1173 | installhg(options) |
@@ -1300,7 +1298,6 b' def main():' | |||
|
1300 | 1298 | d = os.getenv('TMP') |
|
1301 | 1299 | tmpdir = tempfile.mkdtemp('', 'hgtests.', d) |
|
1302 | 1300 | HGTMP = os.environ['HGTMP'] = os.path.realpath(tmpdir) |
|
1303 | HGRCPATH = None | |
|
1304 | 1301 | |
|
1305 | 1302 | os.environ["HGEDITOR"] = sys.executable + ' -c "import sys; sys.exit(0)"' |
|
1306 | 1303 | os.environ["HGMERGE"] = "internal:merge" |
General Comments 0
You need to be logged in to leave comments.
Login now