Mercurial > hg
comparison tests/run-tests.py @ 10904:26d1d23e5a2b stable
Fix --blacklist when --jobs > 1 in run_tests.py.
The options parsing logic replaces the options.blacklist initial value,
a list of filenames, with a dict of test names to filenames. When
runchildren rebuilds the command line to launch child processes the dict
is flattened and provided as a malformed argument when a filename is
expected.
Fix is to remove the blacklist option from child invocations since the
filtering is handled in the parent anyway.
author | Ry4an Brase <ry4an-hg@ry4an.org> |
---|---|
date | Wed, 14 Apr 2010 00:24:47 -0500 |
parents | 4eb6311d217a |
children | a6c4dd5175b5 1782278bab8a |
comparison
equal
deleted
inserted
replaced
10902:4eb6311d217a | 10904:26d1d23e5a2b |
---|---|
655 installhg(options) | 655 installhg(options) |
656 _checkhglib("Testing") | 656 _checkhglib("Testing") |
657 | 657 |
658 optcopy = dict(options.__dict__) | 658 optcopy = dict(options.__dict__) |
659 optcopy['jobs'] = 1 | 659 optcopy['jobs'] = 1 |
660 del optcopy['blacklist'] | |
660 if optcopy['with_hg'] is None: | 661 if optcopy['with_hg'] is None: |
661 optcopy['with_hg'] = os.path.join(BINDIR, "hg") | 662 optcopy['with_hg'] = os.path.join(BINDIR, "hg") |
662 optcopy.pop('anycoverage', None) | 663 optcopy.pop('anycoverage', None) |
663 | 664 |
664 opts = [] | 665 opts = [] |