run-tests: fix heredoctest for out-of-tree extensions stable
authorPatrick Mezard <patrick@mezard.eu>
Sat, 15 Feb 2014 15:28:32 +0100
branchstable
changeset 1341 c559280de767
parent 1340 fd5aa85ac2b9
child 1342 64c56144ce88
child 1343 958582800276
run-tests: fix heredoctest for out-of-tree extensions heredoctest.py directory must be in python path to use heredoctest (>>>) in out-of-tree extension tests like: $ cd ext/tests $ python /some/hg/install/tests/run-tests.py test-ext.t [ original upstream message ]
tests/run-tests.py
--- a/tests/run-tests.py	Thu Feb 13 08:29:44 2014 +0100
+++ b/tests/run-tests.py	Sat Feb 15 15:28:32 2014 +0100
@@ -1264,8 +1264,9 @@
 
     # Include TESTDIR in PYTHONPATH so that out-of-tree extensions
     # can run .../tests/run-tests.py test-foo where test-foo
-    # adds an extension to HGRC
-    pypath = [PYTHONDIR, TESTDIR]
+    # adds an extension to HGRC. Also include run-test.py directory to import
+    # modules like heredoctest.
+    pypath = [PYTHONDIR, TESTDIR, os.path.abspath(os.path.dirname(__file__))]
     # We have to augment PYTHONPATH, rather than simply replacing
     # it, in case external libraries are only available via current
     # PYTHONPATH.  (In particular, the Subversion bindings on OS X