This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2607

hghave: fix up clang-libfuzzer regex to be bytes
ClosedPublic

Authored by durin42 on Mar 3 2018, 4:39 PM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHGdc11f257ad1d: hghave: fix up clang-libfuzzer regex to be bytes
Summary

Fixes this check on Python 3.

  1. skip-blame just a b prefix

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

durin42 created this revision.Mar 3 2018, 4:39 PM
pulkit added a subscriber: pulkit.Mar 3 2018, 5:15 PM
pulkit added inline comments.
tests/hghave.py
265

Since you are here, can you get this one and next call to matchoutput fixed too?

indygreg accepted this revision.Mar 3 2018, 5:55 PM
This revision is now accepted and ready to land.Mar 3 2018, 5:55 PM
Closed by commit rHGdc11f257ad1d: hghave: fix up clang-libfuzzer regex to be bytes (authored by durin42). · Explain WhyMar 3 2018, 5:59 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/hghave.py (2 lines)

Diff 6493

tests/hghave.py

if checks["hg09"][0](): if checks["hg09"][0]():
return True return True
return matchoutput('hg help annotate 2>&1', '--date') return matchoutput('hg help annotate 2>&1', '--date')
@check("hg07", "Mercurial >= 0.7") @check("hg07", "Mercurial >= 0.7")
def has_hg07(): def has_hg07():
if checks["hg08"][0](): if checks["hg08"][0]():
return True return True
return matchoutput('hg --version --quiet 2>&1', 'Mercurial Distributed SCM') return matchoutput('hg --version --quiet 2>&1', 'Mercurial Distributed SCM')
pulkitUnsubmitted
Not Done

Since you are here, can you get this one and next call to matchoutput fixed too?

pulkit: Since you are here, can you get this one and next call to matchoutput fixed too?
@check("hg06", "Mercurial >= 0.6") @check("hg06", "Mercurial >= 0.6")
def has_hg06(): def has_hg06():
if checks["hg07"][0](): if checks["hg07"][0]():
return True return True
return matchoutput('hg --version --quiet 2>&1', 'Mercurial version') return matchoutput('hg --version --quiet 2>&1', 'Mercurial version')
@check("gettext", "GNU Gettext (msgfmt)") @check("gettext", "GNU Gettext (msgfmt)")
import fuzzywuzzy import fuzzywuzzy
fuzzywuzzy.__version__ fuzzywuzzy.__version__
return True return True
except ImportError: except ImportError:
return False return False
@check("clang-libfuzzer", "clang new enough to include libfuzzer") @check("clang-libfuzzer", "clang new enough to include libfuzzer")
def has_clang_libfuzzer(): def has_clang_libfuzzer():
mat = matchoutput('clang --version', 'clang version (\d)') mat = matchoutput('clang --version', b'clang version (\d)')
if mat: if mat:
# libfuzzer is new in clang 6 # libfuzzer is new in clang 6
return int(mat.group(1)) > 5 return int(mat.group(1)) > 5
return False return False