Mercurial > hg
changeset 19267:6a7c76395b4c
run-tests: move DAEMON_PIDS to env
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Sun, 02 Jun 2013 16:22:51 -0500 |
| parents | 7815917b5f2a |
| children | 36dc45b1f427 |
| files | tests/run-tests.py |
| diffstat | 1 files changed, 3 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/run-tests.py Sun Jun 02 16:22:34 2013 -0500 +++ b/tests/run-tests.py Sun Jun 02 16:22:51 2013 -0500 @@ -352,7 +352,7 @@ hgrc.write('[extensions]\n') hgrc.write('inotify=\n') hgrc.write('[inotify]\n') - hgrc.write('pidfile=%s\n' % DAEMON_PIDS) + hgrc.write('pidfile=daemon.pids') hgrc.write('appendpid=True\n') if options.extra_config_opt: for opt in options.extra_config_opt: @@ -935,6 +935,7 @@ env["HGPORT"] = str(options.port) env["HGPORT1"] = str(options.port + 1) env["HGPORT2"] = str(options.port + 2) + env["DAEMON_PIDS"] = os.path.join(HGTMP, 'daemon.pids') if options.time: starttime = time.time() @@ -1166,8 +1167,7 @@ break def runtests(options, tests): - global DAEMON_PIDS, HGRCPATH - DAEMON_PIDS = os.environ["DAEMON_PIDS"] = os.path.join(HGTMP, 'daemon.pids') + global HGRCPATH HGRCPATH = os.environ["HGRCPATH"] = os.path.join(HGTMP, '.hgrc') try: @@ -1300,7 +1300,6 @@ d = os.getenv('TMP') tmpdir = tempfile.mkdtemp('', 'hgtests.', d) HGTMP = os.environ['HGTMP'] = os.path.realpath(tmpdir) - DAEMON_PIDS = None HGRCPATH = None os.environ["HGEDITOR"] = sys.executable + ' -c "import sys; sys.exit(0)"'