[clang-tools-extra] r340009 - Fix clangd tests on older compilers

Simon Pilgrim via cfe-commits cfe-commits at lists.llvm.org
Fri Aug 17 03:40:05 PDT 2018


Author: rksimon
Date: Fri Aug 17 03:40:05 2018
New Revision: 340009

URL: http://llvm.org/viewvc/llvm-project?rev=340009&view=rev
Log:
Fix clangd tests on older compilers

Old versions of gcc struggle with raw string literals inside macros.

Modified:
    clang-tools-extra/trunk/unittests/clangd/CodeCompleteTests.cpp

Modified: clang-tools-extra/trunk/unittests/clangd/CodeCompleteTests.cpp
URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/unittests/clangd/CodeCompleteTests.cpp?rev=340009&r1=340008&r2=340009&view=diff
==============================================================================
--- clang-tools-extra/trunk/unittests/clangd/CodeCompleteTests.cpp (original)
+++ clang-tools-extra/trunk/unittests/clangd/CodeCompleteTests.cpp Fri Aug 17 03:40:05 2018
@@ -1613,22 +1613,21 @@ TEST(SignatureHelpTest, IndexDocumentati
   Foo1.Detail = &DocDetails;
   Symbol Foo2 = sym("foo", index::SymbolKind::Function, "@F@\\0#I#I#");
 
-  EXPECT_THAT(
-      signatures(R"cpp(
+  StringRef Sig0 = R"cpp(
     int foo();
     int foo(double);
 
     void test() {
       foo(^);
     }
-  )cpp",
-                 {Foo0})
-          .signatures,
+  )cpp";
+
+  EXPECT_THAT(
+      signatures(Sig0, {Foo0}).signatures,
       ElementsAre(AllOf(Sig("foo() -> int", {}), SigDoc("Doc from the index")),
                   AllOf(Sig("foo(double) -> int", {"double"}), SigDoc(""))));
 
-  EXPECT_THAT(
-      signatures(R"cpp(
+  StringRef Sig1 = R"cpp(
     int foo();
     // Overriden doc from sema
     int foo(int);
@@ -1638,9 +1637,10 @@ TEST(SignatureHelpTest, IndexDocumentati
     void test() {
       foo(^);
     }
-  )cpp",
-                 {Foo0, Foo1, Foo2})
-          .signatures,
+  )cpp";
+
+  EXPECT_THAT(
+      signatures(Sig1, {Foo0, Foo1, Foo2}).signatures,
       ElementsAre(AllOf(Sig("foo() -> int", {}), SigDoc("Doc from the index")),
                   AllOf(Sig("foo(int) -> int", {"int"}),
                         SigDoc("Overriden doc from sema")),




More information about the cfe-commits mailing list