Show More
@@ -1120,6 +1120,8 b' def runchildren(options, tests):' | |||||
1120 | childopts = ['--child=%d' % wfd, '--port=%d' % (options.port + j * 3)] |
|
1120 | childopts = ['--child=%d' % wfd, '--port=%d' % (options.port + j * 3)] | |
1121 | childtmp = os.path.join(HGTMP, 'child%d' % j) |
|
1121 | childtmp = os.path.join(HGTMP, 'child%d' % j) | |
1122 | childopts += ['--tmpdir', childtmp] |
|
1122 | childopts += ['--tmpdir', childtmp] | |
|
1123 | if options.keep_tmpdir: | |||
|
1124 | childopts.append('--keep-tmpdir') | |||
1123 | cmdline = [PYTHON, sys.argv[0]] + opts + childopts + job |
|
1125 | cmdline = [PYTHON, sys.argv[0]] + opts + childopts + job | |
1124 | vlog(' '.join(cmdline)) |
|
1126 | vlog(' '.join(cmdline)) | |
1125 | proc = subprocess.Popen(cmdline, executable=cmdline[0]) |
|
1127 | proc = subprocess.Popen(cmdline, executable=cmdline[0]) | |
@@ -1288,6 +1290,7 b' def main():' | |||||
1288 | global TESTDIR, HGTMP, INST, BINDIR, PYTHONDIR, COVERAGE_FILE |
|
1290 | global TESTDIR, HGTMP, INST, BINDIR, PYTHONDIR, COVERAGE_FILE | |
1289 | TESTDIR = os.environ["TESTDIR"] = os.getcwd() |
|
1291 | TESTDIR = os.environ["TESTDIR"] = os.getcwd() | |
1290 | if options.tmpdir: |
|
1292 | if options.tmpdir: | |
|
1293 | if not options.child: | |||
1291 | options.keep_tmpdir = True |
|
1294 | options.keep_tmpdir = True | |
1292 | tmpdir = options.tmpdir |
|
1295 | tmpdir = options.tmpdir | |
1293 | if os.path.exists(tmpdir): |
|
1296 | if os.path.exists(tmpdir): |
General Comments 0
You need to be logged in to leave comments.
Login now