r361209 - Try to fix build with older gccs after r361152

[Nico Weber via cfe-commits]

Author: nico
Date: Mon May 20 17:27:26 2019
New Revision: 361209

URL: http://llvm.org/viewvc/llvm-project?rev=361209&view=rev
Log:
Try to fix build with older gccs after r361152

Also merge the cmake change there to the gn build.

Modified:
    cfe/trunk/unittests/Tooling/RangeSelectorTest.cpp

Modified: cfe/trunk/unittests/Tooling/RangeSelectorTest.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/unittests/Tooling/RangeSelectorTest.cpp?rev=361209&r1=361208&r2=361209&view=diff
==============================================================================
--- cfe/trunk/unittests/Tooling/RangeSelectorTest.cpp (original)
+++ cfe/trunk/unittests/Tooling/RangeSelectorTest.cpp Mon May 20 17:27:26 2019
@@ -396,10 +396,11 @@ TEST(RangeSelectorTest, CallArgsOpEolCom
   )cc";
   StringRef ID = "id";
   TestMatch Match = matchCode(Code, callExpr().bind(ID));
-  EXPECT_THAT_EXPECTED(select(callArgs(ID), Match), HasValue(R"(  // Header
+  std::string ExpectedString = R"(  // Header
           1,           // foo
           2            // bar
-      )"));
+      )";
+  EXPECT_THAT_EXPECTED(select(callArgs(ID), Match), HasValue(ExpectedString));
 }
 
 TEST(RangeSelectorTest, CallArgsErrors) {