Skip to content

Commit 6b3168f

Browse files
committed
[clangd] Fix windows buildbots for #import statements
1 parent 89d9912 commit 6b3168f

File tree

2 files changed

+6
-0
lines changed

2 files changed

+6
-0
lines changed

clang-tools-extra/clangd/unittests/HeadersTests.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,8 @@ TEST_F(HeadersTest, IncludeDirective) {
210210
#include_next "foo.h"
211211
)cpp";
212212

213+
// ms-compatibility changes meaning of #import, make sure it is turned off.
214+
CDB.ExtraClangFlags.push_back("-fno-ms-compatibility");
213215
EXPECT_THAT(collectIncludes().MainFileIncludes,
214216
UnorderedElementsAre(Directive(tok::pp_include),
215217
Directive(tok::pp_import),

clang-tools-extra/clangd/unittests/PreambleTests.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,8 @@ TEST(PreamblePatchTest, IncludeParsing) {
6161
^#include <b.h>)cpp",
6262
};
6363

64+
// ms-compatibility changes meaning of #import, make sure it is turned off.
65+
CDB.ExtraClangFlags.push_back("-fno-ms-compatibility");
6466
const auto FileName = testPath("foo.cc");
6567
for (const auto Case : Cases) {
6668
Annotations Test(Case);
@@ -96,6 +98,8 @@ TEST(PreamblePatchTest, ContainsNewIncludes) {
9698
MockFSProvider FS;
9799
MockCompilationDatabase CDB;
98100
IgnoreDiagnostics Diags;
101+
// ms-compatibility changes meaning of #import, make sure it is turned off.
102+
CDB.ExtraClangFlags.push_back("-fno-ms-compatibility");
99103

100104
const auto FileName = testPath("foo.cc");
101105
ParseInputs PI;

0 commit comments

Comments
 (0)