~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Martin
  • Date: 2010-08-29 19:38:21 UTC
  • mto: This revision was merged to the branch mainline in revision 5425.
  • Revision ID: gzlist@googlemail.com-20100829193821-uak2mhlr9eqthv3i
Give nice error if --parallel=fork is used on a forkless platform

Show diffs side-by-side

added added

removed removed

Lines of Context:
3570
3570
            randomize=None, exclude=None, strict=False,
3571
3571
            load_list=None, debugflag=None, starting_with=None, subunit=False,
3572
3572
            parallel=None, lsprof_tests=False):
3573
 
        from bzrlib.tests import selftest
 
3573
        from bzrlib.tests import parallel_registry, selftest
3574
3574
 
3575
3575
        # Make deprecation warnings visible, unless -Werror is set
3576
3576
        symbol_versioning.activate_deprecation_warnings(override=False)
3596
3596
                import msvcrt
3597
3597
                msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
3598
3598
        if parallel:
 
3599
            if (parallel is parallel_registry.get("fork")
 
3600
                    and getattr(os, "fork", None) is None):
 
3601
                raise errors.BzrCommandError("platform does not support fork,"
 
3602
                    " try --parallel=subprocess instead.")
3599
3603
            self.additional_selftest_args.setdefault(
3600
3604
                'suite_decorators', []).append(parallel)
3601
3605
        if benchmark: