Zengtudor/ccls
1
0
Fork 0
mirror of https://github.com/MaskRay/ccls.git synced 2025-01-19 12:05:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add -Wno-unknown-warning-option

Browse Source
This commit is contained in:
Jacob Dufault 2017-12-01 10:11:09 -08:00
parent b727e36afc
commit cf5f465e9e
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/project.cc
View File

@ -194,6 +194,11 @@ Project::Entry GetCompilationEntryFromCompileCommandEntry(
if (!AnyStartsWith(result.args, "-resource-dir")) if (!AnyStartsWith(result.args, "-resource-dir"))
result.args.push_back("-resource-dir=" + config->resource_dir); result.args.push_back("-resource-dir=" + config->resource_dir);
// There could be a clang version mismatch between what the project uses and
// what cquery uses. Make sure we do not emit warnings for mismatched options.
if (!AnyStartsWith(result.args, "-Wno-unknown-warning-option"))
result.args.push_back("-Wno-unknown-warning-option");
return result; return result;
} }
@ -462,15 +467,18 @@ TEST_SUITE("Project") {
CheckFlags( CheckFlags(
/* raw */ {"clang", "-lstdc++", "myfile.cc"}, /* raw */ {"clang", "-lstdc++", "myfile.cc"},
/* expected */ {"clang", "-lstdc++", "myfile.cc", "-xc++", "-std=c++11", /* expected */ {"clang", "-lstdc++", "myfile.cc", "-xc++", "-std=c++11",
"-resource-dir=/w/resource_dir/"}); "-resource-dir=/w/resource_dir/",
"-Wno-unknown-warning-option"});
CheckFlags(/* raw */ {"goma", "clang"}, CheckFlags(/* raw */ {"goma", "clang"},
/* expected */ {"clang", "-xc++", "-std=c++11", /* expected */ {"clang", "-xc++", "-std=c++11",
"-resource-dir=/w/resource_dir/"}); "-resource-dir=/w/resource_dir/",
"-Wno-unknown-warning-option"});
CheckFlags(/* raw */ {"goma", "clang", "--foo"}, CheckFlags(/* raw */ {"goma", "clang", "--foo"},
/* expected */ {"clang", "--foo", "-xc++", "-std=c++11", /* expected */ {"clang", "--foo", "-xc++", "-std=c++11",
"-resource-dir=/w/resource_dir/"}); "-resource-dir=/w/resource_dir/",
"-Wno-unknown-warning-option"});
} }
// FIXME: Fix this test. // FIXME: Fix this test.
@ -479,7 +487,8 @@ TEST_SUITE("Project") {
"/home/user", "/home/user/foo/bar.c", "/home/user", "/home/user/foo/bar.c",
/* raw */ {"cc", "-O0", "foo/bar.c"}, /* raw */ {"cc", "-O0", "foo/bar.c"},
/* expected */ /* expected */
{"cc", "-O0", "-xc", "-std=c11", "-resource-dir=/w/resource_dir/"}); {"cc", "-O0", "-xc", "-std=c11", "-resource-dir=/w/resource_dir/",
"-Wno-unknown-warning-option"});
} }
// Checks flag parsing for a random chromium file in comparison to what // Checks flag parsing for a random chromium file in comparison to what
@ -824,7 +833,8 @@ TEST_SUITE("Project") {
"-fno-exceptions", "-fno-exceptions",
"-fvisibility-inlines-hidden", "-fvisibility-inlines-hidden",
"-xc++", "-xc++",
"-resource-dir=/w/resource_dir/"}); "-resource-dir=/w/resource_dir/",
"-Wno-unknown-warning-option"});
} }
// Checks flag parsing for an example chromium file. // Checks flag parsing for an example chromium file.
@ -1143,7 +1153,8 @@ TEST_SUITE("Project") {
"-fno-exceptions", "-fno-exceptions",
"-fvisibility-inlines-hidden", "-fvisibility-inlines-hidden",
"-xc++", "-xc++",
"-resource-dir=/w/resource_dir/"}); "-resource-dir=/w/resource_dir/",
"-Wno-unknown-warning-option"});
} }
TEST_CASE("Directory extraction") { TEST_CASE("Directory extraction") {