equal
deleted
inserted
replaced
469 hgpkg = None |
469 hgpkg = None |
470 |
470 |
471 def run_children(tests): |
471 def run_children(tests): |
472 if not options.with_hg: |
472 if not options.with_hg: |
473 install_hg() |
473 install_hg() |
|
474 if hgpkg != expecthg: |
|
475 print '# Testing unexpected mercurial: %s' % hgpkg |
474 |
476 |
475 optcopy = dict(options.__dict__) |
477 optcopy = dict(options.__dict__) |
476 optcopy['jobs'] = 1 |
478 optcopy['jobs'] = 1 |
477 optcopy['with_hg'] = INST |
479 optcopy['with_hg'] = INST |
478 opts = [] |
480 opts = [] |
538 |
540 |
539 try: |
541 try: |
540 if not options.with_hg: |
542 if not options.with_hg: |
541 install_hg() |
543 install_hg() |
542 |
544 |
543 if hgpkg != expecthg: |
545 if hgpkg != expecthg: |
544 print '# Testing unexpected mercurial: %s' % hgpkg |
546 print '# Testing unexpected mercurial: %s' % hgpkg |
545 |
547 |
546 if options.timeout > 0: |
548 if options.timeout > 0: |
547 try: |
549 try: |
548 signal.signal(signal.SIGALRM, alarmed) |
550 signal.signal(signal.SIGALRM, alarmed) |
549 vlog('# Running tests with %d-second timeout' % |
551 vlog('# Running tests with %d-second timeout' % |