[PATCH 7 of 7] run-tests: add HGBINDIR variable to _getreplacements

Yuya Nishihara yuya at tcha.org
Thu Feb 4 08:14:00 EST 2016


On Mon, 01 Feb 2016 22:14:16 -0600, timeless wrote:
> # HG changeset patch
> # User timeless <timeless at mozdev.org>
> # Date 1454078236 0
> #      Fri Jan 29 14:37:16 2016 +0000
> # Node ID 985cddf7c0ec8365c377e9096654d17ee8852b92
> # Parent  a425ffb95dc3e0735e579fe3b34ad49faed293d9
> run-tests: add HGBINDIR variable to _getreplacements
> 
> diff --git a/tests/run-tests.py b/tests/run-tests.py
> --- a/tests/run-tests.py
> +++ b/tests/run-tests.py
> @@ -444,7 +444,8 @@
>                   timeout=defaults['timeout'],
>                   startport=defaults['port'], extraconfigopts=None,
>                   py3kwarnings=False, shell=None,
> -                 slowtimeout=defaults['slowtimeout']):
> +                 slowtimeout=defaults['slowtimeout'],
> +                 bindir=None):
>          """Create a test from parameters.
>  
>          path is the full path to the file defining the test.
> @@ -489,6 +490,7 @@
>          self._startport = startport
>          self._extraconfigopts = extraconfigopts or []
>          self._py3kwarnings = py3kwarnings
> +        self._bindir = bindir
>          self._shell = _bytespath(shell)
>  
>          self._aborted = False
> @@ -723,6 +725,7 @@
>               br'\1 (glob)'),
>              ]
>          r.append((self.escapepath(self._testtmp), b'$TESTTMP'))
> +        r.append((self.escapepath(self._bindir), b'$HGBINDIR'))

It seems we call self._bindir as $BINDIR.

        osenvironb[b"BINDIR"] = self._bindir

> +   $HGBINDIR/mercurial/dispatch.py:* in run (glob)

The test fails without --with-hg=../hg.

+   /tmp/hgtests.9aUBwp/install/lib/python/mercurial/dispatch.py:54     in run
...


More information about the Mercurial-devel mailing list