facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-07 07:17:55 +03:00
Code Issues Projects Releases Wiki Activity

run-tests.py: fix handling of symlink to the right python

Browse Source 
Before: a symlink for python in BINDIR was sometimes created, but it was never
updated when a different Python was used and it was never removed. An invalid
python could thus be left around and used when testing with --local.

Now: the symlink is removed when wrong and created when necessary.

The mechanism for finding the right name (python or python.exe) also had to be
simplified and made more explicit.
This commit is contained in:
Mads Kiilerich 2013-01-07 02:14:41 +01:00
parent ad252eff44
commit 1c79de5503
1 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
tests/run-tests.py
View File

@ -356,33 +356,35 @@ def cleanup(options):
def usecorrectpython():
# some tests run python interpreter. they must use same
# interpreter we use or bad things will happen.
exedir, exename = os.path.split(sys.executable)
if exename in ('python', 'python.exe'):
path = findprogram(exename)
if os.path.dirname(path) == exedir:
return
else:
exename = 'python'
if sys.platform == 'win32':
exename = 'python.exe'
pyexename = sys.platform == 'win32' and 'python.exe' or 'python'
if getattr(os, 'symlink', None):
vlog("# Making python executable in test path a symlink to '%s'" %
sys.executable)
mypython = os.path.join(BINDIR, exename)
mypython = os.path.join(BINDIR, pyexename)
try:
os.symlink(sys.executable, mypython)
if os.readlink(mypython) == sys.executable:
return
os.unlink(mypython)
except OSError, err:
# child processes may race, which is harmless
if err.errno != errno.EEXIST:
if err.errno != errno.ENOENT:
raise
if findprogram(pyexename) != sys.executable:
try:
os.symlink(sys.executable, mypython)
except OSError, err:
# child processes may race, which is harmless
if err.errno != errno.EEXIST:
raise
else:
vlog("# Modifying search path to find %s in '%s'" % (exename, exedir))
exedir, exename = os.path.split(sys.executable)
vlog("# Modifying search path to find %s as %s in '%s'" %
(exename, pyexename, exedir))
path = os.environ['PATH'].split(os.pathsep)
while exedir in path:
path.remove(exedir)
os.environ['PATH'] = os.pathsep.join([exedir] + path)
if not findprogram(exename):
print "WARNING: Cannot find %s in search path" % exename
if not findprogram(pyexename):
print "WARNING: Cannot find %s in search path" % pyexename
def installhg(options):
vlog("# Performing temporary installation of HG")