This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11045

run-tests: cleanup windows generation of the python / python3 pointeur
ClosedPublic

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

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGc3c38eb08465: run-tests: cleanup windows generation of the python / python3 pointeur
Summary

They are no need to generate then in RUNTESTDIR and we don't need a python2
executable. (because not test ever use python2 explicitly).

This is probably still not perfect, but at least it is better.

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 29080.Jul 9 2021, 9:21 PM

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

baymax updated this revision to Diff 29100.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 29133.
marmoute added a commit: rHGc3c38eb08465: run-tests: cleanup windows generation of the python / python3 pointeur.Jul 11 2021, 10:48 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGc3c38eb08465: run-tests: cleanup windows generation of the python / python3 pointeur (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

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

Diff 29191

tests/run-tests.py

if err.errno != errno.EEXIST: if err.errno != errno.EEXIST:
raise raise
else: else:
# Windows doesn't have `python3.exe`, and MSYS cannot understand the # Windows doesn't have `python3.exe`, and MSYS cannot understand the
# reparse point with that name provided by Microsoft. Create a # reparse point with that name provided by Microsoft. Create a
# simple script on PATH with that name that delegates to the py3 # simple script on PATH with that name that delegates to the py3
# launcher so the shebang lines work. # launcher so the shebang lines work.
if os.getenv('MSYSTEM'): if os.getenv('MSYSTEM'):
with open(osenvironb[b'RUNTESTDIR'] + b'/python3', 'wb') as f: py3exe_name = os.path.join(self._custom_bin_dir, b'python3')
with open(py3exe_name, 'wb') as f:
f.write(b'#!/bin/sh\n') f.write(b'#!/bin/sh\n')
f.write(b'py -3.%d "$@"\n' % sys.version_info[1]) f.write(b'py -3.%d "$@"\n' % sys.version_info[1])
if os.getenv('MSYSTEM'):
with open(osenvironb[b'RUNTESTDIR'] + b'/python2', 'wb') as f: pyexe_name = os.path.join(self._custom_bin_dir, b'python')
with open(pyexe_name, 'wb') as f:
f.write(b'#!/bin/sh\n') f.write(b'#!/bin/sh\n')
f.write(b'py -2.%d "$@"\n' % sys.version_info[1]) f.write(b'py -%d.%d "$@"\n' % sys.version_info[0:2])
exedir, exename = os.path.split(sysexecutable) exedir, exename = os.path.split(sysexecutable)
for pyexename in pyexe_names: for pyexename in pyexe_names:
msg = "# Modifying search path to find %s as %s in '%s'" msg = "# Modifying search path to find %s as %s in '%s'"
msg %= (exename, pyexename, exedir) msg %= (exename, pyexename, exedir)
vlog(msg) vlog(msg)
path = os.environ['PATH'].split(os.pathsep) path = os.environ['PATH'].split(os.pathsep)
while exedir in path: while exedir in path: