summaryrefslogtreecommitdiffstats
path: root/clang-tools-extra/clangd/unittests/ClangdTests.cpp
diff options
context:
space:
mode:
authorKadir Cetinkaya <kadircet@google.com>2019-07-11 09:54:31 +0000
committerKadir Cetinkaya <kadircet@google.com>2019-07-11 09:54:31 +0000
commitad54935c7781008d3ad780767aec309f28360ff9 (patch)
treececffacd3f9c2849bd9beab877428b5a3d5f11c2 /clang-tools-extra/clangd/unittests/ClangdTests.cpp
parent7916198a41054290aa138de3e825914342817983 (diff)
downloadbcm5719-llvm-ad54935c7781008d3ad780767aec309f28360ff9.tar.gz
bcm5719-llvm-ad54935c7781008d3ad780767aec309f28360ff9.zip
[clangd] Reland rL365634
This was reverted in rL365678, the failure was due to YAML parsing of compile_commands.json. Converting backslashes to forward slashes to fix the issue in unittest. llvm-svn: 365748
Diffstat (limited to 'clang-tools-extra/clangd/unittests/ClangdTests.cpp')
-rw-r--r--clang-tools-extra/clangd/unittests/ClangdTests.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/clang-tools-extra/clangd/unittests/ClangdTests.cpp b/clang-tools-extra/clangd/unittests/ClangdTests.cpp
index ac4ff6ed077..25c82e4895f 100644
--- a/clang-tools-extra/clangd/unittests/ClangdTests.cpp
+++ b/clang-tools-extra/clangd/unittests/ClangdTests.cpp
@@ -1064,7 +1064,7 @@ TEST_F(ClangdVFSTest, FallbackWhenPreambleIsNotReady) {
ClangdServer Server(CDB, FS, DiagConsumer, ClangdServer::optsForTest());
auto FooCpp = testPath("foo.cpp");
- Annotations Code(R"cpp(
+ Annotations Code(R"cpp(
namespace ns { int xyz; }
using namespace ns;
int main() {
@@ -1113,7 +1113,7 @@ TEST_F(ClangdVFSTest, FallbackWhenWaitingForCompileCommand) {
: CanReturnCommand(CanReturnCommand) {}
llvm::Optional<tooling::CompileCommand>
- getCompileCommand(PathRef File, ProjectInfo * = nullptr) const override {
+ getCompileCommand(PathRef File) const override {
// FIXME: make this timeout and fail instead of waiting forever in case
// something goes wrong.
CanReturnCommand.wait();
OpenPOWER on IntegriCloud