##// END OF EJS Templates
run-tests: fix _checkhglib() so it's correct when using --with-hg....
Greg Ward -
r8673:a8066f2f default
parent child Browse files
Show More
@@ -503,11 +503,13 b' def _gethgpath():'
503
503
504 def _checkhglib(verb):
504 def _checkhglib(verb):
505 """Ensure that the 'mercurial' package imported by python is
505 """Ensure that the 'mercurial' package imported by python is
506 the one we expect it to be. If not, print a message to stdout."""
506 the one we expect it to be. If not, print a warning to stderr."""
507 expecthg = os.path.join(HGTMP, 'install', 'lib', 'python', 'mercurial')
507 expecthg = os.path.join(PYTHONDIR, 'mercurial')
508 actualhg = _gethgpath()
508 actualhg = _gethgpath()
509 if actualhg != expecthg:
509 if actualhg != expecthg:
510 print '# %s unexpected mercurial: %s' % (verb, actualhg)
510 sys.stderr.write('warning: %s with unexpected mercurial lib: %s\n'
511 ' (expected %s)\n'
512 % (verb, actualhg, expecthg))
511
513
512 def runchildren(options, tests):
514 def runchildren(options, tests):
513 if not options.with_hg:
515 if not options.with_hg:
General Comments 0
You need to be logged in to leave comments. Login now