[libc++] Add clang-tidy to the list of possible substitutions for %{clang-tidy}

[philnik]

Summary

Most people don't have a versioned clang-tidy locally. This allows them to still run the clang-tidy test if they have a suitable version.

[Mordante]

Thanks for working on this! I hadn't gotten around this myself.

libcxx/utils/libcxx/test/features.py

163

Can you do a similar change for clang-query in this patch?

[philnik]

libcxx/utils/libcxx/test/features.py

163

I haven't updated clang-query because I plan to move the checks to clang-tidy soon anyways, so I don't think it makes a lot of sense when it's removed in a few weeks anyways.

[ldionne]

libcxx/utils/libcxx/test/features.py

23–24

33

159

[philnik]

Address comments

libcxx/utils/libcxx/test/features.py

 import subprocess
 
 _isClang      = lambda cfg: '__clang__' in compilerMacros(cfg) and '__apple_build_version__' not in compilerMacros(cfg)
 _isAppleClang = lambda cfg: '__apple_build_version__' in compilerMacros(cfg)
 _isGCC        = lambda cfg: '__GNUC__' in compilerMacros(cfg) and '__clang__' not in compilerMacros(cfg)
 _isMSVC       = lambda cfg: '_MSC_VER' in compilerMacros(cfg)
 _msvcVersion  = lambda cfg: (int(compilerMacros(cfg)['_MSC_VER']) // 100, int(compilerMacros(cfg)['_MSC_VER']) % 100)
 
+def _getSuitableClangTidy(cfg):
+  try:
+    if runScriptExitCode(cfg, ['stat %{test-tools}/clang_tidy_checks/libcxx-tidy.plugin']) != 0:
+      return ''
+
+    if runScriptExitCode(cfg, ['clang-tidy-16 --version']) == 0:
+      return 'clang-tidy-16'
+
+    if int(re.search('[0-9]+', commandOutput(cfg, ['clang-tidy --version'])).group()) >= 16:
+      return 'clang-tidy'
+
+  except ConfigurationRuntimeError:
+    return ''
+
 DEFAULT_FEATURES = [
   Feature(name='fcoroutines-ts',
           when=lambda cfg: hasCompileFlag(cfg, '-fcoroutines-ts') and
                            featureTestMacros(cfg, flags='-fcoroutines-ts').get('__cpp_coroutines', 0) >= 201703,
           actions=[AddCompileFlag('-fcoroutines-ts')]),
 
   Feature(name='thread-safety',
           when=lambda cfg: hasCompileFlag(cfg, '-Werror=thread-safety'),
DEFAULT_FEATURES = [
   # set in %{exec} as "--env PATH=one-single-dir", the executor does find
   # and executes bash, but bash then can't find any other common shell
   # utilities. Test executing "bash -c 'bash --version'" to see if bash
   # manages to find binaries to execute.
   Feature(name='executor-has-no-bash',
           when=lambda cfg: runScriptExitCode(cfg, ['%{exec} bash -c \'bash --version\'']) != 0),
   Feature(name='has-clang-tidy',
           # TODO This should be the last stable release.
-          when=lambda cfg: runScriptExitCode(cfg, ['clang-tidy-16 --version']) == 0 and
-                           runScriptExitCode(cfg, ['stat %{test-tools}/clang_tidy_checks/libcxx-tidy.plugin']) == 0,
-          actions=[AddSubstitution('%{clang-tidy}', 'clang-tidy-16')]),
+          when=lambda cfg: _getSuitableClangTidy(cfg) != '',
+          actions=[AddSubstitution('%{clang-tidy}', lambda cfg: _getSuitableClangTidy(cfg))]),
   Feature(name='has-clang-query',
           when=lambda cfg: runScriptExitCode(cfg, ['clang-query-15 --version']) == 0,
           actions=[AddSubstitution('%{clang-query}', 'clang-query-15')]),
 
   Feature(name='apple-clang',                                                                                                      when=_isAppleClang),
   Feature(name=lambda cfg: 'apple-clang-{__clang_major__}'.format(**compilerMacros(cfg)),                                          when=_isAppleClang),
   Feature(name=lambda cfg: 'apple-clang-{__clang_major__}.{__clang_minor__}'.format(**compilerMacros(cfg)),                        when=_isAppleClang),
   Feature(name=lambda cfg: 'apple-clang-{__clang_major__}.{__clang_minor__}.{__clang_patchlevel__}'.format(**compilerMacros(cfg)), when=_isAppleClang),
 
   Feature(name='clang',                                                                                                            when=_isClang),
   Feature(name=lambda cfg: 'clang-{__clang_major__}'.format(**compilerMacros(cfg)),                                                when=_isClang),