# HG changeset patch # User Ry4an Brase # Date 1271222687 18000 # Node ID 212432db2043041d14e66f35468f7b8e40bd474f # Parent 211fa4b9803d77a2e424e4924dede64f21ca59a7 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. [ original upstream message ] diff -r 211fa4b9803d -r 212432db2043 tests/run-tests.py --- a/tests/run-tests.py Wed Apr 14 09:08:47 2010 +0200 +++ b/tests/run-tests.py Wed Apr 14 00:24:47 2010 -0500 @@ -664,6 +664,7 @@ optcopy = dict(options.__dict__) optcopy['jobs'] = 1 + del optcopy['blacklist'] if optcopy['with_hg'] is None: optcopy['with_hg'] = os.path.join(BINDIR, "hg") optcopy.pop('anycoverage', None)