/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
3691
3691
                     Option('randomize', type=str, argname="SEED",
3692
3692
                            help='Randomize the order of tests using the given'
3693
3693
                                 ' seed or "now" for the current time.'),
3694
 
                     Option('exclude', type=str, argname="PATTERN",
3695
 
                            short_name='x',
3696
 
                            help='Exclude tests that match this regular'
3697
 
                                 ' expression.'),
 
3694
                     ListOption('exclude', type=str, argname="PATTERN",
 
3695
                                short_name='x',
 
3696
                                help='Exclude tests that match this regular'
 
3697
                                ' expression.'),
3698
3698
                     Option('subunit',
3699
3699
                        help='Output test progress via subunit.'),
3700
3700
                     Option('strict', help='Fail on missing dependencies or '
3754
3754
                "--benchmark is no longer supported from bzr 2.2; "
3755
3755
                "use bzr-usertest instead")
3756
3756
        test_suite_factory = None
 
3757
        if not exclude:
 
3758
            exclude_pattern = None
 
3759
        else:
 
3760
            exclude_pattern = '(' + '|'.join(exclude) + ')'
3757
3761
        selftest_kwargs = {"verbose": verbose,
3758
3762
                          "pattern": pattern,
3759
3763
                          "stop_on_failure": one,
3764
3768
                          "matching_tests_first": first,
3765
3769
                          "list_only": list_only,
3766
3770
                          "random_seed": randomize,
3767
 
                          "exclude_pattern": exclude,
 
3771
                          "exclude_pattern": exclude_pattern,
3768
3772
                          "strict": strict,
3769
3773
                          "load_list": load_list,
3770
3774
                          "debug_flags": debugflag,