This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11044

run-tests: always define a custom-bin directory
ClosedPublic

Authored by marmoute on Jul 9 2021, 8:34 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG27fb9f32e1a3: run-tests: always define a custom-bin directory
Summary

We are always generating python / python3 executable and we will soon often
generate a hg executable. So let's always make it a thing. This will help us
to make sure we have the appropriate binary available to all script. On both
linux and Windows.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

marmoute created this revision.Jul 9 2021, 8:34 PM
baymax updated this revision to Diff 29079.Jul 9 2021, 9:21 PM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

baymax updated this revision to Diff 29099.Jul 9 2021, 11:41 PM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

marmoute edited the summary of this revision. (Show Details)Jul 10 2021, 1:46 PM
marmoute updated this revision to Diff 29132.
marmoute added a commit: rHG27fb9f32e1a3: run-tests: always define a custom-bin directory.Jul 11 2021, 10:47 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG27fb9f32e1a3: run-tests: always define a custom-bin directory (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/run-tests.py (14 lines)

Diff 29190

tests/run-tests.py

def __init__(self): def __init__(self):
self.options = None self.options = None
self._hgroot = None self._hgroot = None
self._testdir = None self._testdir = None
self._outputdir = None self._outputdir = None
self._hgtmp = None self._hgtmp = None
self._installdir = None self._installdir = None
self._bindir = None self._bindir = None
self._tmpbindir = None # a place for run-tests.py to generate executable it needs
self._custom_bin_dir = None
self._pythondir = None self._pythondir = None
# True if we had to infer the pythondir from --with-hg # True if we had to infer the pythondir from --with-hg
self._pythondir_inferred = False self._pythondir_inferred = False
self._coveragefile = None self._coveragefile = None
self._createdfiles = [] self._createdfiles = []
self._hgcommand = None self._hgcommand = None
self._hgpath = None self._hgpath = None
self._portoffset = 0 self._portoffset = 0
if WINDOWS: if WINDOWS:
# without this, we get the default temp dir location, but # without this, we get the default temp dir location, but
# in all lowercase, which causes troubles with paths (issue3490) # in all lowercase, which causes troubles with paths (issue3490)
d = osenvironb.get(b'TMP', None) d = osenvironb.get(b'TMP', None)
tmpdir = tempfile.mkdtemp(b'', b'hgtests.', d) tmpdir = tempfile.mkdtemp(b'', b'hgtests.', d)
self._hgtmp = osenvironb[b'HGTMP'] = os.path.realpath(tmpdir) self._hgtmp = osenvironb[b'HGTMP'] = os.path.realpath(tmpdir)
self._custom_bin_dir = os.path.join(self._hgtmp, b'custom-bin')
os.makedirs(self._custom_bin_dir)
if self.options.with_hg: if self.options.with_hg:
self._installdir = None self._installdir = None
whg = self.options.with_hg whg = self.options.with_hg
self._bindir = os.path.dirname(os.path.realpath(whg)) self._bindir = os.path.dirname(os.path.realpath(whg))
assert isinstance(self._bindir, bytes) assert isinstance(self._bindir, bytes)
self._hgcommand = os.path.basename(whg) self._hgcommand = os.path.basename(whg)
self._tmpbindir = os.path.join(self._hgtmp, b'install', b'bin')
os.makedirs(self._tmpbindir)
normbin = os.path.normpath(os.path.abspath(whg)) normbin = os.path.normpath(os.path.abspath(whg))
normbin = normbin.replace(_sys2bytes(os.sep), b'/') normbin = normbin.replace(_sys2bytes(os.sep), b'/')
# Other Python scripts in the test harness need to # Other Python scripts in the test harness need to
# `import mercurial`. If `hg` is a Python script, we assume # `import mercurial`. If `hg` is a Python script, we assume
# the Mercurial modules are relative to its path and tell the tests # the Mercurial modules are relative to its path and tell the tests
# to load Python modules from its directory. # to load Python modules from its directory.
else: else:
self._pythondir = self._bindir self._pythondir = self._bindir
self._pythondir_inferred = True self._pythondir_inferred = True
else: else:
self._installdir = os.path.join(self._hgtmp, b"install") self._installdir = os.path.join(self._hgtmp, b"install")
self._bindir = os.path.join(self._installdir, b"bin") self._bindir = os.path.join(self._installdir, b"bin")
self._hgcommand = b'hg' self._hgcommand = b'hg'
self._tmpbindir = self._bindir
self._pythondir = os.path.join(self._installdir, b"lib", b"python") self._pythondir = os.path.join(self._installdir, b"lib", b"python")
# Force the use of hg.exe instead of relying on MSYS to recognize hg is # Force the use of hg.exe instead of relying on MSYS to recognize hg is
# a python script and feed it to python.exe. Legacy stdio is force # a python script and feed it to python.exe. Legacy stdio is force
# enabled by hg.exe, and this is a more realistic way to launch hg # enabled by hg.exe, and this is a more realistic way to launch hg
# anyway. # anyway.
if WINDOWS and not self._hgcommand.endswith(b'.exe'): if WINDOWS and not self._hgcommand.endswith(b'.exe'):
self._hgcommand += b'.exe' self._hgcommand += b'.exe'
realdir = os.path.abspath(os.path.dirname(realfile)) realdir = os.path.abspath(os.path.dirname(realfile))
path.insert(2, realdir) path.insert(2, realdir)
if chgbindir != self._bindir: if chgbindir != self._bindir:
path.insert(1, chgbindir) path.insert(1, chgbindir)
if rhgbindir != self._bindir: if rhgbindir != self._bindir:
path.insert(1, rhgbindir) path.insert(1, rhgbindir)
if self._testdir != runtestdir: if self._testdir != runtestdir:
path = [self._testdir] + path path = [self._testdir] + path
if self._tmpbindir != self._bindir: path = [self._custom_bin_dir] + path
path = [self._tmpbindir] + path
osenvironb[b"PATH"] = sepb.join(path) osenvironb[b"PATH"] = sepb.join(path)
# Include TESTDIR in PYTHONPATH so that out-of-tree extensions # Include TESTDIR in PYTHONPATH so that out-of-tree extensions
# can run .../tests/run-tests.py test-foo where test-foo # can run .../tests/run-tests.py test-foo where test-foo
# adds an extension to HGRC. Also include run-test.py directory to # adds an extension to HGRC. Also include run-test.py directory to
# import modules like heredoctest. # import modules like heredoctest.
pypath = [self._pythondir, self._testdir, runtestdir] pypath = [self._pythondir, self._testdir, runtestdir]
# We have to augment PYTHONPATH, rather than simply replacing # We have to augment PYTHONPATH, rather than simply replacing
# os.symlink() is a thing with py3 on Windows, but it requires # os.symlink() is a thing with py3 on Windows, but it requires
# Administrator rights. # Administrator rights.
if getattr(os, 'symlink', None) and not WINDOWS: if getattr(os, 'symlink', None) and not WINDOWS:
msg = "# Making python executable in test path a symlink to '%s'" msg = "# Making python executable in test path a symlink to '%s'"
msg %= sysexecutable msg %= sysexecutable
vlog(msg) vlog(msg)
for pyexename in pyexe_names: for pyexename in pyexe_names:
mypython = os.path.join(self._tmpbindir, pyexename) mypython = os.path.join(self._custom_bin_dir, pyexename)
try: try:
if os.readlink(mypython) == sysexecutable: if os.readlink(mypython) == sysexecutable:
continue continue
os.unlink(mypython) os.unlink(mypython)
except OSError as err: except OSError as err:
if err.errno != errno.ENOENT: if err.errno != errno.ENOENT:
raise raise
if self._findprogram(pyexename) != sysexecutable: if self._findprogram(pyexename) != sysexecutable: