feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

ClangTools: Do not run tests with x86/32 bit MSVC kits

Browse Source 
According to observations, clazy stumbles over system headers in that
case.

Change-Id: I824571caeceb4ee7a201a2bfa797d1795eb972b6
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Christian Kandeler
2024-10-10 14:47:23 +02:00
parent 5f27ce349b
commit 45f47a0caa
1 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/plugins/clangtools/clangtoolsunittests.cpp
View File

@@ -40,19 +40,26 @@ namespace Internal {
void ClangToolsUnitTests::initTestCase() void ClangToolsUnitTests::initTestCase()
{ {
const QList<Kit *> allKits = KitManager::kits(); m_kit = findOr(KitManager::kits(), nullptr, [](Kit *k) {
if (allKits.count() == 0) if (!k->isValid())
QSKIP("This test requires at least one kit to be present"); return false;
if (!QtSupport::QtKitAspect::qtVersion(k))
return false;
const Toolchain * const toolchain = ToolchainKitAspect::cxxToolchain(k);
if (!toolchain)
return false;
m_kit = findOr(allKits, nullptr, [](Kit *k) { // Wo observe clazy failures with x86/32bit MSVC kits.
return k->isValid() && QtSupport::QtKitAspect::qtVersion(k) != nullptr; if (toolchain->typeId() == ProjectExplorer::Constants::MSVC_TOOLCHAIN_TYPEID
&& toolchain->targetAbi().architecture() == Abi::X86Architecture
&& toolchain->targetAbi().wordWidth() != Abi::hostAbi().wordWidth()) {
return false;
}
return true;
}); });
if (!m_kit) if (!m_kit)
QSKIP("This test requires at least one valid kit with a valid Qt"); QSKIP("This test requires at least one valid kit with a valid Qt and a suitable toolchain.");
const Toolchain * const toolchain = ToolchainKitAspect::cxxToolchain(m_kit);
if (!toolchain)
QSKIP("This test requires that there is a kit with a toolchain.");
if (!Core::ICore::clangExecutable(CLANG_BINDIR)) if (!Core::ICore::clangExecutable(CLANG_BINDIR))
QSKIP("No clang suitable for analyzing found"); QSKIP("No clang suitable for analyzing found");