Mercurial > hg
changeset 19268:36dc45b1f427
run-tests: move HGRCPATH to env
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Sun, 02 Jun 2013 16:22:51 -0500 |
| parents | 6a7c76395b4c |
| children | f4247d7e2046 |
| files | tests/run-tests.py |
| diffstat | 1 files changed, 3 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/run-tests.py Sun Jun 02 16:22:51 2013 -0500 +++ b/tests/run-tests.py Sun Jun 02 16:22:51 2013 -0500 @@ -905,8 +905,6 @@ vlog("# Test", test) - createhgrc(HGRCPATH, options) - if os.path.exists(err): os.remove(err) # Remove any previous output files @@ -935,8 +933,11 @@ env["HGPORT"] = str(options.port) env["HGPORT1"] = str(options.port + 1) env["HGPORT2"] = str(options.port + 2) + env["HGRCPATH"] = os.path.join(HGTMP, '.hgrc') env["DAEMON_PIDS"] = os.path.join(HGTMP, 'daemon.pids') + createhgrc(env['HGRCPATH'], options) + if options.time: starttime = time.time() ret, out = runner(testpath, testtmp, options, replacements, env) @@ -1167,9 +1168,6 @@ break def runtests(options, tests): - global HGRCPATH - HGRCPATH = os.environ["HGRCPATH"] = os.path.join(HGTMP, '.hgrc') - try: if INST: installhg(options) @@ -1300,7 +1298,6 @@ d = os.getenv('TMP') tmpdir = tempfile.mkdtemp('', 'hgtests.', d) HGTMP = os.environ['HGTMP'] = os.path.realpath(tmpdir) - HGRCPATH = None os.environ["HGEDITOR"] = sys.executable + ' -c "import sys; sys.exit(0)"' os.environ["HGMERGE"] = "internal:merge"