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

CompilationDatabase: Speed up parsing project file

Browse Source 
Avoid expensive indexOf and check for the exactly same flags
before applying the full filter.

Change-Id: I6936b2022a2b439aad7bf0a65280c3db16d00c34
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
This commit is contained in:
Ivan Donchevskii
2018-11-02 16:07:42 +01:00
parent 9b324aaccf
commit 0fabde31ab
4 changed files with 90 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
tests/unit/unittest/compilationdatabaseutils-test.cpp
View File

@@ -53,11 +53,18 @@ TEST_F(CompilationDatabaseUtils, FilterEmptyFlags)
ASSERT_THAT(flags.isEmpty(), true);
}
TEST_F(CompilationDatabaseUtils, FilterFromFilename)
{
flags = filterFromFileName(QStringList{"-o", "foo.o"}, "foo");
ASSERT_THAT(flags, QStringList{"-o"});
}
TEST_F(CompilationDatabaseUtils, FilterArguments)
{
fileName = "compileroptionsbuilder.cpp";
workingDir = "C:/build-qtcreator-MinGW_32bit-Debug";
flags = QStringList {
flags = filterFromFileName(QStringList {
"clang++",
"-c",
"-m32",
@@ -77,7 +84,7 @@ TEST_F(CompilationDatabaseUtils, FilterArguments)
"-x",
"c++",
"C:\\qt-creator\\src\\plugins\\cpptools\\compileroptionsbuilder.cpp"
};
}, "compileroptionsbuilder");
filteredFlags(fileName, workingDir, flags, headerPaths, macros, fileKind);
@@ -146,7 +153,7 @@ TEST_F(CompilationDatabaseUtils, FilterCommand)
{
fileName = "SemaCodeComplete.cpp";
workingDir = "C:/build-qt_llvm-msvc2017_64bit-Debug";
flags = splitCommandLine(kCmakeCommand);
flags = filterFromFileName(splitCommandLine(kCmakeCommand), "SemaCodeComplete");
filteredFlags(fileName, workingDir, flags, headerPaths, macros, fileKind);
@@ -188,8 +195,7 @@ TEST_F(CompilationDatabaseUtils, FileKindDifferentFromExtension2)
TEST_F(CompilationDatabaseUtils, SkipOutputFiles)
{
fileName = "foo.cpp";
flags = QStringList{"-o", "foo.o"};
flags = filterFromFileName(QStringList{"-o", "foo.o"}, "foo");
filteredFlags(fileName, workingDir, flags, headerPaths, macros, fileKind);