This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1843

run-tests: fix regular expression for path test
ClosedPublic

Authored by indygreg on Jan 10 2018, 10:05 PM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHG31acf6619f08: run-tests: fix regular expression for path test
Summary

The previous regexp would match the empty string. This fixes
a mistake added in 964212780daf.

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

indygreg created this revision.Jan 10 2018, 10:05 PM
durin42 accepted this revision.Jan 10 2018, 10:05 PM
This revision is now accepted and ready to land.Jan 10 2018, 10:05 PM
Closed by commit rHG31acf6619f08: run-tests: fix regular expression for path test (authored by indygreg). · Explain WhyJan 10 2018, 10:09 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

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

Diff 4787

tests/run-tests.py

with open(whg, 'rb') as fh: with open(whg, 'rb') as fh:
initial = fh.read(1024) initial = fh.read(1024)
if re.match(b'#!.*python', initial): if re.match(b'#!.*python', initial):
self._pythondir = self._bindir self._pythondir = self._bindir
# If it looks like our in-repo Rust binary, use the source root. # If it looks like our in-repo Rust binary, use the source root.
# This is a bit hacky. But rhg is still not supported outside the # This is a bit hacky. But rhg is still not supported outside the
# source directory. So until it is, do the simple thing. # source directory. So until it is, do the simple thing.
elif re.search(b'|/rust/target/[^/]+/hg', normbin): elif re.search(b'/rust/target/[^/]+/hg', normbin):
self._pythondir = os.path.dirname(self._testdir) self._pythondir = os.path.dirname(self._testdir)
# Fall back to the legacy behavior. # Fall back to the legacy behavior.
else: else:
self._pythondir = self._bindir self._pythondir = self._bindir
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")