This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11277

run-tests: introduce a --pyoxidized option
ClosedPublic

Authored by marmoute on Aug 10 2021, 7:35 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG83235fb50e1c: run-tests: introduce a --pyoxidized option
Summary

This options make it possible to use the pyoxidizer version to run the tests.
This is a first basic version that is windows only.

The test needs a working python, with Mercurial installed. However the
pyoxidizer product is "self contains" without a "usable" Python. There have been
discussion to have a fully functional hg admin::python command providing a
fully functional python interpreter, but nothing is of the sort is ready yet. In

In the meantime we use an hybrid approach, similar to what we do for testing
rhg. We install a full "normal" Mercurial, but also the pyxodizer product as
the official hg binary. That way, we use the pyoxidizer version or everything,
but test that needs to run python have it available, with a fully functional
Mercurial package.

This first version is pretty basic (Windows only, no --local, not
--with-pyoxidized), but it runs, various bug that we will have to fix.

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.Aug 10 2021, 7:35 AM
marmoute added a commit: rHG83235fb50e1c: run-tests: introduce a --pyoxidized option.Aug 10 2021, 10:08 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG83235fb50e1c: run-tests: introduce a --pyoxidized option (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

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

Diff 29885

tests/run-tests.py

action="store_true", action="store_true",
help="show chg debug logs", help="show chg debug logs",
) )
hgconf.add_argument( hgconf.add_argument(
"--rhg", "--rhg",
action="store_true", action="store_true",
help="install and use rhg Rust implementation in place of hg", help="install and use rhg Rust implementation in place of hg",
) )
hgconf.add_argument(
"--pyoxidized",
action="store_true",
help="build the hg binary using pyoxidizer",
)
hgconf.add_argument("--compiler", help="compiler to build with") hgconf.add_argument("--compiler", help="compiler to build with")
hgconf.add_argument( hgconf.add_argument(
'--extra-config-opt', '--extra-config-opt',
action="append", action="append",
default=[], default=[],
help='set the given config opt in the test hgrc', help='set the given config opt in the test hgrc',
) )
hgconf.add_argument( hgconf.add_argument(
if options.rust and options.no_rust: if options.rust and options.no_rust:
parser.error('--rust cannot be used with --no-rust') parser.error('--rust cannot be used with --no-rust')
if options.local: if options.local:
if options.with_hg or options.with_rhg or options.with_chg: if options.with_hg or options.with_rhg or options.with_chg:
parser.error( parser.error(
'--local cannot be used with --with-hg or --with-rhg or --with-chg' '--local cannot be used with --with-hg or --with-rhg or --with-chg'
) )
if options.pyoxidized:
parser.error('--pyoxidized does not work with --local (yet)')
testdir = os.path.dirname(_sys2bytes(canonpath(sys.argv[0]))) testdir = os.path.dirname(_sys2bytes(canonpath(sys.argv[0])))
reporootdir = os.path.dirname(testdir) reporootdir = os.path.dirname(testdir)
pathandattrs = [(b'hg', 'with_hg')] pathandattrs = [(b'hg', 'with_hg')]
if options.chg: if options.chg:
pathandattrs.append((b'contrib/chg/chg', 'with_chg')) pathandattrs.append((b'contrib/chg/chg', 'with_chg'))
if options.rhg: if options.rhg:
pathandattrs.append((b'rust/target/release/rhg', 'with_rhg')) pathandattrs.append((b'rust/target/release/rhg', 'with_rhg'))
for relpath, attr in pathandattrs: for relpath, attr in pathandattrs:
msg %= _bytes2sys(os.path.basename(options.with_hg)) msg %= _bytes2sys(os.path.basename(options.with_hg))
sys.stderr.write(msg) sys.stderr.write(msg)
sys.stderr.flush() sys.stderr.flush()
if (options.chg or options.with_chg) and WINDOWS: if (options.chg or options.with_chg) and WINDOWS:
parser.error('chg does not work on %s' % os.name) parser.error('chg does not work on %s' % os.name)
if (options.rhg or options.with_rhg) and WINDOWS: if (options.rhg or options.with_rhg) and WINDOWS:
parser.error('rhg does not work on %s' % os.name) parser.error('rhg does not work on %s' % os.name)
if options.pyoxidized and not WINDOWS:
parser.error('--pyoxidized is currently Windows only')
if options.with_chg: if options.with_chg:
options.chg = False # no installation to temporary location options.chg = False # no installation to temporary location
options.with_chg = canonpath(_sys2bytes(options.with_chg)) options.with_chg = canonpath(_sys2bytes(options.with_chg))
if not ( if not (
os.path.isfile(options.with_chg) os.path.isfile(options.with_chg)
and os.access(options.with_chg, os.X_OK) and os.access(options.with_chg, os.X_OK)
): ):
parser.error('--with-chg must specify a chg executable') parser.error('--with-chg must specify a chg executable')
# drop flag for hghave # drop flag for hghave
osenvironb.pop(b'RHG_INSTALLED_AS_HG', None) osenvironb.pop(b'RHG_INSTALLED_AS_HG', None)
if self.options.rhg: if self.options.rhg:
self._hgcommand = b'rhg' self._hgcommand = b'rhg'
elif self.options.with_rhg: elif self.options.with_rhg:
rhgbindir = os.path.dirname(os.path.realpath(self.options.with_rhg)) rhgbindir = os.path.dirname(os.path.realpath(self.options.with_rhg))
self._hgcommand = os.path.basename(self.options.with_rhg) self._hgcommand = os.path.basename(self.options.with_rhg)
if self.options.pyoxidized:
testdir = os.path.dirname(_sys2bytes(canonpath(sys.argv[0])))
reporootdir = os.path.dirname(testdir)
# XXX we should ideally install stuff instead of using the local build
bin_path = (
b'build/pyoxidizer/x86_64-pc-windows-msvc/release/app/hg.exe'
)
full_path = os.path.join(reporootdir, bin_path)
self._hgcommand = full_path
osenvironb[b"BINDIR"] = self._bindir osenvironb[b"BINDIR"] = self._bindir
osenvironb[b"PYTHON"] = PYTHON osenvironb[b"PYTHON"] = PYTHON
fileb = _sys2bytes(__file__) fileb = _sys2bytes(__file__)
runtestdir = os.path.abspath(os.path.dirname(fileb)) runtestdir = os.path.abspath(os.path.dirname(fileb))
osenvironb[b'RUNTESTDIR'] = runtestdir osenvironb[b'RUNTESTDIR'] = runtestdir
if PYTHON3: if PYTHON3:
sepb = _sys2bytes(os.pathsep) sepb = _sys2bytes(os.pathsep)
self._installhg() self._installhg()
self._checkhglib("Testing") self._checkhglib("Testing")
if self.options.chg: if self.options.chg:
assert self._installdir assert self._installdir
self._installchg() self._installchg()
if self.options.rhg: if self.options.rhg:
assert self._installdir assert self._installdir
self._installrhg() self._installrhg()
elif self.options.pyoxidized:
self._build_pyoxidized()
self._use_correct_mercurial() self._use_correct_mercurial()
log( log(
'running %d tests using %d parallel processes' 'running %d tests using %d parallel processes'
% (num_tests, jobs) % (num_tests, jobs)
) )
result = runner.run(suite) result = runner.run(suite)
out, _err = proc.communicate() out, _err = proc.communicate()
if proc.returncode != 0: if proc.returncode != 0:
if PYTHON3: if PYTHON3:
sys.stdout.buffer.write(out) sys.stdout.buffer.write(out)
else: else:
sys.stdout.write(out) sys.stdout.write(out)
sys.exit(1) sys.exit(1)
def _build_pyoxidized(self):
"""build a pyoxidized version of mercurial into the test environment
Ideally this function would be `install_pyoxidier` and would both build
and install pyoxidier. However we are starting small to get pyoxidizer
build binary to testing quickly.
"""
vlog('# build a pyoxidized version of Mercurial')
assert os.path.dirname(self._bindir) == self._installdir
assert self._hgroot, 'must be called after _installhg()'
cmd = b'"%(make)s" pyoxidizer' % {
b'make': b'make',
}
cwd = self._hgroot
vlog("# Running", cmd)
proc = subprocess.Popen(
_bytes2sys(cmd),
shell=True,
cwd=_bytes2sys(cwd),
stdin=subprocess.PIPE,
stdout=subprocess.PIPE,
stderr=subprocess.STDOUT,
)
out, _err = proc.communicate()
if proc.returncode != 0:
if PYTHON3:
sys.stdout.buffer.write(out)
else:
sys.stdout.write(out)
sys.exit(1)
def _outputcoverage(self): def _outputcoverage(self):
"""Produce code coverage output.""" """Produce code coverage output."""
import coverage import coverage
coverage = coverage.coverage coverage = coverage.coverage
vlog('# Producing coverage report') vlog('# Producing coverage report')
# chdir is the easiest way to get short, relative paths in the # chdir is the easiest way to get short, relative paths in the