[llvm-branch-commits] [clang-tools-extra-branch] r311109 - Merging r309936:

[Hans Wennborg via llvm-branch-commits]

Author: hans
Date: Thu Aug 17 10:39:17 2017
New Revision: 311109

URL: http://llvm.org/viewvc/llvm-project?rev=311109&view=rev
Log:
Merging r309936:
------------------------------------------------------------------------
r309936 | chapuni | 2017-08-03 06:30:43 -0700 (Thu, 03 Aug 2017) | 1 line

ClangdTests: Try to unbreak the case CLANG_DEFAULT_CXX_STDLIB=libc++.
------------------------------------------------------------------------

Modified:
    clang-tools-extra/branches/release_50/   (props changed)
    clang-tools-extra/branches/release_50/unittests/clangd/ClangdTests.cpp

Propchange: clang-tools-extra/branches/release_50/
------------------------------------------------------------------------------
    svn:mergeinfo = /clang-tools-extra/trunk:309936

Modified: clang-tools-extra/branches/release_50/unittests/clangd/ClangdTests.cpp
URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/branches/release_50/unittests/clangd/ClangdTests.cpp?rev=311109&r1=311108&r2=311109&view=diff
==============================================================================
--- clang-tools-extra/branches/release_50/unittests/clangd/ClangdTests.cpp (original)
+++ clang-tools-extra/branches/release_50/unittests/clangd/ClangdTests.cpp Thu Aug 17 10:39:17 2017
@@ -422,9 +422,9 @@ TEST_F(ClangdVFSTest, SearchLibDir) {
   MockFSProvider FS;
   ErrorCheckingDiagConsumer DiagConsumer;
   MockCompilationDatabase CDB(/*AddFreestandingFlag=*/true);
-  CDB.ExtraClangFlags.insert(
-      CDB.ExtraClangFlags.end(),
-      {"-xc++", "-target", "x86_64-linux-unknown", "-m64"});
+  CDB.ExtraClangFlags.insert(CDB.ExtraClangFlags.end(),
+                             {"-xc++", "-target", "x86_64-linux-unknown",
+                              "-m64", "-stdlib=libstdc++"});
   ClangdServer Server(CDB, DiagConsumer, FS,
                       /*RunSynchronously=*/true);