Skip to content

Commit c546c2f

Browse files
committed
better?
1 parent c2b61ad commit c546c2f

File tree

2 files changed

+7
-9
lines changed

2 files changed

+7
-9
lines changed

src/test/TestRunner.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -139,18 +139,16 @@ handleFile(
139139
handleCompilationDatabase(filePath, compilations, config);
140140
}
141141

142-
#if defined(_MSC_VER)
143142
// Test again in clang-cl mode
144143
{
145144
auto const db = makeSingleFileDB(filePath,
146-
{"clang-cl", "/std:c++latest", "/permissive-", "/WX"});
145+
{"cl", "/std:c++latest", "/permissive-", "/WX"});
147146

148147
// Create an adjusted MrDocsDatabase
149148
MrDocsCompilationDatabase compilations(
150149
llvm::StringRef(parentDir), db, config, defaultIncludePaths);
151150
handleCompilationDatabase(filePath, compilations, config);
152151
}
153-
#endif
154152
}
155153

156154
void

src/test/lib/MrDocsCompilationDatabase.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ struct MrDocsCompilationDatabase_test
186186

187187
void testClangCL_stdCxx()
188188
{
189-
std::string const programName = "clang-cl";
189+
std::string const programName = "cl";
190190

191191
{
192192
auto adjusted = adjustCompileCommand({ programName });
@@ -206,7 +206,7 @@ struct MrDocsCompilationDatabase_test
206206

207207
void testClangCL_stdC()
208208
{
209-
std::string const programName = "clang-cl";
209+
std::string const programName = "cl";
210210

211211
{
212212
auto adjusted = adjustCompileCommand({ programName, "-x", "c" });
@@ -226,7 +226,7 @@ struct MrDocsCompilationDatabase_test
226226

227227
void testClangCL_defines()
228228
{
229-
std::string const programName = "clang-cl";
229+
std::string const programName = "cl";
230230

231231
{
232232
std::shared_ptr<TestConfigImpl> config = std::make_shared<TestConfigImpl>();
@@ -242,7 +242,7 @@ struct MrDocsCompilationDatabase_test
242242

243243
void testClangCL_stdlib()
244244
{
245-
std::string const programName = "clang-cl";
245+
std::string const programName = "cl";
246246

247247
{
248248
std::shared_ptr<TestConfigImpl> config = std::make_shared<TestConfigImpl>();
@@ -257,7 +257,7 @@ struct MrDocsCompilationDatabase_test
257257

258258
void testClangCL_libc()
259259
{
260-
std::string const programName = "clang-cl";
260+
std::string const programName = "cl";
261261

262262
{
263263
std::shared_ptr<TestConfigImpl> config = std::make_shared<TestConfigImpl>();
@@ -272,7 +272,7 @@ struct MrDocsCompilationDatabase_test
272272

273273
void testClangCL_systemIncludes()
274274
{
275-
std::string const programName = "clang-cl";
275+
std::string const programName = "cl";
276276

277277
{
278278
std::shared_ptr<TestConfigImpl> config = std::make_shared<TestConfigImpl>();

0 commit comments

Comments
 (0)