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

Clang: Use full paths in compilation database for symbol collector

Browse Source 
We we FilePath and NativeFilePath so that compiler warns us if we mix them
up.

Change-Id: I33d7abc7e4e724dff2a9b2b9b23deea8b358ccfd
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
This commit is contained in:
Ivan Donchevskii
2019-01-31 10:30:58 +01:00
parent 874dde6863
commit dd778bcb23
27 changed files with 355 additions and 304 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
tests/unit/unittest/commandlinebuilder-test.cpp
View File

@@ -25,6 +25,8 @@
#include "googletest.h"
#include "filesystem-utilities.h"
#include <commandlinebuilder.h>
#include <pchtask.h>
#include <projectpartcontainer.h>
@@ -136,7 +138,7 @@ TYPED_TEST(CommandLineBuilder, CTask)
ASSERT_THAT(
builder.commandLine,
ElementsAre("clang", "-x", "c-header", "-std=c11", "-nostdinc", "-nostdinc++", "/source/file.c"));
ElementsAre("clang", "-x", "c-header", "-std=c11", "-nostdinc", "-nostdinc++", toNativePath("/source/file.c").path()));
}
TYPED_TEST(CommandLineBuilder, ObjectiveCTask)
@@ -154,7 +156,7 @@ TYPED_TEST(CommandLineBuilder, ObjectiveCTask)
"-std=c11",
"-nostdinc",
"-nostdinc++",
"/source/file.c"));
toNativePath("/source/file.c").path()));
}
TYPED_TEST(CommandLineBuilder, CppTask)
@@ -171,7 +173,7 @@ TYPED_TEST(CommandLineBuilder, CppTask)
"-std=c++98",
"-nostdinc",
"-nostdinc++",
"/source/file.cpp"));
toNativePath("/source/file.cpp").path()));
}
TYPED_TEST(CommandLineBuilder, ObjectiveCppTask)
@@ -189,7 +191,7 @@ TYPED_TEST(CommandLineBuilder, ObjectiveCppTask)
"-std=c++98",
"-nostdinc",
"-nostdinc++",
"/source/file.cpp"));
toNativePath("/source/file.cpp").path()));
}
TYPED_TEST(CommandLineBuilder, Cpp98)
@@ -422,18 +424,18 @@ TYPED_TEST(CommandLineBuilder, IncludesOrder)
"-nostdinc",
"-nostdinc++",
"-I",
"/include/foo",
toNativePath("/include/foo").path(),
"-I",
"/include/bar",
toNativePath("/include/bar").path(),
"-F",
"/system/foo",
toNativePath("/system/foo").path(),
"-isystem",
"/system/bar",
toNativePath("/system/bar").path(),
"-isystem",
"/builtin/foo",
toNativePath("/builtin/foo").path(),
"-isystem",
"/builtin/bar",
"/source/file.cpp"));
toNativePath("/builtin/bar").path(),
toNativePath("/source/file.cpp").path()));
}
TYPED_TEST(CommandLineBuilder, EmptySourceFile)
@@ -455,7 +457,7 @@ TYPED_TEST(CommandLineBuilder, SourceFile)
"-std=c++98",
"-nostdinc",
"-nostdinc++",
"/source/file.cpp"));
toNativePath("/source/file.cpp").path()));
}
@@ -470,7 +472,7 @@ TYPED_TEST(CommandLineBuilder, EmptyOutputFile)
"-std=c++98",
"-nostdinc",
"-nostdinc++",
"/source/file.cpp"));
toNativePath("/source/file.cpp").path()));
}
TYPED_TEST(CommandLineBuilder, OutputFile)
@@ -485,8 +487,8 @@ TYPED_TEST(CommandLineBuilder, OutputFile)
"-nostdinc",
"-nostdinc++",
"-o",
"/output/file.o",
"/source/file.cpp"));
toNativePath("/output/file.o").path(),
toNativePath("/source/file.cpp").path()));
}
TYPED_TEST(CommandLineBuilder, IncludePchPath)
@@ -503,10 +505,10 @@ TYPED_TEST(CommandLineBuilder, IncludePchPath)
"-Xclang",
"-include-pch",
"-Xclang",
"/pch/file.pch",
toNativePath("/pch/file.pch").path(),
"-o",
"/output/file.o",
"/source/file.cpp"));
toNativePath("/output/file.o").path(),
toNativePath("/source/file.cpp").path()));
}
TYPED_TEST(CommandLineBuilder, CompilerMacros)