[PATCH 1 of 3] run-tests: make runnable when --with-hg is set

[Martin Geisler]

Simon Heimberg <simohe at besonet.ch> writes:

> # HG changeset patch
> # User Simon Heimberg <simohe at besonet.ch>
> # Date 1240384045 -7200
> # Node ID 85abf8746a72d4398ff1dd3359824d2f178c7b48
> # Parent  87a1605979e477dbf35b27b1e6b6e122db2c9fbf
> run-tests: make runnable when --with-hg is set

I believe Greg Ward is also looking into this right now, so maybe you
two should coordinate?

> variable hgpkg was not set
> set environment variable PATH
>
> diff -r 87a1605979e4 -r 85abf8746a72 tests/run-tests.py
> --- a/tests/run-tests.py	Mit Apr 22 02:01:22 2009 +0200
> +++ b/tests/run-tests.py	Mit Apr 22 09:07:25 2009 +0200
> @@ -84,7 +84,7 @@
>      parser.add_option("-n", "--nodiff", action="store_true",
>          help="skip showing test changes")
>      parser.add_option("--with-hg", type="string",
> -        help="test existing install at given location")
> +        help="test existing install at given location (- for installation in PATH)")

I would prefer that --with-hg takes the binary directly so that I can
do --with-hg=~/bin/hg. Looking for a hg in PATH and supporting
directories seems overkill, but maybe that is just me? :-)

> @@ -512,12 +530,11 @@
>      tests.reverse()
>      jobs = [[] for j in xrange(options.jobs)]
>      while tests:
> -        for j in xrange(options.jobs):
> +        for job in jobs:
>              if not tests: break
> -            jobs[j].append(tests.pop())
> +            job.append(tests.pop())

Do the changes immediatedly above and below have anything to do with
the --with-hg changes?

>      fps = {}
> -    for j in xrange(len(jobs)):
> -        job = jobs[j]
> +    for j, job in enumerate(jobs):
>          if not job:
>              continue
>          rfd, wfd = os.pipe()
> @@ -563,9 +580,13 @@
>      HGRCPATH = os.environ["HGRCPATH"] = os.path.join(HGTMP, '.hgrc')

-- 
Martin Geisler

VIFF (Virtual Ideal Functionality Framework) brings easy and efficient
SMPC (Secure Multiparty Computation) to Python. See: http://viff.dk/.