# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1367713536 -3600
# Node ID 19fe7b202b389bc021223f8145045966d265a41e
# Parent  45a6eace22bf28d557731e2c4848fa837f3561ed# Parent  f3c19de4b29c4a214c773aa6c42eb387c23170df
Merge with stable

diff -r 45a6eace22bf -r 19fe7b202b38 tests/run-tests.py
--- a/tests/run-tests.py	Sat Apr 20 13:48:54 2013 +0100
+++ b/tests/run-tests.py	Sun May 05 01:25:36 2013 +0100
@@ -1120,6 +1120,8 @@
         childopts = ['--child=%d' % wfd, '--port=%d' % (options.port + j * 3)]
         childtmp = os.path.join(HGTMP, 'child%d' % j)
         childopts += ['--tmpdir', childtmp]
+        if options.keep_tmpdir:
+            childopts.append('--keep-tmpdir')
         cmdline = [PYTHON, sys.argv[0]] + opts + childopts + job
         vlog(' '.join(cmdline))
         proc = subprocess.Popen(cmdline, executable=cmdline[0])
@@ -1288,7 +1290,8 @@
     global TESTDIR, HGTMP, INST, BINDIR, PYTHONDIR, COVERAGE_FILE
     TESTDIR = os.environ["TESTDIR"] = os.getcwd()
     if options.tmpdir:
-        options.keep_tmpdir = True
+        if not options.child:
+            options.keep_tmpdir = True
         tmpdir = options.tmpdir
         if os.path.exists(tmpdir):
             # Meaning of tmpdir has changed since 1.3: we used to create