Mercurial > public > mercurial-scm > hg-stable
diff tests/run-tests.py @ 18060:d2e97d86e4db
merge with mpm
| author | Bryan O'Sullivan <bos@serpentine.com> |
|---|---|
| date | Wed, 12 Dec 2012 15:12:28 -0800 |
| parents | c135ab6413b4 48f797ac0879 |
| children | 0e4316c3a703 |
line wrap: on
line diff
--- a/tests/run-tests.py Wed Dec 12 14:52:58 2012 -0800 +++ b/tests/run-tests.py Wed Dec 12 15:12:28 2012 -0800 @@ -935,6 +935,8 @@ times.append((test, endtime - starttime)) vlog("# Ret was:", ret) + killdaemons() + mark = '.' skipped = (ret == SKIPPED_STATUS) @@ -1005,8 +1007,6 @@ sys.stdout.flush() iolock.release() - killdaemons() - if not options.keep_tmpdir: shutil.rmtree(testtmp, True) if skipped: