Mercurial > hg-stable

changeset 21733:9ad11d5bcc2f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Tue, 10 Jun 2014 14:32:52 -0700
parents b6192ea7f7fd
children 34e0bd895afc
files tests/run-tests.py
diffstat 1 files changed, 5 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/tests/run-tests.py	Fri May 30 12:09:49 2014 -0700
+++ b/tests/run-tests.py	Tue Jun 10 14:32:52 2014 -0700
@@ -1724,6 +1724,11 @@
     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):