[Updated] D10538: tests: allow Google's internal builds of clang-format to be used

[spectral (Kyle Lippincott)]

Closed by commit rHG1ff06ceb070f: tests: allow Google's internal builds of clang-format to be used (authored by spectral).
This revision was automatically updated to reflect the committed changes.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D10538?vs=30961&id=30998

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D10538/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D10538

AFFECTED FILES
  tests/hghave.py

CHANGE DETAILS

diff --git a/tests/hghave.py b/tests/hghave.py
--- a/tests/hghave.py
+++ b/tests/hghave.py
@@ -611,7 +611,14 @@
 def has_clang_format():
     m = matchoutput('clang-format --version', br'clang-format version (\d+)')
     # style changed somewhere between 10.x and 11.x
-    return m and int(m.group(1)) >= 11
+    if m:
+        return int(m.group(1)) >= 11
+    # Assist Googler contributors, they have a centrally-maintained version of
+    # clang-format that is generally very fresh, but unlike most builds (both
+    # official and unofficial), it does *not* include a version number.
+    return matchoutput(
+        'clang-format --version', br'clang-format .*google3-trunk \([0-9a-f]+\)'
+    )
 
 
 @check("jshint", "JSHint static code analysis tool")



To: spectral, #hg-reviewers, durin42, Alphare
Cc: marmoute, durin42, martinvonz, joerg.sonnenberger, mercurial-patches
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial-patches/attachments/20211028/b453f23d/attachment-0002.html>