comparison tests/run-tests.py @ 47574:2b2f5cf979c3

run-tests: explicitly track that `pythondir` was inferred

If we want to know that something happened, we should simply track that this
things happened.

This will be useful to start using `tmpbindir` more in a different form.

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

47573:75b623801f6a

        self._hgtmp = None
        self._installdir = None
        self._bindir = None
        self._tmpbindir = None
        self._pythondir = None
        self._coveragefile = None
        self._createdfiles = []
        self._hgcommand = None
        self._hgpath = None
        self._portoffset = 0

            elif re.search(b'/rust/target/[^/]+/hg', normbin):
                self._pythondir = os.path.dirname(self._testdir)
            # Fall back to the legacy behavior.
            else:
                self._pythondir = self._bindir

        else:
            self._installdir = os.path.join(self._hgtmp, b"install")
            self._bindir = os.path.join(self._installdir, b"bin")
            self._hgcommand = b'hg'

            osenvironb[b'COVERAGE_DIR'] = covdir

    def _checkhglib(self, verb):
        """Ensure that the 'mercurial' package imported by python is
        the one we expect it to be.  If not, print a warning to stderr."""
        if (self._bindir == self._pythondir) and (
            self._bindir != self._tmpbindir
        ):
            # The pythondir has been inferred from --with-hg flag.
            # We cannot expect anything sensible here.
            return
        expecthg = os.path.join(self._pythondir, b'mercurial')
        actualhg = self._gethgpath()

47574:2b2f5cf979c3

        self._hgtmp = None
        self._installdir = None
        self._bindir = None
        self._tmpbindir = None
        self._pythondir = None
        # True if we had to infer the pythondir from --with-hg
        self._pythondir_inferred = False
        self._coveragefile = None
        self._createdfiles = []
        self._hgcommand = None
        self._hgpath = None
        self._portoffset = 0

            elif re.search(b'/rust/target/[^/]+/hg', normbin):
                self._pythondir = os.path.dirname(self._testdir)
            # Fall back to the legacy behavior.
            else:
                self._pythondir = self._bindir
            self._pythondir_inferred = True

        else:
            self._installdir = os.path.join(self._hgtmp, b"install")
            self._bindir = os.path.join(self._installdir, b"bin")
            self._hgcommand = b'hg'

            osenvironb[b'COVERAGE_DIR'] = covdir

    def _checkhglib(self, verb):
        """Ensure that the 'mercurial' package imported by python is
        the one we expect it to be.  If not, print a warning to stderr."""
        if self._pythondir_inferred:
            # The pythondir has been inferred from --with-hg flag.
            # We cannot expect anything sensible here.
            return
        expecthg = os.path.join(self._pythondir, b'mercurial')
        actualhg = self._gethgpath()