Mercurial > hg
comparison tests/run-tests.py @ 7785:660c8dd44060
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 |
comparison
equal
deleted
inserted
replaced
| 7784:8a217626bb0c | 7785:660c8dd44060 |
|---|---|
| 481 | 481 |
| 482 if options.with_hg: | 482 if options.with_hg: |
| 483 INST = options.with_hg | 483 INST = options.with_hg |
| 484 else: | 484 else: |
| 485 INST = os.path.join(HGTMP, "install") | 485 INST = os.path.join(HGTMP, "install") |
| 486 BINDIR = os.path.join(INST, "bin") | 486 BINDIR = os.environ["BINDIR"] = os.path.join(INST, "bin") |
| 487 PYTHONDIR = os.path.join(INST, "lib", "python") | 487 PYTHONDIR = os.path.join(INST, "lib", "python") |
| 488 COVERAGE_FILE = os.path.join(TESTDIR, ".coverage") | 488 COVERAGE_FILE = os.path.join(TESTDIR, ".coverage") |
| 489 | 489 |
| 490 def _hgpath(): | 490 def _hgpath(): |
| 491 cmd = '%s -c "import mercurial; print mercurial.__path__[0]"' | 491 cmd = '%s -c "import mercurial; print mercurial.__path__[0]"' |