Mercurial > public > mercurial-scm > hg

diff tests/run-tests.py @ 7785:660c8dd44060

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-merge-tool: Make sure no hgmerge can be found in $PATH The merge tool selecting algorithm is hardcoded to look for hgmerge in $PATH before it falls back to use internal merge. This fixes the test for this fallback to be tolerant to existing hgmerges.
author Mads Kiilerich <mads@kiilerich.com>
date Tue, 10 Feb 2009 22:47:38 +0100
parents 5fb312ba29a8
children cf427b04d5c0
line wrap: on
line diff
--- a/tests/run-tests.py	Mon Feb 16 17:37:23 2009 -0600
+++ b/tests/run-tests.py	Tue Feb 10 22:47:38 2009 +0100
@@ -483,7 +483,7 @@
     INST = options.with_hg
 else:
     INST = os.path.join(HGTMP, "install")
-BINDIR = os.path.join(INST, "bin")
+BINDIR = os.environ["BINDIR"] = os.path.join(INST, "bin")
 PYTHONDIR = os.path.join(INST, "lib", "python")
 COVERAGE_FILE = os.path.join(TESTDIR, ".coverage")