|
|
|
@ -2097,7 +2097,10 @@ def CMDtry(parser, args):
|
|
|
|
parser.error('No default try builder to try, use --bot')
|
|
|
|
parser.error('No default try builder to try, use --bot')
|
|
|
|
|
|
|
|
|
|
|
|
builders_and_tests = {}
|
|
|
|
builders_and_tests = {}
|
|
|
|
for bot in options.bot:
|
|
|
|
old_style = filter(lambda x: isinstance(x, basestring), options.bot)
|
|
|
|
|
|
|
|
new_style = filter(lambda x: isinstance(x, tuple), options.bot)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
for bot in old_style:
|
|
|
|
if ':' in bot:
|
|
|
|
if ':' in bot:
|
|
|
|
builder, tests = bot.split(':', 1)
|
|
|
|
builder, tests = bot.split(':', 1)
|
|
|
|
builders_and_tests.setdefault(builder, []).extend(tests.split(','))
|
|
|
|
builders_and_tests.setdefault(builder, []).extend(tests.split(','))
|
|
|
|
@ -2106,6 +2109,9 @@ def CMDtry(parser, args):
|
|
|
|
else:
|
|
|
|
else:
|
|
|
|
builders_and_tests.setdefault(bot, []).append('defaulttests')
|
|
|
|
builders_and_tests.setdefault(bot, []).append('defaulttests')
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
for bot, tests in new_style:
|
|
|
|
|
|
|
|
builders_and_tests.setdefault(bot, []).extend(tests)
|
|
|
|
|
|
|
|
|
|
|
|
if options.testfilter:
|
|
|
|
if options.testfilter:
|
|
|
|
forced_tests = sum((t.split(',') for t in options.testfilter), [])
|
|
|
|
forced_tests = sum((t.split(',') for t in options.testfilter), [])
|
|
|
|
builders_and_tests = dict(
|
|
|
|
builders_and_tests = dict(
|
|
|
|
|