##// END OF EJS Templates
run-tests: move _hgpath() up so it's not in the middle of the main program.
Greg Ward -
r8092:c49578c5 default
parent child Browse files
Show More
@@ -274,6 +274,13 b' def install_hg():'
274 python = '"%s" "%s" -x' % (sys.executable,
274 python = '"%s" "%s" -x' % (sys.executable,
275 os.path.join(TESTDIR,'coverage.py'))
275 os.path.join(TESTDIR,'coverage.py'))
276
276
277 def _hgpath():
278 cmd = '%s -c "import mercurial; print mercurial.__path__[0]"'
279 hgpath = os.popen(cmd % python)
280 path = hgpath.read().strip()
281 hgpath.close()
282 return path
283
277 def output_coverage():
284 def output_coverage():
278 vlog("# Producing coverage report")
285 vlog("# Producing coverage report")
279 omit = [BINDIR, TESTDIR, PYTHONDIR]
286 omit = [BINDIR, TESTDIR, PYTHONDIR]
@@ -525,13 +532,6 b' BINDIR = os.environ["BINDIR"] = os.path.'
525 PYTHONDIR = os.path.join(INST, "lib", "python")
532 PYTHONDIR = os.path.join(INST, "lib", "python")
526 COVERAGE_FILE = os.path.join(TESTDIR, ".coverage")
533 COVERAGE_FILE = os.path.join(TESTDIR, ".coverage")
527
534
528 def _hgpath():
529 cmd = '%s -c "import mercurial; print mercurial.__path__[0]"'
530 hgpath = os.popen(cmd % python)
531 path = hgpath.read().strip()
532 hgpath.close()
533 return path
534
535 expecthg = os.path.join(HGTMP, 'install', 'lib', 'python', 'mercurial')
535 expecthg = os.path.join(HGTMP, 'install', 'lib', 'python', 'mercurial')
536 hgpkg = None
536 hgpkg = None
537
537
General Comments 0
You need to be logged in to leave comments. Login now