comparison tests/run-tests.py @ 47584:ee1fc8f970e6

run-tests: introduce a `HGTEST_REAL_HG` variable for test

It turns out that currently, `hg` and `which hg` can point to different things
because `hg` is an alias… This is annoying because script and pieces of test
are unknowingly using the wrong `hg`.

We will fix it in another changeset. However some test actually need to use a
real `hg` binary and not some `chg` or `rhg` equivalent. So we introduce a new
variable with the right value and we put it to us in the appropriate location.

Differential Revision: https://phab.mercurial-scm.org/D11049

47583:05abe1ff1edd

        # enabled by hg.exe, and this is a more realistic way to launch hg
        # anyway.
        if WINDOWS and not self._hgcommand.endswith(b'.exe'):
            self._hgcommand += b'.exe'

        # set CHGHG, then replace "hg" command by "chg"
        chgbindir = self._bindir
        if self.options.chg or self.options.with_chg:
            osenvironb[b'CHGHG'] = os.path.join(self._bindir, self._hgcommand)
        else:
            osenvironb.pop(b'CHGHG', None)  # drop flag for hghave
        if self.options.chg:
            self._hgcommand = b'chg'
        elif self.options.with_chg:

            # Affects configuration. Alternatives would be setting configuration through
            # `$HGRCPATH` but some tests override that, or changing `_hgcommand` to include
            # `--config` but that disrupts tests that print command lines and check expected
            # output.
            osenvironb[b'RHG_ON_UNSUPPORTED'] = b'fallback'
            osenvironb[b'RHG_FALLBACK_EXECUTABLE'] = os.path.join(
                self._bindir, self._hgcommand
            )
        if self.options.rhg:
            self._hgcommand = b'rhg'
        elif self.options.with_rhg:
            rhgbindir = os.path.dirname(os.path.realpath(self.options.with_rhg))
            self._hgcommand = os.path.basename(self.options.with_rhg)

47584:ee1fc8f970e6

        # enabled by hg.exe, and this is a more realistic way to launch hg
        # anyway.
        if WINDOWS and not self._hgcommand.endswith(b'.exe'):
            self._hgcommand += b'.exe'

        real_hg = os.path.join(self._bindir, self._hgcommand)
        osenvironb[b'HGTEST_REAL_HG'] = real_hg
        # set CHGHG, then replace "hg" command by "chg"
        chgbindir = self._bindir
        if self.options.chg or self.options.with_chg:
            osenvironb[b'CHGHG'] = real_hg
        else:
            osenvironb.pop(b'CHGHG', None)  # drop flag for hghave
        if self.options.chg:
            self._hgcommand = b'chg'
        elif self.options.with_chg:

            # Affects configuration. Alternatives would be setting configuration through
            # `$HGRCPATH` but some tests override that, or changing `_hgcommand` to include
            # `--config` but that disrupts tests that print command lines and check expected
            # output.
            osenvironb[b'RHG_ON_UNSUPPORTED'] = b'fallback'
            osenvironb[b'RHG_FALLBACK_EXECUTABLE'] = real_hg
        if self.options.rhg:
            self._hgcommand = b'rhg'
        elif self.options.with_rhg:
            rhgbindir = os.path.dirname(os.path.realpath(self.options.with_rhg))
            self._hgcommand = os.path.basename(self.options.with_rhg)