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

CppTools: Remove some unneeded name qualifications in converted tests

Browse Source 
Change-Id: Ib14f576d0502adde56e8c8b0af0c5d95fae1eddf
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Christian Kandeler
2021-07-20 15:52:46 +02:00
parent 1a0c9a5ce4
commit 709138ce61
2 changed files with 114 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

263
src/plugins/cpptools/compileroptionsbuilder_test.cpp
View File

@@ -51,19 +51,19 @@ public:
QFile pchFile(pchFileNativePath()); QFile pchFile(pchFileNativePath());
pchFile.open(QIODevice::WriteOnly); pchFile.open(QIODevice::WriteOnly);
projectPart.project = project.get(); projectPart.project = project.get();
projectPart.toolchainType = ProjectExplorer::Constants::CLANG_TOOLCHAIN_TYPEID; projectPart.toolchainType = Constants::CLANG_TOOLCHAIN_TYPEID;
projectPart.languageVersion = Utils::LanguageVersion::CXX17; projectPart.languageVersion = Utils::LanguageVersion::CXX17;
projectPart.toolChainWordWidth = CppTools::ProjectPart::WordWidth64Bit; projectPart.toolChainWordWidth = ProjectPart::WordWidth64Bit;
projectPart.toolChainTargetTriple = "x86_64-apple-darwin10"; projectPart.toolChainTargetTriple = "x86_64-apple-darwin10";
projectPart.precompiledHeaders = QStringList{pchFileNativePath()}; projectPart.precompiledHeaders = QStringList{pchFileNativePath()};
projectPart.toolChainMacros = {ProjectExplorer::Macro{"foo", "bar"}, projectPart.toolChainMacros = {Macro{"foo", "bar"},
ProjectExplorer::Macro{"__cplusplus", "2"}, Macro{"__cplusplus", "2"},
ProjectExplorer::Macro{"__STDC_VERSION__", "2"}, Macro{"__STDC_VERSION__", "2"},
ProjectExplorer::Macro{"_MSVC_LANG", "2"}, Macro{"_MSVC_LANG", "2"},
ProjectExplorer::Macro{"_MSC_BUILD", "2"}, Macro{"_MSC_BUILD", "2"},
ProjectExplorer::Macro{"_MSC_FULL_VER", "1900"}, Macro{"_MSC_FULL_VER", "1900"},
ProjectExplorer::Macro{"_MSC_VER", "19"}}; Macro{"_MSC_VER", "19"}};
projectPart.projectMacros = {ProjectExplorer::Macro{"projectFoo", "projectBar"}}; projectPart.projectMacros = {Macro{"projectFoo", "projectBar"}};
projectPart.qtVersion = Utils::QtVersion::Qt5; projectPart.qtVersion = Utils::QtVersion::Qt5;
projectPart.headerPaths = {HeaderPath{"/tmp/builtin_path", HeaderPathType::BuiltIn}, projectPart.headerPaths = {HeaderPath{"/tmp/builtin_path", HeaderPathType::BuiltIn},
@@ -87,10 +87,9 @@ public:
+ "/compileroptionsbuilder.pch"); + "/compileroptionsbuilder.pch");
} }
std::unique_ptr<Project> project{std::make_unique<ProjectExplorer::Project>(QString(), std::unique_ptr<Project> project{std::make_unique<Project>(QString(), Utils::FilePath())};
Utils::FilePath())};
ProjectPart projectPart; ProjectPart projectPart;
CppTools::CompilerOptionsBuilder compilerOptionsBuilder{projectPart}; CompilerOptionsBuilder compilerOptionsBuilder{projectPart};
}; };
} }
@@ -107,11 +106,9 @@ void CppToolsPlugin::test_optionsBuilder_unknownFlagsAreForwarded()
CompilerOptionsBuilderTest t; CompilerOptionsBuilderTest t;
ProjectPart part = t.projectPart; ProjectPart part = t.projectPart;
part.compilerFlags = QStringList{"-fancyFlag"}; part.compilerFlags = QStringList{"-fancyFlag"};
CppTools::CompilerOptionsBuilder compilerOptionsBuilder{part, CompilerOptionsBuilder compilerOptionsBuilder{part, UseSystemHeader::No,
CppTools::UseSystemHeader::No, UseTweakedHeaderPaths::No, UseLanguageDefines::Yes};
CppTools::UseTweakedHeaderPaths::No, compilerOptionsBuilder.build(ProjectFile::CXXSource, UsePrecompiledHeaders::No);
CppTools::UseLanguageDefines::Yes};
compilerOptionsBuilder.build(ProjectFile::CXXSource, CppTools::UsePrecompiledHeaders::No);
QVERIFY(compilerOptionsBuilder.options().contains(part.compilerFlags.first())); QVERIFY(compilerOptionsBuilder.options().contains(part.compilerFlags.first()));
} }
@@ -121,12 +118,10 @@ void CppToolsPlugin::test_optionsBuilder_warningsFlagsAreNotFilteredIfRequested(
CompilerOptionsBuilderTest t; CompilerOptionsBuilderTest t;
ProjectPart part = t.projectPart; ProjectPart part = t.projectPart;
part.compilerFlags = QStringList{"-Whello"}; part.compilerFlags = QStringList{"-Whello"};
CppTools::CompilerOptionsBuilder compilerOptionsBuilder{part, CompilerOptionsBuilder compilerOptionsBuilder{part, UseSystemHeader::No,
CppTools::UseSystemHeader::No, UseTweakedHeaderPaths::No, UseLanguageDefines::No,
CppTools::UseTweakedHeaderPaths::No, UseBuildSystemWarnings::Yes};
CppTools::UseLanguageDefines::No, compilerOptionsBuilder.build(ProjectFile::CXXSource, UsePrecompiledHeaders::No);
CppTools::UseBuildSystemWarnings::Yes};
compilerOptionsBuilder.build(ProjectFile::CXXSource, CppTools::UsePrecompiledHeaders::No);
QVERIFY(compilerOptionsBuilder.options().contains(part.compilerFlags.first())); QVERIFY(compilerOptionsBuilder.options().contains(part.compilerFlags.first()));
} }
@@ -136,11 +131,9 @@ void CppToolsPlugin::test_optionsBuilder_diagnosticOptionsAreRemoved()
CompilerOptionsBuilderTest t; CompilerOptionsBuilderTest t;
ProjectPart part = t.projectPart; ProjectPart part = t.projectPart;
part.compilerFlags = QStringList{"-Wbla", "-pedantic"}; part.compilerFlags = QStringList{"-Wbla", "-pedantic"};
CppTools::CompilerOptionsBuilder compilerOptionsBuilder{part, CompilerOptionsBuilder compilerOptionsBuilder{part, UseSystemHeader::No,
CppTools::UseSystemHeader::No, UseTweakedHeaderPaths::No, UseLanguageDefines::Yes};
CppTools::UseTweakedHeaderPaths::No, compilerOptionsBuilder.build(ProjectFile::CXXSource, UsePrecompiledHeaders::No);
CppTools::UseLanguageDefines::Yes};
compilerOptionsBuilder.build(ProjectFile::CXXSource, CppTools::UsePrecompiledHeaders::No);
QVERIFY(!compilerOptionsBuilder.options().contains(part.compilerFlags.at(0))); QVERIFY(!compilerOptionsBuilder.options().contains(part.compilerFlags.at(0)));
QVERIFY(!compilerOptionsBuilder.options().contains(part.compilerFlags.at(1))); QVERIFY(!compilerOptionsBuilder.options().contains(part.compilerFlags.at(1)));
@@ -156,11 +149,9 @@ void CppToolsPlugin::test_optionsBuilder_cLanguageVersionIsRewritten()
// consistency between ProjectFile::Kind and ProjectPart::LanguageVersion // consistency between ProjectFile::Kind and ProjectPart::LanguageVersion
part.languageVersion = Utils::LanguageVersion::C18; part.languageVersion = Utils::LanguageVersion::C18;
CppTools::CompilerOptionsBuilder compilerOptionsBuilder{part, CompilerOptionsBuilder compilerOptionsBuilder{part, UseSystemHeader::No,
CppTools::UseSystemHeader::No, UseTweakedHeaderPaths::No, UseLanguageDefines::Yes};
CppTools::UseTweakedHeaderPaths::No, compilerOptionsBuilder.build(ProjectFile::CSource, UsePrecompiledHeaders::No);
CppTools::UseLanguageDefines::Yes};
compilerOptionsBuilder.build(ProjectFile::CSource, CppTools::UsePrecompiledHeaders::No);
QVERIFY(!compilerOptionsBuilder.options().contains(part.compilerFlags.first())); QVERIFY(!compilerOptionsBuilder.options().contains(part.compilerFlags.first()));
QVERIFY(compilerOptionsBuilder.options().contains("-std=c17")); QVERIFY(compilerOptionsBuilder.options().contains("-std=c17"));
@@ -169,11 +160,9 @@ void CppToolsPlugin::test_optionsBuilder_cLanguageVersionIsRewritten()
void CppToolsPlugin::test_optionsBuilder_languageVersionIsExplicitlySetIfNotProvided() void CppToolsPlugin::test_optionsBuilder_languageVersionIsExplicitlySetIfNotProvided()
{ {
CompilerOptionsBuilderTest t; CompilerOptionsBuilderTest t;
CppTools::CompilerOptionsBuilder compilerOptionsBuilder{t.projectPart, CompilerOptionsBuilder compilerOptionsBuilder{t.projectPart, UseSystemHeader::No,
CppTools::UseSystemHeader::No, UseTweakedHeaderPaths::No, UseLanguageDefines::Yes};
CppTools::UseTweakedHeaderPaths::No, compilerOptionsBuilder.build(ProjectFile::CXXSource, UsePrecompiledHeaders::No);
CppTools::UseLanguageDefines::Yes};
compilerOptionsBuilder.build(ProjectFile::CXXSource, CppTools::UsePrecompiledHeaders::No);
QVERIFY(compilerOptionsBuilder.options().contains("-std=c++17")); QVERIFY(compilerOptionsBuilder.options().contains("-std=c++17"));
} }
@@ -181,12 +170,10 @@ void CppToolsPlugin::test_optionsBuilder_languageVersionIsExplicitlySetIfNotProv
void CppToolsPlugin::test_optionsBuilder_LanguageVersionIsExplicitlySetIfNotProvidedMsvc() void CppToolsPlugin::test_optionsBuilder_LanguageVersionIsExplicitlySetIfNotProvidedMsvc()
{ {
CompilerOptionsBuilderTest t; CompilerOptionsBuilderTest t;
t.projectPart.toolchainType = ProjectExplorer::Constants::MSVC_TOOLCHAIN_TYPEID; t.projectPart.toolchainType = Constants::MSVC_TOOLCHAIN_TYPEID;
CppTools::CompilerOptionsBuilder compilerOptionsBuilder{t.projectPart, CompilerOptionsBuilder compilerOptionsBuilder{t.projectPart, UseSystemHeader::No,
CppTools::UseSystemHeader::No, UseTweakedHeaderPaths::No, UseLanguageDefines::Yes};
CppTools::UseTweakedHeaderPaths::No, compilerOptionsBuilder.build(ProjectFile::CXXSource, UsePrecompiledHeaders::No);
CppTools::UseLanguageDefines::Yes};
compilerOptionsBuilder.build(ProjectFile::CXXSource, CppTools::UsePrecompiledHeaders::No);
QVERIFY(compilerOptionsBuilder.options().contains("/std:c++17")); QVERIFY(compilerOptionsBuilder.options().contains("/std:c++17"));
} }
@@ -202,13 +189,9 @@ void CppToolsPlugin::test_optionsBuilder_addWordWidth()
void CppToolsPlugin::test_optionsBuilder_headerPathOptionsOrder() void CppToolsPlugin::test_optionsBuilder_headerPathOptionsOrder()
{ {
CompilerOptionsBuilderTest t; CompilerOptionsBuilderTest t;
CppTools::CompilerOptionsBuilder compilerOptionsBuilder{t.projectPart, CompilerOptionsBuilder compilerOptionsBuilder{t.projectPart, UseSystemHeader::No,
CppTools::UseSystemHeader::No, UseTweakedHeaderPaths::Yes, UseLanguageDefines::No, UseBuildSystemWarnings::No,
CppTools::UseTweakedHeaderPaths::Yes, "dummy_version", ""};
CppTools::UseLanguageDefines::No,
CppTools::UseBuildSystemWarnings::No,
"dummy_version",
""};
compilerOptionsBuilder.addHeaderPathOptions(); compilerOptionsBuilder.addHeaderPathOptions();
QCOMPARE(compilerOptionsBuilder.options(), QCOMPARE(compilerOptionsBuilder.options(),
@@ -220,14 +203,10 @@ void CppToolsPlugin::test_optionsBuilder_headerPathOptionsOrder()
void CppToolsPlugin::test_optionsBuilder_HeaderPathOptionsOrderMsvc() void CppToolsPlugin::test_optionsBuilder_HeaderPathOptionsOrderMsvc()
{ {
CompilerOptionsBuilderTest t; CompilerOptionsBuilderTest t;
t.projectPart.toolchainType = ProjectExplorer::Constants::MSVC_TOOLCHAIN_TYPEID; t.projectPart.toolchainType = Constants::MSVC_TOOLCHAIN_TYPEID;
CppTools::CompilerOptionsBuilder compilerOptionsBuilder{t.projectPart, CompilerOptionsBuilder compilerOptionsBuilder{t.projectPart, UseSystemHeader::No,
CppTools::UseSystemHeader::No, UseTweakedHeaderPaths::Yes, UseLanguageDefines::No, UseBuildSystemWarnings::No,
CppTools::UseTweakedHeaderPaths::Yes, "dummy_version", ""};
CppTools::UseLanguageDefines::No,
CppTools::UseBuildSystemWarnings::No,
"dummy_version",
""};
compilerOptionsBuilder.evaluateCompilerFlags(); compilerOptionsBuilder.evaluateCompilerFlags();
compilerOptionsBuilder.addHeaderPathOptions(); compilerOptionsBuilder.addHeaderPathOptions();
@@ -241,13 +220,9 @@ void CppToolsPlugin::test_optionsBuilder_HeaderPathOptionsOrderMsvc()
void CppToolsPlugin::test_optionsBuilder_useSystemHeader() void CppToolsPlugin::test_optionsBuilder_useSystemHeader()
{ {
CompilerOptionsBuilderTest t; CompilerOptionsBuilderTest t;
CppTools::CompilerOptionsBuilder compilerOptionsBuilder{t.projectPart, CompilerOptionsBuilder compilerOptionsBuilder{t.projectPart, UseSystemHeader::Yes,
CppTools::UseSystemHeader::Yes, UseTweakedHeaderPaths::Yes, UseLanguageDefines::No, UseBuildSystemWarnings::No,
CppTools::UseTweakedHeaderPaths::Yes, "dummy_version", ""};
CppTools::UseLanguageDefines::No,
CppTools::UseBuildSystemWarnings::No,
"dummy_version",
""};
compilerOptionsBuilder.addHeaderPathOptions(); compilerOptionsBuilder.addHeaderPathOptions();
QCOMPARE(compilerOptionsBuilder.options(), QCOMPARE(compilerOptionsBuilder.options(),
@@ -278,13 +253,9 @@ void CppToolsPlugin::test_optionsBuilder_clangHeadersAndCppIncludePathsOrderMacO
t.builtIn("/usr/include") t.builtIn("/usr/include")
}; };
t.projectPart.headerPaths.append(defaultPaths); t.projectPart.headerPaths.append(defaultPaths);
CppTools::CompilerOptionsBuilder compilerOptionsBuilder(t.projectPart, CompilerOptionsBuilder compilerOptionsBuilder(t.projectPart, UseSystemHeader::No,
CppTools::UseSystemHeader::No, UseTweakedHeaderPaths::Yes, UseLanguageDefines::No, UseBuildSystemWarnings::No,
CppTools::UseTweakedHeaderPaths::Yes, "dummy_version", "");
CppTools::UseLanguageDefines::No,
CppTools::UseBuildSystemWarnings::No,
"dummy_version",
"");
compilerOptionsBuilder.addHeaderPathOptions(); compilerOptionsBuilder.addHeaderPathOptions();
QCOMPARE(compilerOptionsBuilder.options(), QCOMPARE(compilerOptionsBuilder.options(),
@@ -312,13 +283,9 @@ void CppToolsPlugin::test_optionsBuilder_clangHeadersAndCppIncludePathsOrderLinu
t.builtIn("/usr/include"), t.builtIn("/usr/include"),
}; };
t.projectPart.toolChainTargetTriple = "x86_64-linux-gnu"; t.projectPart.toolChainTargetTriple = "x86_64-linux-gnu";
CppTools::CompilerOptionsBuilder compilerOptionsBuilder(t.projectPart, CompilerOptionsBuilder compilerOptionsBuilder(t.projectPart, UseSystemHeader::No,
CppTools::UseSystemHeader::No, UseTweakedHeaderPaths::Yes, UseLanguageDefines::No, UseBuildSystemWarnings::No,
CppTools::UseTweakedHeaderPaths::Yes, "dummy_version", "");
CppTools::UseLanguageDefines::No,
CppTools::UseBuildSystemWarnings::No,
"dummy_version",
"");
compilerOptionsBuilder.addHeaderPathOptions(); compilerOptionsBuilder.addHeaderPathOptions();
QCOMPARE(compilerOptionsBuilder.options(), QCOMPARE(compilerOptionsBuilder.options(),
@@ -343,13 +310,9 @@ void CppToolsPlugin::test_optionsBuilder_clangHeadersAndCppIncludePathsOrderNoVe
t.builtIn("C:/mingw530/i686-w64-mingw32/include/c++/backward"), t.builtIn("C:/mingw530/i686-w64-mingw32/include/c++/backward"),
}; };
t.projectPart.toolChainTargetTriple = "x86_64-w64-windows-gnu"; t.projectPart.toolChainTargetTriple = "x86_64-w64-windows-gnu";
CppTools::CompilerOptionsBuilder compilerOptionsBuilder(t.projectPart, CompilerOptionsBuilder compilerOptionsBuilder(t.projectPart, UseSystemHeader::No,
CppTools::UseSystemHeader::No, UseTweakedHeaderPaths::Yes, UseLanguageDefines::No, UseBuildSystemWarnings::No,
CppTools::UseTweakedHeaderPaths::Yes, "dummy_version", "");
CppTools::UseLanguageDefines::No,
CppTools::UseBuildSystemWarnings::No,
"dummy_version",
"");
compilerOptionsBuilder.addHeaderPathOptions(); compilerOptionsBuilder.addHeaderPathOptions();
QCOMPARE(compilerOptionsBuilder.options(), QCOMPARE(compilerOptionsBuilder.options(),
@@ -372,13 +335,9 @@ void CppToolsPlugin::test_optionsBuilder_clangHeadersAndCppIncludePathsOrderAndr
t.builtIn("C:/Android/sdk/ndk-bundle/sysroot/usr/include"), t.builtIn("C:/Android/sdk/ndk-bundle/sysroot/usr/include"),
}; };
t.projectPart.toolChainTargetTriple = "i686-linux-android"; t.projectPart.toolChainTargetTriple = "i686-linux-android";
CppTools::CompilerOptionsBuilder compilerOptionsBuilder(t.projectPart, CompilerOptionsBuilder compilerOptionsBuilder(t.projectPart, UseSystemHeader::No,
CppTools::UseSystemHeader::No, UseTweakedHeaderPaths::Yes, UseLanguageDefines::No, UseBuildSystemWarnings::No,
CppTools::UseTweakedHeaderPaths::Yes, "dummy_version", "");
CppTools::UseLanguageDefines::No,
CppTools::UseBuildSystemWarnings::No,
"dummy_version",
"");
compilerOptionsBuilder.addHeaderPathOptions(); compilerOptionsBuilder.addHeaderPathOptions();
QCOMPARE(compilerOptionsBuilder.options(), QCOMPARE(compilerOptionsBuilder.options(),
@@ -394,7 +353,7 @@ void CppToolsPlugin::test_optionsBuilder_clangHeadersAndCppIncludePathsOrderAndr
void CppToolsPlugin::test_optionsBuilder_noPrecompiledHeader() void CppToolsPlugin::test_optionsBuilder_noPrecompiledHeader()
{ {
CompilerOptionsBuilderTest t; CompilerOptionsBuilderTest t;
t.compilerOptionsBuilder.addPrecompiledHeaderOptions(CppTools::UsePrecompiledHeaders::No); t.compilerOptionsBuilder.addPrecompiledHeaderOptions(UsePrecompiledHeaders::No);
QVERIFY(t.compilerOptionsBuilder.options().empty()); QVERIFY(t.compilerOptionsBuilder.options().empty());
} }
@@ -402,7 +361,7 @@ void CppToolsPlugin::test_optionsBuilder_noPrecompiledHeader()
void CppToolsPlugin::test_optionsBuilder_usePrecompiledHeader() void CppToolsPlugin::test_optionsBuilder_usePrecompiledHeader()
{ {
CompilerOptionsBuilderTest t; CompilerOptionsBuilderTest t;
t.compilerOptionsBuilder.addPrecompiledHeaderOptions(CppTools::UsePrecompiledHeaders::Yes); t.compilerOptionsBuilder.addPrecompiledHeaderOptions(UsePrecompiledHeaders::Yes);
QCOMPARE(t.compilerOptionsBuilder.options(), (QStringList{"-include", t.pchFileNativePath()})); QCOMPARE(t.compilerOptionsBuilder.options(), (QStringList{"-include", t.pchFileNativePath()}));
} }
@@ -410,10 +369,10 @@ void CppToolsPlugin::test_optionsBuilder_usePrecompiledHeader()
void CppToolsPlugin::test_optionsBuilder_usePrecompiledHeaderMsvc() void CppToolsPlugin::test_optionsBuilder_usePrecompiledHeaderMsvc()
{ {
CompilerOptionsBuilderTest t; CompilerOptionsBuilderTest t;
t.projectPart.toolchainType = ProjectExplorer::Constants::MSVC_TOOLCHAIN_TYPEID; t.projectPart.toolchainType = Constants::MSVC_TOOLCHAIN_TYPEID;
CppTools::CompilerOptionsBuilder compilerOptionsBuilder{t.projectPart}; CompilerOptionsBuilder compilerOptionsBuilder{t.projectPart};
compilerOptionsBuilder.evaluateCompilerFlags(); compilerOptionsBuilder.evaluateCompilerFlags();
compilerOptionsBuilder.addPrecompiledHeaderOptions(CppTools::UsePrecompiledHeaders::Yes); compilerOptionsBuilder.addPrecompiledHeaderOptions(UsePrecompiledHeaders::Yes);
QCOMPARE(compilerOptionsBuilder.options(), (QStringList{"/FI", t.pchFileNativePath()})); QCOMPARE(compilerOptionsBuilder.options(), (QStringList{"/FI", t.pchFileNativePath()}));
} }
@@ -421,8 +380,7 @@ void CppToolsPlugin::test_optionsBuilder_usePrecompiledHeaderMsvc()
void CppToolsPlugin::test_optionsBuilder_addMacros() void CppToolsPlugin::test_optionsBuilder_addMacros()
{ {
CompilerOptionsBuilderTest t; CompilerOptionsBuilderTest t;
t.compilerOptionsBuilder.addMacros( t.compilerOptionsBuilder.addMacros(Macros{Macro{"key", "value"}});
ProjectExplorer::Macros{ProjectExplorer::Macro{"key", "value"}});
QCOMPARE(t.compilerOptionsBuilder.options(), QStringList("-Dkey=value")); QCOMPARE(t.compilerOptionsBuilder.options(), QStringList("-Dkey=value"));
} }
@@ -455,13 +413,9 @@ void CppToolsPlugin::test_optionsBuilder_enableCxxExceptions()
void CppToolsPlugin::test_optionsBuilder_insertWrappedQtHeaders() void CppToolsPlugin::test_optionsBuilder_insertWrappedQtHeaders()
{ {
CompilerOptionsBuilderTest t; CompilerOptionsBuilderTest t;
CppTools::CompilerOptionsBuilder compilerOptionsBuilder{t.projectPart, CompilerOptionsBuilder compilerOptionsBuilder{t.projectPart, UseSystemHeader::Yes,
CppTools::UseSystemHeader::Yes, UseTweakedHeaderPaths::Yes, UseLanguageDefines::No, UseBuildSystemWarnings::No,
CppTools::UseTweakedHeaderPaths::Yes, "dummy_version", ""};
CppTools::UseLanguageDefines::No,
CppTools::UseBuildSystemWarnings::No,
"dummy_version",
""};
compilerOptionsBuilder.insertWrappedQtHeaders(); compilerOptionsBuilder.insertWrappedQtHeaders();
QVERIFY(Utils::contains(compilerOptionsBuilder.options(), QVERIFY(Utils::contains(compilerOptionsBuilder.options(),
@@ -471,11 +425,11 @@ void CppToolsPlugin::test_optionsBuilder_insertWrappedQtHeaders()
void CppToolsPlugin::test_optionsBuilder_insertWrappedMingwHeadersWithNonMingwToolchain() void CppToolsPlugin::test_optionsBuilder_insertWrappedMingwHeadersWithNonMingwToolchain()
{ {
CompilerOptionsBuilderTest t; CompilerOptionsBuilderTest t;
CppTools::CompilerOptionsBuilder builder{t.projectPart, CompilerOptionsBuilder builder{t.projectPart,
CppTools::UseSystemHeader::Yes, UseSystemHeader::Yes,
CppTools::UseTweakedHeaderPaths::Yes, UseTweakedHeaderPaths::Yes,
CppTools::UseLanguageDefines::No, UseLanguageDefines::No,
CppTools::UseBuildSystemWarnings::No, UseBuildSystemWarnings::No,
"dummy_version", "dummy_version",
""}; ""};
builder.insertWrappedMingwHeaders(); builder.insertWrappedMingwHeaders();
@@ -487,14 +441,9 @@ void CppToolsPlugin::test_optionsBuilder_insertWrappedMingwHeadersWithNonMingwTo
void CppToolsPlugin::test_optionsBuilder_insertWrappedMingwHeadersWithMingwToolchain() void CppToolsPlugin::test_optionsBuilder_insertWrappedMingwHeadersWithMingwToolchain()
{ {
CompilerOptionsBuilderTest t; CompilerOptionsBuilderTest t;
CppTools::CompilerOptionsBuilder builder{t.projectPart, CompilerOptionsBuilder builder{t.projectPart, UseSystemHeader::Yes, UseTweakedHeaderPaths::Yes,
CppTools::UseSystemHeader::Yes, UseLanguageDefines::No, UseBuildSystemWarnings::No, "dummy_version", ""};
CppTools::UseTweakedHeaderPaths::Yes, t.projectPart.toolchainType = Constants::MINGW_TOOLCHAIN_TYPEID;
CppTools::UseLanguageDefines::No,
CppTools::UseBuildSystemWarnings::No,
"dummy_version",
""};
t.projectPart.toolchainType = ProjectExplorer::Constants::MINGW_TOOLCHAIN_TYPEID;
builder.insertWrappedMingwHeaders(); builder.insertWrappedMingwHeaders();
QVERIFY(Utils::contains(builder.options(), QVERIFY(Utils::contains(builder.options(),
@@ -512,8 +461,8 @@ void CppToolsPlugin::test_optionsBuilder_setLanguageVersion()
void CppToolsPlugin::test_optionsBuilder_setLanguageVersionMsvc() void CppToolsPlugin::test_optionsBuilder_setLanguageVersionMsvc()
{ {
CompilerOptionsBuilderTest t; CompilerOptionsBuilderTest t;
t.projectPart.toolchainType = ProjectExplorer::Constants::MSVC_TOOLCHAIN_TYPEID; t.projectPart.toolchainType = Constants::MSVC_TOOLCHAIN_TYPEID;
CppTools::CompilerOptionsBuilder compilerOptionsBuilder{t.projectPart}; CompilerOptionsBuilder compilerOptionsBuilder{t.projectPart};
compilerOptionsBuilder.evaluateCompilerFlags(); compilerOptionsBuilder.evaluateCompilerFlags();
compilerOptionsBuilder.updateFileLanguage(ProjectFile::CXXSource); compilerOptionsBuilder.updateFileLanguage(ProjectFile::CXXSource);
@@ -541,8 +490,8 @@ void CppToolsPlugin::test_optionsBuilder_updateLanguageVersion()
void CppToolsPlugin::test_optionsBuilder_updateLanguageVersionMsvc() void CppToolsPlugin::test_optionsBuilder_updateLanguageVersionMsvc()
{ {
CompilerOptionsBuilderTest t; CompilerOptionsBuilderTest t;
t.projectPart.toolchainType = ProjectExplorer::Constants::MSVC_TOOLCHAIN_TYPEID; t.projectPart.toolchainType = Constants::MSVC_TOOLCHAIN_TYPEID;
CppTools::CompilerOptionsBuilder compilerOptionsBuilder{t.projectPart}; CompilerOptionsBuilder compilerOptionsBuilder{t.projectPart};
compilerOptionsBuilder.evaluateCompilerFlags(); compilerOptionsBuilder.evaluateCompilerFlags();
compilerOptionsBuilder.updateFileLanguage(ProjectFile::CXXSource); compilerOptionsBuilder.updateFileLanguage(ProjectFile::CXXSource);
compilerOptionsBuilder.updateFileLanguage(ProjectFile::CSource); compilerOptionsBuilder.updateFileLanguage(ProjectFile::CSource);
@@ -553,8 +502,8 @@ void CppToolsPlugin::test_optionsBuilder_updateLanguageVersionMsvc()
void CppToolsPlugin::test_optionsBuilder_addMsvcCompatibilityVersion() void CppToolsPlugin::test_optionsBuilder_addMsvcCompatibilityVersion()
{ {
CompilerOptionsBuilderTest t; CompilerOptionsBuilderTest t;
t.projectPart.toolchainType = ProjectExplorer::Constants::MSVC_TOOLCHAIN_TYPEID; t.projectPart.toolchainType = Constants::MSVC_TOOLCHAIN_TYPEID;
t.projectPart.toolChainMacros.append(ProjectExplorer::Macro{"_MSC_FULL_VER", "190000000"}); t.projectPart.toolChainMacros.append(Macro{"_MSC_FULL_VER", "190000000"});
t.compilerOptionsBuilder.addMsvcCompatibilityVersion(); t.compilerOptionsBuilder.addMsvcCompatibilityVersion();
QCOMPARE(t.compilerOptionsBuilder.options(), QStringList("-fms-compatibility-version=19.00")); QCOMPARE(t.compilerOptionsBuilder.options(), QStringList("-fms-compatibility-version=19.00"));
@@ -563,7 +512,7 @@ void CppToolsPlugin::test_optionsBuilder_addMsvcCompatibilityVersion()
void CppToolsPlugin::test_optionsBuilder_undefineCppLanguageFeatureMacrosForMsvc2015() void CppToolsPlugin::test_optionsBuilder_undefineCppLanguageFeatureMacrosForMsvc2015()
{ {
CompilerOptionsBuilderTest t; CompilerOptionsBuilderTest t;
t.projectPart.toolchainType = ProjectExplorer::Constants::MSVC_TOOLCHAIN_TYPEID; t.projectPart.toolchainType = Constants::MSVC_TOOLCHAIN_TYPEID;
t.projectPart.isMsvc2015Toolchain = true; t.projectPart.isMsvc2015Toolchain = true;
t.compilerOptionsBuilder.undefineCppLanguageFeatureMacrosForMsvc2015(); t.compilerOptionsBuilder.undefineCppLanguageFeatureMacrosForMsvc2015();
@@ -573,7 +522,7 @@ void CppToolsPlugin::test_optionsBuilder_undefineCppLanguageFeatureMacrosForMsvc
void CppToolsPlugin::test_optionsBuilder_addDefineFunctionMacrosMsvc() void CppToolsPlugin::test_optionsBuilder_addDefineFunctionMacrosMsvc()
{ {
CompilerOptionsBuilderTest t; CompilerOptionsBuilderTest t;
t.projectPart.toolchainType = ProjectExplorer::Constants::MSVC_TOOLCHAIN_TYPEID; t.projectPart.toolchainType = Constants::MSVC_TOOLCHAIN_TYPEID;
t.compilerOptionsBuilder.addDefineFunctionMacrosMsvc(); t.compilerOptionsBuilder.addDefineFunctionMacrosMsvc();
QVERIFY(t.compilerOptionsBuilder.options().contains( QVERIFY(t.compilerOptionsBuilder.options().contains(
@@ -593,8 +542,8 @@ void CppToolsPlugin::test_optionsBuilder_addProjectConfigFileIncludeMsvc()
{ {
CompilerOptionsBuilderTest t; CompilerOptionsBuilderTest t;
t.projectPart.projectConfigFile = "dummy_file.h"; t.projectPart.projectConfigFile = "dummy_file.h";
t.projectPart.toolchainType = ProjectExplorer::Constants::MSVC_TOOLCHAIN_TYPEID; t.projectPart.toolchainType = Constants::MSVC_TOOLCHAIN_TYPEID;
CppTools::CompilerOptionsBuilder compilerOptionsBuilder{t.projectPart}; CompilerOptionsBuilder compilerOptionsBuilder{t.projectPart};
compilerOptionsBuilder.evaluateCompilerFlags(); compilerOptionsBuilder.evaluateCompilerFlags();
compilerOptionsBuilder.addProjectConfigFileInclude(); compilerOptionsBuilder.addProjectConfigFileInclude();
@@ -604,7 +553,7 @@ void CppToolsPlugin::test_optionsBuilder_addProjectConfigFileIncludeMsvc()
void CppToolsPlugin::test_optionsBuilder_noUndefineClangVersionMacrosForNewMsvc() void CppToolsPlugin::test_optionsBuilder_noUndefineClangVersionMacrosForNewMsvc()
{ {
CompilerOptionsBuilderTest t; CompilerOptionsBuilderTest t;
t.projectPart.toolchainType = ProjectExplorer::Constants::MSVC_TOOLCHAIN_TYPEID; t.projectPart.toolchainType = Constants::MSVC_TOOLCHAIN_TYPEID;
t.compilerOptionsBuilder.undefineClangVersionMacrosForMsvc(); t.compilerOptionsBuilder.undefineClangVersionMacrosForMsvc();
QVERIFY(!t.compilerOptionsBuilder.options().contains("-U__clang__")); QVERIFY(!t.compilerOptionsBuilder.options().contains("-U__clang__"));
@@ -613,9 +562,9 @@ void CppToolsPlugin::test_optionsBuilder_noUndefineClangVersionMacrosForNewMsvc(
void CppToolsPlugin::test_optionsBuilder_undefineClangVersionMacrosForOldMsvc() void CppToolsPlugin::test_optionsBuilder_undefineClangVersionMacrosForOldMsvc()
{ {
CompilerOptionsBuilderTest t; CompilerOptionsBuilderTest t;
t.projectPart.toolchainType = ProjectExplorer::Constants::MSVC_TOOLCHAIN_TYPEID; t.projectPart.toolchainType = Constants::MSVC_TOOLCHAIN_TYPEID;
t.projectPart.toolChainMacros = {ProjectExplorer::Macro{"_MSC_FULL_VER", "1300"}, t.projectPart.toolChainMacros = {Macro{"_MSC_FULL_VER", "1300"},
ProjectExplorer::Macro{"_MSC_VER", "13"}}; Macro{"_MSC_VER", "13"}};
t.compilerOptionsBuilder.undefineClangVersionMacrosForMsvc(); t.compilerOptionsBuilder.undefineClangVersionMacrosForMsvc();
QVERIFY(t.compilerOptionsBuilder.options().contains("-U__clang__")); QVERIFY(t.compilerOptionsBuilder.options().contains("-U__clang__"));
@@ -625,14 +574,10 @@ void CppToolsPlugin::test_optionsBuilder_buildAllOptions()
{ {
CompilerOptionsBuilderTest t; CompilerOptionsBuilderTest t;
t.projectPart.extraCodeModelFlags = QStringList{"-arch", "x86_64"}; t.projectPart.extraCodeModelFlags = QStringList{"-arch", "x86_64"};
CppTools::CompilerOptionsBuilder compilerOptionsBuilder(t.projectPart, CompilerOptionsBuilder compilerOptionsBuilder(t.projectPart, UseSystemHeader::No,
CppTools::UseSystemHeader::No, UseTweakedHeaderPaths::Yes, UseLanguageDefines::No, UseBuildSystemWarnings::No,
CppTools::UseTweakedHeaderPaths::Yes, "dummy_version", "");
CppTools::UseLanguageDefines::No, compilerOptionsBuilder.build(ProjectFile::CXXSource, UsePrecompiledHeaders::No);
CppTools::UseBuildSystemWarnings::No,
"dummy_version",
"");
compilerOptionsBuilder.build(ProjectFile::CXXSource, CppTools::UsePrecompiledHeaders::No);
const QString wrappedQtHeadersPath = Utils::findOrDefault(compilerOptionsBuilder.options(), const QString wrappedQtHeadersPath = Utils::findOrDefault(compilerOptionsBuilder.options(),
[](const QString &o) { return o.contains("wrappedQtHeaders"); }); [](const QString &o) { return o.contains("wrappedQtHeaders"); });
@@ -652,15 +597,11 @@ void CppToolsPlugin::test_optionsBuilder_buildAllOptions()
void CppToolsPlugin::test_optionsBuilder_buildAllOptionsMsvc() void CppToolsPlugin::test_optionsBuilder_buildAllOptionsMsvc()
{ {
CompilerOptionsBuilderTest t; CompilerOptionsBuilderTest t;
t.projectPart.toolchainType = ProjectExplorer::Constants::MSVC_TOOLCHAIN_TYPEID; t.projectPart.toolchainType = Constants::MSVC_TOOLCHAIN_TYPEID;
CppTools::CompilerOptionsBuilder compilerOptionsBuilder(t.projectPart, CompilerOptionsBuilder compilerOptionsBuilder(t.projectPart, UseSystemHeader::No,
CppTools::UseSystemHeader::No, UseTweakedHeaderPaths::Yes, UseLanguageDefines::No, UseBuildSystemWarnings::No,
CppTools::UseTweakedHeaderPaths::Yes, "dummy_version", "");
CppTools::UseLanguageDefines::No, compilerOptionsBuilder.build(ProjectFile::CXXSource, UsePrecompiledHeaders::No);
CppTools::UseBuildSystemWarnings::No,
"dummy_version",
"");
compilerOptionsBuilder.build(ProjectFile::CXXSource, CppTools::UsePrecompiledHeaders::No);
const QString wrappedQtHeadersPath = Utils::findOrDefault(compilerOptionsBuilder.options(), const QString wrappedQtHeadersPath = Utils::findOrDefault(compilerOptionsBuilder.options(),
[](const QString &o) { return o.contains("wrappedQtHeaders"); }); [](const QString &o) { return o.contains("wrappedQtHeaders"); });
@@ -684,16 +625,12 @@ void CppToolsPlugin::test_optionsBuilder_buildAllOptionsMsvc()
void CppToolsPlugin::test_optionsBuilder_buildAllOptionsMsvcWithExceptions() void CppToolsPlugin::test_optionsBuilder_buildAllOptionsMsvcWithExceptions()
{ {
CompilerOptionsBuilderTest t; CompilerOptionsBuilderTest t;
t.projectPart.toolchainType = ProjectExplorer::Constants::MSVC_TOOLCHAIN_TYPEID; t.projectPart.toolchainType = Constants::MSVC_TOOLCHAIN_TYPEID;
t.projectPart.toolChainMacros.append(ProjectExplorer::Macro{"_CPPUNWIND", "1"}); t.projectPart.toolChainMacros.append(Macro{"_CPPUNWIND", "1"});
CppTools::CompilerOptionsBuilder compilerOptionsBuilder(t.projectPart, CompilerOptionsBuilder compilerOptionsBuilder(t.projectPart, UseSystemHeader::No,
CppTools::UseSystemHeader::No, UseTweakedHeaderPaths::Yes, UseLanguageDefines::No, UseBuildSystemWarnings::No,
CppTools::UseTweakedHeaderPaths::Yes, "dummy_version", "");
CppTools::UseLanguageDefines::No, compilerOptionsBuilder.build(ProjectFile::CXXSource, UsePrecompiledHeaders::No);
CppTools::UseBuildSystemWarnings::No,
"dummy_version",
"");
compilerOptionsBuilder.build(ProjectFile::CXXSource, CppTools::UsePrecompiledHeaders::No);
const QString wrappedQtHeadersPath = Utils::findOrDefault(compilerOptionsBuilder.options(), const QString wrappedQtHeadersPath = Utils::findOrDefault(compilerOptionsBuilder.options(),
[](const QString &o) { return o.contains("wrappedQtHeaders"); }); [](const QString &o) { return o.contains("wrappedQtHeaders"); });

30
src/plugins/cpptools/projectinfo_test.cpp
View File

@@ -67,10 +67,10 @@ public:
QList<ProjectPart::Ptr> projectParts; QList<ProjectPart::Ptr> projectParts;
const ProjectPart::Ptr p1{new ProjectPart}; const ProjectPart::Ptr p1{new ProjectPart};
p1->project = reinterpret_cast<ProjectExplorer::Project *>(1 << 0); p1->project = reinterpret_cast<Project *>(1 << 0);
projectParts.append(p1); projectParts.append(p1);
const ProjectPart::Ptr p2{new ProjectPart}; const ProjectPart::Ptr p2{new ProjectPart};
p2->project = reinterpret_cast<ProjectExplorer::Project *>(1 << 1); p2->project = reinterpret_cast<Project *>(1 << 1);
projectParts.append(p2); projectParts.append(p2);
return projectParts; return projectParts;
@@ -99,7 +99,7 @@ public:
{currentProjectPart}, {currentProjectPart},
ProjectPartInfo::NoHint}; ProjectPartInfo::NoHint};
QString preferredProjectPartId; QString preferredProjectPartId;
const ProjectExplorer::Project *activeProject = nullptr; const Project *activeProject = nullptr;
Language languagePreference = Language::Cxx; Language languagePreference = Language::Cxx;
bool projectsChanged = false; bool projectsChanged = false;
ProjectPartChooser chooser; ProjectPartChooser chooser;
@@ -327,10 +327,10 @@ void CppToolsPlugin::test_projectPartChooser_doNotIndicateFromDependencies()
} }
namespace { namespace {
class TestToolchain : public ProjectExplorer::ToolChain class TestToolchain : public ToolChain
{ {
public: public:
TestToolchain() : ProjectExplorer::ToolChain("dummy") {} TestToolchain() : ToolChain("dummy") {}
private: private:
MacroInspectionRunner createMacroInspectionRunner() const override { return {}; } MacroInspectionRunner createMacroInspectionRunner() const override { return {}; }
@@ -341,7 +341,7 @@ private:
void addToEnvironment(Utils::Environment &) const override {} void addToEnvironment(Utils::Environment &) const override {}
Utils::FilePath makeCommand(const Utils::Environment &) const override { return {}; } Utils::FilePath makeCommand(const Utils::Environment &) const override { return {}; }
QList<Utils::OutputLineParser *> createOutputParsers() const override { return {}; } QList<Utils::OutputLineParser *> createOutputParsers() const override { return {}; }
std::unique_ptr<ProjectExplorer::ToolChainConfigWidget> createConfigurationWidget() override std::unique_ptr<ToolChainConfigWidget> createConfigurationWidget() override
{ {
return {}; return {};
}; };
@@ -363,8 +363,8 @@ public:
return generator.generate(); return generator.generate();
} }
ProjectExplorer::ProjectUpdateInfo projectUpdateInfo; ProjectUpdateInfo projectUpdateInfo;
ProjectExplorer::RawProjectPart rawProjectPart; RawProjectPart rawProjectPart;
}; };
} }
@@ -420,8 +420,7 @@ void CppToolsPlugin::test_projectInfoGenerator_useMacroInspectionReportForLangua
{ {
ProjectInfoGeneratorTest t; ProjectInfoGeneratorTest t;
t.projectUpdateInfo.cxxToolChainInfo.macroInspectionRunner = [](const QStringList &) { t.projectUpdateInfo.cxxToolChainInfo.macroInspectionRunner = [](const QStringList &) {
return TestToolchain::MacroInspectionReport{ProjectExplorer::Macros(), return TestToolchain::MacroInspectionReport{Macros(), Utils::LanguageVersion::CXX17};
Utils::LanguageVersion::CXX17};
}; };
t.rawProjectPart.files = QStringList{ "foo.cpp" }; t.rawProjectPart.files = QStringList{ "foo.cpp" };
const ProjectInfo projectInfo = t.generate(); const ProjectInfo projectInfo = t.generate();
@@ -507,10 +506,9 @@ public:
return HeaderPath{path, HeaderPathType::User}; return HeaderPath{path, HeaderPathType::User};
} }
ProjectExplorer::Project project; Project project;
CppTools::ProjectPart projectPart; ProjectPart projectPart;
CppTools::HeaderPathFilter filter{ HeaderPathFilter filter{projectPart, UseTweakedHeaderPaths::No, {}, {}, "/project", "/build"};
projectPart, CppTools::UseTweakedHeaderPaths::No, {}, {}, "/project", "/build"};
}; };
} }
@@ -638,7 +636,7 @@ void CppToolsPlugin::test_headerPathFilter_removeGccInternalPaths()
{ {
HeaderPathFilterTest t; HeaderPathFilterTest t;
t.projectPart.toolChainInstallDir = Utils::FilePath::fromUtf8("/usr/lib/gcc/x86_64-linux-gnu/7"); t.projectPart.toolChainInstallDir = Utils::FilePath::fromUtf8("/usr/lib/gcc/x86_64-linux-gnu/7");
t.projectPart.toolchainType = ProjectExplorer::Constants::GCC_TOOLCHAIN_TYPEID; t.projectPart.toolchainType = Constants::GCC_TOOLCHAIN_TYPEID;
t.projectPart.headerPaths = { t.projectPart.headerPaths = {
t.builtIn("/usr/lib/gcc/x86_64-linux-gnu/7/include"), t.builtIn("/usr/lib/gcc/x86_64-linux-gnu/7/include"),
t.builtIn("/usr/lib/gcc/x86_64-linux-gnu/7/include-fixed"), t.builtIn("/usr/lib/gcc/x86_64-linux-gnu/7/include-fixed"),
@@ -657,7 +655,7 @@ void CppToolsPlugin::test_headerPathFilter_removeGccInternalPathsExceptForStanda
HeaderPathFilterTest t; HeaderPathFilterTest t;
t.projectPart.toolChainInstallDir = Utils::FilePath::fromUtf8( t.projectPart.toolChainInstallDir = Utils::FilePath::fromUtf8(
"c:/mingw/lib/gcc/x86_64-w64-mingw32/7.3.0"); "c:/mingw/lib/gcc/x86_64-w64-mingw32/7.3.0");
t.projectPart.toolchainType = ProjectExplorer::Constants::MINGW_TOOLCHAIN_TYPEID; t.projectPart.toolchainType = Constants::MINGW_TOOLCHAIN_TYPEID;
t.projectPart.headerPaths = { t.projectPart.headerPaths = {
t.builtIn("c:/mingw/lib/gcc/x86_64-w64-mingw32/7.3.0/include/c++"), t.builtIn("c:/mingw/lib/gcc/x86_64-w64-mingw32/7.3.0/include/c++"),
t.builtIn("c:/mingw/lib/gcc/x86_64-w64-mingw32/7.3.0/include/c++/x86_64-w64-mingw32"), t.builtIn("c:/mingw/lib/gcc/x86_64-w64-mingw32/7.3.0/include/c++/x86_64-w64-mingw32"),