<div dir="ltr">Seems like a proper fix. Do you want me to submit it for you?</div><div class="gmail_extra"><br><div class="gmail_quote">On Thu, Aug 3, 2017 at 3:03 PM, NAKAMURA Takumi <span dir="ltr"><<a href="mailto:geek4civic@gmail.com" target="_blank">geek4civic@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr">My builder is failing,<div><br></div><div><div>[ RUN ] ClangdVFSTest.SearchLibDir</div><div>/home/bb/bootstrap-clang-<wbr>libcxx-lld-i686-linux/llvm-<wbr>project/clang-tools-extra/<wbr>unittests/clangd/ClangdTests.<wbr>cpp:492: Failure</div><div>Value of: DiagConsumer.<wbr>hadErrorInLastDiags()</div><div> Actual: true</div><div>Expected: false</div><div>[ FAILED ] ClangdVFSTest.SearchLibDir (11 ms)</div></div><div><br></div><div>As a special configuration, it has CLANG_DEFAULT_CXX_STDLIB=<wbr>libc++</div><div>Seems adding "-stdlib=libstdc++" in CDB.ExtraClangFlags will fix.</div><div>How do you think?</div><div><br></div></div><div class="HOEnZb"><div class="h5"><br><div class="gmail_quote"><div dir="ltr">On Fri, Jul 21, 2017 at 5:21 PM Ilya Biryukov via cfe-commits <<a href="mailto:cfe-commits@lists.llvm.org" target="_blank">cfe-commits@lists.llvm.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: ibiryukov<br>
Date: Fri Jul 21 01:20:47 2017<br>
New Revision: 308721<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=308721&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project?rev=308721&view=rev</a><br>
Log:<br>
[clangd] Specified --gcc-toolchain explicitly in VFS test.<br>
<br>
In order to avoid platform-specific configuration quirks.<br>
(Possible fix for <a href="https://bugs.llvm.org/show_bug.cgi?id=33842" rel="noreferrer" target="_blank">https://bugs.llvm.org/show_<wbr>bug.cgi?id=33842</a>)<br>
<br>
Modified:<br>
clang-tools-extra/trunk/<wbr>unittests/clangd/ClangdTests.<wbr>cpp<br>
<br>
Modified: clang-tools-extra/trunk/<wbr>unittests/clangd/ClangdTests.<wbr>cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/unittests/clangd/ClangdTests.cpp?rev=308721&r1=308720&r2=308721&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/clang-tools-extra/<wbr>trunk/unittests/clangd/<wbr>ClangdTests.cpp?rev=308721&r1=<wbr>308720&r2=308721&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- clang-tools-extra/trunk/<wbr>unittests/clangd/ClangdTests.<wbr>cpp (original)<br>
+++ clang-tools-extra/trunk/<wbr>unittests/clangd/ClangdTests.<wbr>cpp Fri Jul 21 01:20:47 2017<br>
@@ -422,9 +422,9 @@ TEST_F(ClangdVFSTest, SearchLibDir) {<br>
MockFSProvider FS;<br>
ErrorCheckingDiagConsumer DiagConsumer;<br>
MockCompilationDatabase CDB(/*AddFreestandingFlag=*/<wbr>true);<br>
- CDB.ExtraClangFlags.insert(<br>
- CDB.ExtraClangFlags.end(),<br>
- {"-xc++", "-target", "x86_64-linux-unknown", "-m64"});<br>
+ CDB.ExtraClangFlags.insert(<wbr>CDB.ExtraClangFlags.end(),<br>
+ {"-xc++", "-target", "x86_64-linux-unknown",<br>
+ "-m64", "--gcc-toolchain=/randomusr"})<wbr>;<br>
ClangdServer Server(CDB, DiagConsumer, FS,<br>
/*RunSynchronously=*/true);<br>
<br>
@@ -432,7 +432,7 @@ TEST_F(ClangdVFSTest, SearchLibDir) {<br>
SmallString<8> Version("4.9.3");<br>
<br>
// A lib dir for gcc installation<br>
- SmallString<64> LibDir("/usr/lib/gcc/x86_64-<wbr>linux-gnu");<br>
+ SmallString<64> LibDir("/randomusr/lib/gcc/<wbr>x86_64-linux-gnu");<br>
llvm::sys::path::append(<wbr>LibDir, Version);<br>
<br>
// Put crtbegin.o into LibDir/64 to trick clang into thinking there's a gcc<br>
@@ -441,7 +441,7 @@ TEST_F(ClangdVFSTest, SearchLibDir) {<br>
llvm::sys::path::append(<wbr>DummyLibFile, LibDir, "64", "crtbegin.o");<br>
FS.Files[DummyLibFile] = "";<br>
<br>
- SmallString<64> IncludeDir("/usr/include/c++")<wbr>;<br>
+ SmallString<64> IncludeDir("/randomusr/<wbr>include/c++");<br>
llvm::sys::path::append(<wbr>IncludeDir, Version);<br>
<br>
SmallString<64> StringPath;<br>
<br>
<br>
______________________________<wbr>_________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@lists.llvm.org" target="_blank">cfe-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/<wbr>mailman/listinfo/cfe-commits</a><br>
</blockquote></div>
</div></div></blockquote></div><br><br clear="all"><div><br></div>-- <br><div class="gmail_signature" data-smartmail="gmail_signature"><div dir="ltr"><div><div dir="ltr"><div>Regards,</div><div>Ilya Biryukov</div></div></div></div></div>
</div>