Author: kadircet Date: Tue Jun 4 06:38:36 2019 New Revision: 362496 URL: http://llvm.org/viewvc/llvm-project?rev=362496&view=rev Log: [clangd] Also apply adjustArguments when returning fallback commands
Reviewers: ilya-biryukov Subscribers: MaskRay, jkorous, arphaman, cfe-commits Tags: #clang Differential Revision: https://reviews.llvm.org/D62856 Modified: clang-tools-extra/trunk/clangd/GlobalCompilationDatabase.cpp clang-tools-extra/trunk/clangd/unittests/GlobalCompilationDatabaseTests.cpp Modified: clang-tools-extra/trunk/clangd/GlobalCompilationDatabase.cpp URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clangd/GlobalCompilationDatabase.cpp?rev=362496&r1=362495&r2=362496&view=diff ============================================================================== --- clang-tools-extra/trunk/clangd/GlobalCompilationDatabase.cpp (original) +++ clang-tools-extra/trunk/clangd/GlobalCompilationDatabase.cpp Tue Jun 4 06:38:36 2019 @@ -173,6 +173,7 @@ tooling::CompileCommand OverlayCDB::getF std::lock_guard<std::mutex> Lock(Mutex); Cmd.CommandLine.insert(Cmd.CommandLine.end(), FallbackFlags.begin(), FallbackFlags.end()); + adjustArguments(Cmd, ResourceDir); return Cmd; } Modified: clang-tools-extra/trunk/clangd/unittests/GlobalCompilationDatabaseTests.cpp URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clangd/unittests/GlobalCompilationDatabaseTests.cpp?rev=362496&r1=362495&r2=362496&view=diff ============================================================================== --- clang-tools-extra/trunk/clangd/unittests/GlobalCompilationDatabaseTests.cpp (original) +++ clang-tools-extra/trunk/clangd/unittests/GlobalCompilationDatabaseTests.cpp Tue Jun 4 06:38:36 2019 @@ -21,6 +21,7 @@ using ::testing::Contains; using ::testing::ElementsAre; using ::testing::EndsWith; using ::testing::Not; +using ::testing::StartsWith; TEST(GlobalCompilationDatabaseTest, FallbackCommand) { DirectoryBasedGlobalCompilationDatabase DB(None); @@ -85,7 +86,8 @@ TEST_F(OverlayCDBTest, GetCompileCommand TEST_F(OverlayCDBTest, GetFallbackCommand) { OverlayCDB CDB(Base.get(), {"-DA=4"}); EXPECT_THAT(CDB.getFallbackCommand(testPath("bar.cc")).CommandLine, - ElementsAre("clang", "-DA=2", testPath("bar.cc"), "-DA=4")); + ElementsAre("clang", "-DA=2", testPath("bar.cc"), "-DA=4", + "-fsyntax-only", StartsWith("-resource-dir"))); } TEST_F(OverlayCDBTest, NoBase) { @@ -97,7 +99,8 @@ TEST_F(OverlayCDBTest, NoBase) { Contains("-DA=5")); EXPECT_THAT(CDB.getFallbackCommand(testPath("foo.cc")).CommandLine, - ElementsAre(EndsWith("clang"), testPath("foo.cc"), "-DA=6")); + ElementsAre(EndsWith("clang"), testPath("foo.cc"), "-DA=6", + "-fsyntax-only")); } TEST_F(OverlayCDBTest, Watch) { _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
