diff --git a/src/libs/clangsupport/commandlinebuilder.h b/src/libs/clangsupport/commandlinebuilder.h index 7367f080360..9de1da68d3c 100644 --- a/src/libs/clangsupport/commandlinebuilder.h +++ b/src/libs/clangsupport/commandlinebuilder.h @@ -51,6 +51,7 @@ public: commandLine.reserve(1024); addCompiler(projectInfo.language); + disableWarnings(); addToolChainArguments(toolChainArguments); addExtraFlags(); addLanguage(projectInfo, sourceType); @@ -74,6 +75,8 @@ public: commandLine.emplace_back("clang"); } + void disableWarnings() { commandLine.emplace_back("-w"); } + void addToolChainArguments(const Utils::SmallStringVector &toolChainArguments) { for (Utils::SmallStringView argument : toolChainArguments) diff --git a/tests/unit/unittest/commandlinebuilder-test.cpp b/tests/unit/unittest/commandlinebuilder-test.cpp index a75c8d8a35c..328b832b9c4 100644 --- a/tests/unit/unittest/commandlinebuilder-test.cpp +++ b/tests/unit/unittest/commandlinebuilder-test.cpp @@ -139,6 +139,7 @@ TYPED_TEST(CommandLineBuilder, CHeader) ASSERT_THAT(builder.commandLine, ElementsAre("clang", + "-w", "-DNOMINMAX", "-x", "c-header", @@ -156,6 +157,7 @@ TYPED_TEST(CommandLineBuilder, CSource) ASSERT_THAT(builder.commandLine, ElementsAre("clang", + "-w", "-DNOMINMAX", "-x", "c", @@ -174,6 +176,7 @@ TYPED_TEST(CommandLineBuilder, ObjectiveCHeader) ASSERT_THAT(builder.commandLine, ElementsAre("clang", + "-w", "-DNOMINMAX", "-x", "objective-c-header", @@ -192,6 +195,7 @@ TYPED_TEST(CommandLineBuilder, ObjectiveCSource) ASSERT_THAT(builder.commandLine, ElementsAre("clang", + "-w", "-DNOMINMAX", "-x", "objective-c", @@ -209,6 +213,7 @@ TYPED_TEST(CommandLineBuilder, CppHeader) ASSERT_THAT(builder.commandLine, ElementsAre("clang++", + "-w", "-DNOMINMAX", "-x", "c++-header", @@ -227,6 +232,7 @@ TYPED_TEST(CommandLineBuilder, CppSource) ASSERT_THAT(builder.commandLine, ElementsAre("clang++", + "-w", "-DNOMINMAX", "-x", "c++", @@ -246,6 +252,7 @@ TYPED_TEST(CommandLineBuilder, ObjectiveCppHeader) ASSERT_THAT(builder.commandLine, ElementsAre("clang++", + "-w", "-DNOMINMAX", "-x", "objective-c++-header", @@ -265,6 +272,7 @@ TYPED_TEST(CommandLineBuilder, ObjectiveCppSource) ASSERT_THAT(builder.commandLine, ElementsAre("clang++", + "-w", "-DNOMINMAX", "-x", "objective-c++", @@ -498,6 +506,7 @@ TYPED_TEST(CommandLineBuilder, IncludesOrder) ASSERT_THAT(builder.commandLine, ElementsAre("clang++", + "-w", "-DNOMINMAX", "-x", "c++-header", @@ -525,6 +534,7 @@ TYPED_TEST(CommandLineBuilder, EmptySourceFile) ASSERT_THAT(builder.commandLine, ElementsAre("clang++", + "-w", "-DNOMINMAX", "-x", "c++-header", @@ -539,6 +549,7 @@ TYPED_TEST(CommandLineBuilder, SourceFile) ASSERT_THAT(builder.commandLine, ElementsAre("clang++", + "-w", "-DNOMINMAX", "-x", "c++-header", @@ -555,6 +566,7 @@ TYPED_TEST(CommandLineBuilder, EmptyOutputFile) ASSERT_THAT(builder.commandLine, ElementsAre("clang++", + "-w", "-DNOMINMAX", "-x", "c++-header", @@ -574,6 +586,7 @@ TYPED_TEST(CommandLineBuilder, OutputFile) ASSERT_THAT(builder.commandLine, ElementsAre("clang++", + "-w", "-DNOMINMAX", "-x", "c++-header", @@ -596,6 +609,7 @@ TYPED_TEST(CommandLineBuilder, IncludePchPath) ASSERT_THAT(builder.commandLine, ElementsAre("clang++", + "-w", "-DNOMINMAX", "-x", "c++-header", @@ -619,6 +633,7 @@ TYPED_TEST(CommandLineBuilder, CompilerMacros) ASSERT_THAT(builder.commandLine, ElementsAre("clang++", + "-w", "-DNOMINMAX", "-x", "c++-header", diff --git a/tests/unit/unittest/pchcreator-test.cpp b/tests/unit/unittest/pchcreator-test.cpp index b28769b51bb..3dbafc8aa08 100644 --- a/tests/unit/unittest/pchcreator-test.cpp +++ b/tests/unit/unittest/pchcreator-test.cpp @@ -141,6 +141,7 @@ TEST_F(PchCreator, CreateProjectPartClangCompilerArguments) ASSERT_THAT(arguments, ElementsAre("clang++", + "-w", "-DNOMINMAX", "-x", "c++-header", @@ -165,6 +166,7 @@ TEST_F(PchCreator, CreateProjectPartClangCompilerArgumentsWithSystemPch) ASSERT_THAT(arguments, ElementsAre("clang++", + "-w", "-DNOMINMAX", "-x", "c++-header", diff --git a/tests/unit/unittest/symbolindexer-test.cpp b/tests/unit/unittest/symbolindexer-test.cpp index 1e73f8a71b2..ea015bdee65 100644 --- a/tests/unit/unittest/symbolindexer-test.cpp +++ b/tests/unit/unittest/symbolindexer-test.cpp @@ -262,6 +262,7 @@ TEST_F(SymbolIndexer, UpdateProjectPartsCallsAddFilesInCollector) EXPECT_CALL(mockCollector, setFile(main1PathId, ElementsAre("clang++", + "-w", "-Wno-pragma-once-outside-header", "-DNOMINMAX", "-x", @@ -294,6 +295,7 @@ TEST_F(SymbolIndexer, UpdateProjectPartsCallsAddFilesWithPrecompiledHeaderInColl EXPECT_CALL(mockCollector, setFile(main1PathId, ElementsAre("clang++", + "-w", "-Wno-pragma-once-outside-header", "-DNOMINMAX", "-x", @@ -328,6 +330,7 @@ TEST_F(SymbolIndexer, UpdateProjectPartsCallsAddFilesWithoutPrecompiledHeaderInC EXPECT_CALL(mockCollector, setFile(main1PathId, ElementsAre("clang++", + "-w", "-Wno-pragma-once-outside-header", "-DNOMINMAX", "-x", @@ -489,6 +492,7 @@ TEST_F(SymbolIndexer, UpdateProjectPartsCallsInOrderWithoutProjectPartArtifact) EXPECT_CALL(mockCollector, setFile(main1PathId, ElementsAre("clang++", + "-w", "-Wno-pragma-once-outside-header", "-DNOMINMAX", "-x", @@ -541,6 +545,7 @@ TEST_F(SymbolIndexer, UpdateProjectPartsCallsInOrderWithProjectPartArtifact) EXPECT_CALL(mockCollector, setFile(Eq(main1PathId), ElementsAre("clang++", + "-w", "-Wno-pragma-once-outside-header", "-DNOMINMAX", "-x", @@ -595,6 +600,7 @@ TEST_F(SymbolIndexer, UpdateProjectPartsCallsInOrderButGetsAnErrorForCollectingS EXPECT_CALL(mockCollector, setFile(main1PathId, ElementsAre("clang++", + "-w", "-Wno-pragma-once-outside-header", "-DNOMINMAX", "-x", @@ -659,6 +665,7 @@ TEST_F(SymbolIndexer, UpdateChangedPathCallsInOrder) EXPECT_CALL(mockCollector, setFile(Eq(sourceFileIds[0]), ElementsAre("clang++", + "-w", "-DFOO", "-DNOMINMAX", "-x", @@ -721,6 +728,7 @@ TEST_F(SymbolIndexer, UpdateChangedPathCallsInOrderButGetsAnErrorForCollectingSy EXPECT_CALL(mockCollector, setFile(Eq(sourceFileIds[0]), ElementsAre("clang++", + "-w", "-DFOO", "-DNOMINMAX", "-x", @@ -763,6 +771,7 @@ TEST_F(SymbolIndexer, UpdateChangedPathIsUsingPrecompiledHeader) EXPECT_CALL(mockCollector, setFile(Eq(sourceFileIds[0]), ElementsAre("clang++", + "-w", "-DFOO", "-DNOMINMAX", "-x", @@ -799,6 +808,7 @@ TEST_F(SymbolIndexer, UpdateChangedPathIsNotUsingPrecompiledHeaderIfItNotExists) EXPECT_CALL(mockCollector, setFile(Eq(sourceFileIds[0]), ElementsAre("clang++", + "-w", "-DFOO", "-DNOMINMAX", "-x",