This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6760

run-tests: handle --local before --with-hg
ClosedPublic

Authored by martinvonz on Aug 23 2019, 5:05 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG69506e1b3214: run-tests: handle --local before --with-hg
Summary

We no longer support them both together, so this is now safe to do. By
checking --local first, we avoid error out about an invalid --with-hg
script if --local was also given (we instead tell the user that the
options are mutually exclusive).

I also had to wrap the 'binpath' we pass to setattr() in _strpath() to
keep python3 run-tests.py -l working. That change also made `python3
run-tests.py -l --chg` work, which was the reason for this series.

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

martinvonz created this revision.Aug 23 2019, 5:05 PM
pulkit accepted this revision.Aug 27 2019, 3:57 PM
This revision is now accepted and ready to land.Aug 27 2019, 3:57 PM
martinvonz added a commit: rHG69506e1b3214: run-tests: handle --local before --with-hg.Aug 27 2019, 4:59 PM
Closed by commit rHG69506e1b3214: run-tests: handle --local before --with-hg (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

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

Diff 16325

tests/run-tests.py

def parseargs(args, parser): def parseargs(args, parser):
"""Parse arguments with our OptionParser and validate results.""" """Parse arguments with our OptionParser and validate results."""
options = parser.parse_args(args) options = parser.parse_args(args)
# jython is always pure # jython is always pure
if 'java' in sys.platform or '__pypy__' in sys.modules: if 'java' in sys.platform or '__pypy__' in sys.modules:
options.pure = True options.pure = True
if options.with_hg:
options.with_hg = canonpath(_bytespath(options.with_hg))
if not (os.path.isfile(options.with_hg) and
os.access(options.with_hg, os.X_OK)):
parser.error('--with-hg must specify an executable hg script')
if os.path.basename(options.with_hg) not in [b'hg', b'hg.exe']:
sys.stderr.write('warning: --with-hg should specify an hg script\n')
sys.stderr.flush()
if options.local: if options.local:
if options.with_hg or options.with_chg: if options.with_hg or options.with_chg:
parser.error('--local cannot be used with --with-hg or --with-chg') parser.error('--local cannot be used with --with-hg or --with-chg')
testdir = os.path.dirname(_bytespath(canonpath(sys.argv[0]))) testdir = os.path.dirname(_bytespath(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'))
for relpath, attr in pathandattrs: for relpath, attr in pathandattrs:
binpath = os.path.join(reporootdir, relpath) binpath = os.path.join(reporootdir, relpath)
if os.name != 'nt' and not os.access(binpath, os.X_OK): if os.name != 'nt' and not os.access(binpath, os.X_OK):
parser.error('--local specified, but %r not found or ' parser.error('--local specified, but %r not found or '
'not executable' % binpath) 'not executable' % binpath)
setattr(options, attr, binpath) setattr(options, attr, _strpath(binpath))
if options.with_hg:
options.with_hg = canonpath(_bytespath(options.with_hg))
if not (os.path.isfile(options.with_hg) and
os.access(options.with_hg, os.X_OK)):
parser.error('--with-hg must specify an executable hg script')
if os.path.basename(options.with_hg) not in [b'hg', b'hg.exe']:
sys.stderr.write('warning: --with-hg should specify an hg script\n')
sys.stderr.flush()
if (options.chg or options.with_chg) and os.name == 'nt': if (options.chg or options.with_chg) and os.name == 'nt':
parser.error('chg does not work on %s' % os.name) parser.error('chg does not work on %s' % os.name)
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(_bytespath(options.with_chg)) options.with_chg = canonpath(_bytespath(options.with_chg))
if not (os.path.isfile(options.with_chg) and if not (os.path.isfile(options.with_chg) and
os.access(options.with_chg, os.X_OK)): os.access(options.with_chg, os.X_OK)):