This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10702

run-tests: use the same python version for shebang lines on Windows
ClosedPublic

Authored by mharbison72 on May 8 2021, 12:29 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG6f976d54946c: run-tests: use the same python version for shebang lines on Windows
Summary

The latest py3 is used if the minor number isn't specified. After running the
script to install all of the build dependencies, that moved the default from 3.8
to 3.9 on the CI system. That in turn caused a bunch of tests to be skipped
that were running prior, even when the test runner was invoked with py -3.8.
While we should almost always use the latest version, we really shouldn't make
it hard to test different versions or allow things to randomly break in subtle
ways like that.

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

mharbison72 created this revision.May 8 2021, 12:29 AM
mharbison72 added a commit: rHG6f976d54946c: run-tests: use the same python version for shebang lines on Windows.May 14 2021, 4:06 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG6f976d54946c: run-tests: use the same python version for shebang lines on Windows (authored by mharbison72). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

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

Diff 27918

tests/run-tests.py

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: with open(osenvironb[b'RUNTESTDIR'] + b'/python3', 'wb') as f:
f.write(b'#!/bin/sh\n') f.write(b'#!/bin/sh\n')
f.write(b'py -3 "$@"\n') f.write(b'py -3.%d "$@"\n' % sys.version_info[1])
exedir, exename = os.path.split(sysexecutable) exedir, exename = os.path.split(sysexecutable)
vlog( vlog(
"# Modifying search path to find %s as %s in '%s'" "# Modifying search path to find %s as %s in '%s'"
% (exename, pyexename, exedir) % (exename, pyexename, exedir)
) )
path = os.environ['PATH'].split(os.pathsep) path = os.environ['PATH'].split(os.pathsep)
while exedir in path: while exedir in path: