[libc++][CI] Improves clang-(tidy|query) selection.

[Mordante]

Summary

Hardcode the version of the tools used in the test feature script
instead of the tests. By changing the hard-coded location it's
easier to make the location flexible in the future.

Drive-by change

• The minimum required version for clang-query is now 15, which matches our future idea as outlined in the Dockerfile.
• The minimum required version for clang-tidy is now 16, which enables the new clang-tidy ADL plugin. This plugin is disabled for C++03 due to false positives when using noexcept, which is not an operator in C++03.

[Mordante]

Retrigger CI to start on libc++

[Mordante]

Add a dummy change to trigger libcx++ CI.

[Mordante]

Remove dummy change.

[ldionne]

libcxx/test/configs/cmake-bridge.cfg.in

33 ↗

(On Diff #481285)

I would like to keep this to the smallest set of substitutions that we need to make the test suite work, so I am not sure about this approach. I'll need to take another look at this when I have more time.

[ldionne]

libcxx/utils/ci/run-buildbot

45–49 ↗

(On Diff #481285)

This can be removed.

libcxx/utils/libcxx/test/features.py

143–145

I think I would dumb down the whole patch to this. It does mean that only folks with exactly clang-tidy-15 will get those tests enabled, but it's already pretty much the status quo, and doing this avoids piping through the clang-tidy version across multiple layers like buildkite-pipeline.yml and CMake.

We should also do the same for clang-query in the same patch.

If we want to be more clever about finding clang-tidy (e.g. falling back on clang-tidy --version >= 15), we can do something similar to what we do with getStdFlag in params.py and basically do a linear search with various options.

Also, restricting the changes to this means that we avoid adding another dependency from the test suite onto CMake, which is good since we want to strive for the test suite being as freestanding as possible (within reason).

[Mordante]

Thanks for the suggestions.

libcxx/test/configs/cmake-bridge.cfg.in

33 ↗

(On Diff #481285)

As discussed yesterday with @ldionne we go with a different approach so this change is undone.

libcxx/utils/libcxx/test/features.py

143–145

This didn't work as suggested, I used the same syntax as the bash test above.

[Mordante]

Rebased and use a different approach as discussed with @ldionne during the code review.

[Mordante]

Rebased to test CI.

[Mordante]

CI fixes.

[Mordante]

Another attempt to fix the CI.

[Mordante]

Test the CI, the last time seemed a bit flacky.

[Mordante]

Restart CI.

[Mordante]

CI fixes.

[Mordante]

Retrigger CI.

[Mordante]

Another attempt to start the CI.

[Mordante]

CI test again...

[Mordante]

CI seems not really willing to start.

libcxx/test/libcxx/clang_query.sh.cpp

 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
 // Run clang-query on the headers - see clang_query/README.md for more information
 
 // REQUIRES: has-clang-query
 
 // The attributes hide_from_abi_of_visible.query relies on aren't applied on windows.
 // XFAIL: windows
 
-// RUN: clang-query -f %S/clang_query/hide_from_abi_or_visible.query %s --use-color -- -Wno-unknown-warning-option %{compile_flags} -fno-modules > %t.output
+// RUN: %{clang-query} -f %S/clang_query/hide_from_abi_or_visible.query %s --use-color -- -Wno-unknown-warning-option %{compile_flags} -fno-modules > %t.output
 // RUN: cat %t.output
 // RUN: cat %t.output | wc -l | grep -Fxq 1
 
 // Prevent <ext/hash_map> from generating deprecated warnings for this test.
 #if defined(__DEPRECATED)
 #    undef __DEPRECATED
 #endif
 

libcxx/test/libcxx/clang_tidy.sh.cpp

 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
 // REQUIRES: has-clang-tidy
 
 // The GCC compiler flags are not always compatible with clang-tidy.
 // UNSUPPORTED: gcc
 
 // TODO: run clang-tidy with modules enabled once they are supported
-// RUN: clang-tidy %s --warnings-as-errors=* -header-filter=.* --checks='-*,libcpp-*' --load=%{test-tools}/clang_tidy_checks/libcxx-tidy.plugin -- %{compile_flags} -fno-modules
-// RUN: clang-tidy %s --warnings-as-errors=* -header-filter=.* --config-file=%S/../../.clang-tidy -- -Wweak-vtables %{compile_flags} -fno-modules
+// RUN: %{clang-tidy} %s --warnings-as-errors=* -header-filter=.* --checks='-*,libcpp-*' --load=%{test-tools}/clang_tidy_checks/libcxx-tidy.plugin -- %{compile_flags} -fno-modules
+// RUN: %{clang-tidy} %s --warnings-as-errors=* -header-filter=.* --config-file=%S/../../.clang-tidy -- -Wweak-vtables %{compile_flags} -fno-modules
 
 // Prevent <ext/hash_map> from generating deprecated warnings for this test.
 #if defined(__DEPRECATED)
 #    undef __DEPRECATED
 #endif
 
 /*
 BEGIN-SCRIPT

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 _hasSuitableClangTidy(cfg):
-  try:
-    return int(re.search('[0-9]+', commandOutput(cfg, ['clang-tidy --version'])).group()) >= 13 and runScriptExitCode(
-      cfg, ['stat %{test-tools}/clang_tidy_checks/libcxx-tidy.plugin']) == 0
-  except ConfigurationRuntimeError:
-    return False
-
-def _hasSuitableClangQuery(cfg):
-  try:
-    return int(re.search('[0-9]+', commandOutput(cfg, ['clang-query --version'])).group()) >= 13
-  except ConfigurationRuntimeError:
-    return False
-
 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 = [
   #
   # For the corner case of bash existing, but it being missing in the path
   # 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',
-          when=_hasSuitableClangTidy),
+          when=lambda cfg: runScriptExitCode(cfg, ['clang-tidy-15 --version']) == 0,
+          actions=[AddSubstitution('%{clang-tidy}', 'clang-tidy-15')]),
   Feature(name='has-clang-query',
-          when=_hasSuitableClangQuery),
+          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),