# HG changeset patch # User Pierre-Yves David # Date 2014-06-10 21:32:52 # Node ID 9ad11d5bcc2f75e840b3e8086a176132e1ecf58a # Parent b6192ea7f7fd8186f951214deb54d86a7f9314b0 run-tests: don't check for the mercurial library used when using --with-hg In the ``--with-hg`` case, we cannot properly infer the location of the mercurial library, so we skip the warning completely. diff --git a/tests/run-tests.py b/tests/run-tests.py --- a/tests/run-tests.py +++ b/tests/run-tests.py @@ -1724,6 +1724,11 @@ class TestRunner(object): 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 infered from --with-hg flag. + # We cannot expect anything sensible here + return expecthg = os.path.join(self._pythondir, 'mercurial') actualhg = self._gethgpath() if os.path.abspath(actualhg) != os.path.abspath(expecthg):