126a127,133
>
> parser = argparse.ArgumentParser()
> parser.add_argument('-j', type=int, default=0)
> args, leftovers = parser.parse_known_args(self.args)
> if args.j == 0:
> self.args = ('-j', str(self.main_args.j)) + self.args
>
137,139c144,147
< help='Time limit for each run in seconds.',
< default=0)
< parser.add_argument('-j', type=int, default=1,
---
> help='Time limit for each run in seconds, '
> '0 to disable.',
> default=60)
> parser.add_argument('-j', type=int, default=0,
174a183,184
> j = self.main_args.j if args.j == 0 else args.j
>
176c186
< if args.j == 1:
---
> if j == 1:
179c189
< tp = multiprocessing.pool.ThreadPool(args.j)
---
> tp = multiprocessing.pool.ThreadPool(j)
382,383c392,393
< parser.add_argument('--print-results', action='store_true',
< help='Print a list of tests that passed or failed')
---
> parser.add_argument('--no-print-results', action='store_true',
> help='Don\'t print a list of tests that passed or failed')
455c465
< if args.print_results:
---
> if not args.no_print_results:
484a495,498
> parser.add_argument('-j', type=int, default=1,
> help='Default level of parallelism, can be overriden '
> 'for individual stages')
>