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

PchManager: Split pch tasks in project and system pch tasks

Browse Source 
Like you can see in the task numbers this patch is touching many different
areas. So I will only touch the main parts. It is using a clang action
instead of an extra process which will be enabling the handling of
generated files in PCHs. The flags from the project part are now not
anymore transformed in a command line but they are saved in the container
semantically aware so that they can later be merged. Most of this patch is
simply polishing of other patches.

Task-number: QTCREATORBUG-21346
Task-number: QTCREATORBUG-21380
Task-number: QTCREATORBUG-21382
Task-number: QTCREATORBUG-21383
Task-number: QTCREATORBUG-21693
Task-number: QTCREATORBUG-21778
Change-Id: I9b0c02d8149b554254e819448fbc61eeaa5b7494
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
This commit is contained in:
Marco Bubke
2018-12-17 12:06:57 +01:00
parent a78e3e5dd5
commit dd366b68de
114 changed files with 3742 additions and 1787 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
tests/unit/unittest/projectpartartefact-test.cpp
View File

@@ -30,30 +30,32 @@
namespace {
using ClangBackEnd::CompilerMacro;
using ClangBackEnd::IncludeSearchPath;
using ClangBackEnd::IncludeSearchPathType;
TEST(ProjectPartArtefact, CompilerArguments)
{
ClangBackEnd::ProjectPartArtefact artefact{"[\"-DFoo\",\"-DBar\"]", "", "", 1};
ClangBackEnd::ProjectPartArtefact artefact{"[\"-DFoo\",\"-DBar\"]", "", "", "", 1};
ASSERT_THAT(artefact.compilerArguments, ElementsAre(Eq("-DFoo"), Eq("-DBar")));
}
TEST(ProjectPartArtefact, EmptyCompilerArguments)
{
ClangBackEnd::ProjectPartArtefact artefact{"", "", "", 1};
ClangBackEnd::ProjectPartArtefact artefact{"", "", "", "", 1};
ASSERT_THAT(artefact.compilerArguments, IsEmpty());
}
TEST(ProjectPartArtefact, CompilerArgumentsParseError)
{
ASSERT_THROW(ClangBackEnd::ProjectPartArtefact("\"-DFoo\",\"-DBar\"]", "", "", 1),
ASSERT_THROW(ClangBackEnd::ProjectPartArtefact("\"-DFoo\",\"-DBar\"]", "", "", "", 1),
ClangBackEnd::ProjectPartArtefactParseError);
}
TEST(ProjectPartArtefact, CompilerMacros)
{
ClangBackEnd::ProjectPartArtefact artefact{"", "{\"Foo\":\"1\",\"Bar\":\"42\"}", "", 1};
ClangBackEnd::ProjectPartArtefact artefact{"", R"([["Foo","1",1], ["Bar","42",2]])", "", "", 1};
ASSERT_THAT(artefact.compilerMacros,
UnorderedElementsAre(Eq(CompilerMacro{"Foo", "1", 1}), Eq(CompilerMacro{"Bar", "42", 2})));
@@ -61,35 +63,65 @@ TEST(ProjectPartArtefact, CompilerMacros)
TEST(ProjectPartArtefact, EmptyCompilerMacros)
{
ClangBackEnd::ProjectPartArtefact artefact{"", "", "", 1};
ClangBackEnd::ProjectPartArtefact artefact{"", "", "", "", 1};
ASSERT_THAT(artefact.compilerMacros, IsEmpty());
}
TEST(ProjectPartArtefact, CompilerMacrosParseError)
{
ASSERT_THROW(ClangBackEnd::ProjectPartArtefact("", "\"Foo\":\"1\",\"Bar\":\"42\"}", "", 1),
ASSERT_THROW(ClangBackEnd::ProjectPartArtefact("", R"([["Foo":"1", 1], ["Bar", "42", 2]])", "", "", 1),
ClangBackEnd::ProjectPartArtefactParseError);
}
TEST(ProjectPartArtefact, IncludeSearchPaths)
TEST(ProjectPartArtefact, SystemIncludeSearchPaths)
{
ClangBackEnd::ProjectPartArtefact artefact{"", "", "[\"/includes\",\"/other/includes\"]", 1};
ClangBackEnd::ProjectPartArtefact artefact{
"", "", R"([["/includes", 1, 2], ["/other/includes", 2, 3]])", "", 1};
ASSERT_THAT(artefact.includeSearchPaths, ElementsAre(Eq("/includes"), Eq("/other/includes")));
ASSERT_THAT(
artefact.systemIncludeSearchPaths,
ElementsAre(Eq(IncludeSearchPath("/includes", 1, IncludeSearchPathType::BuiltIn)),
Eq(IncludeSearchPath("/other/includes", 2, IncludeSearchPathType::System))));
}
TEST(ProjectPartArtefact, EmptyIncludeSearchPaths)
TEST(ProjectPartArtefact, EmptySystemIncludeSearchPaths)
{
ClangBackEnd::ProjectPartArtefact artefact{"", "", "", 1};
ClangBackEnd::ProjectPartArtefact artefact{"", "", "", "", 1};
ASSERT_THAT(artefact.includeSearchPaths, IsEmpty());
ASSERT_THAT(artefact.systemIncludeSearchPaths, IsEmpty());
}
TEST(ProjectPartArtefact, IncludeSearchPathsParseError)
TEST(ProjectPartArtefact, ProjectIncludeSearchPaths)
{
ASSERT_THROW(ClangBackEnd::ProjectPartArtefact("", "", "\"/includes\",\"/other/includes\"]", 1),
ClangBackEnd::ProjectPartArtefactParseError);
ClangBackEnd::ProjectPartArtefact artefact{
"", "", R"([["/project/includes", 1, 1], ["/other/project/includes", 2, 1]])", "", 1};
ASSERT_THAT(
artefact.systemIncludeSearchPaths,
ElementsAre(
Eq(IncludeSearchPath("/project/includes", 1, IncludeSearchPathType::User)),
Eq(IncludeSearchPath("/other/project/includes", 2, IncludeSearchPathType::User))));
}
TEST(ProjectPartArtefact, EmptyProjectIncludeSearchPaths)
{
ClangBackEnd::ProjectPartArtefact artefact{"", "", "", "", 1};
ASSERT_THAT(artefact.projectIncludeSearchPaths, IsEmpty());
}
TEST(ProjectPartArtefact, IncludeSystemSearchPathsParseError)
{
ASSERT_THROW(
ClangBackEnd::ProjectPartArtefact("", "", R"(["/includes", 1, 3], ["/other/includes", 2, 2]])", "", 1),
ClangBackEnd::ProjectPartArtefactParseError);
}
TEST(ProjectPartArtefact, IncludeProjectSearchPathsParseError)
{
ASSERT_THROW(
ClangBackEnd::ProjectPartArtefact("", "", R"(["/project/includes", 1, 1], ["/other/project/includes", 2, 1]])", "", 1),
ClangBackEnd::ProjectPartArtefactParseError);
}
}