<html xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:m="http://schemas.microsoft.com/office/2004/12/omml" xmlns="http://www.w3.org/TR/REC-html40">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
<meta name="Generator" content="Microsoft Word 12 (filtered medium)">
<style><!--
/* Font Definitions */
@font-face
{font-family:"Cambria Math";
panose-1:2 4 5 3 5 4 6 3 2 4;}
@font-face
{font-family:Calibri;
panose-1:2 15 5 2 2 2 4 3 2 4;}
@font-face
{font-family:Tahoma;
panose-1:2 11 6 4 3 5 4 4 2 4;}
@font-face
{font-family:Consolas;
panose-1:2 11 6 9 2 2 4 3 2 4;}
/* Style Definitions */
p.MsoNormal, li.MsoNormal, div.MsoNormal
{margin:0in;
margin-bottom:.0001pt;
font-size:11.0pt;
font-family:"Calibri","sans-serif";}
a:link, span.MsoHyperlink
{mso-style-priority:99;
color:blue;
text-decoration:underline;}
a:visited, span.MsoHyperlinkFollowed
{mso-style-priority:99;
color:purple;
text-decoration:underline;}
span.EmailStyle17
{mso-style-type:personal;
font-family:"Calibri","sans-serif";
color:windowtext;}
span.EmailStyle18
{mso-style-type:personal-reply;
font-family:"Calibri","sans-serif";
color:#1F497D;}
.MsoChpDefault
{mso-style-type:export-only;
font-size:10.0pt;}
@page WordSection1
{size:8.5in 11.0in;
margin:1.0in 1.0in 1.0in 1.0in;}
div.WordSection1
{page:WordSection1;}
--></style><!--[if gte mso 9]><xml>
<o:shapedefaults v:ext="edit" spidmax="1026" />
</xml><![endif]--><!--[if gte mso 9]><xml>
<o:shapelayout v:ext="edit">
<o:idmap v:ext="edit" data="1" />
</o:shapelayout></xml><![endif]-->
</head>
<body lang="EN-US" link="blue" vlink="purple">
<div class="WordSection1">
<p class="MsoNormal"><span style="color:#1F497D">Hi, I just wanted to resend this and was hoping to get someone to review my small change. Thanks!<o:p></o:p></span></p>
<p class="MsoNormal"><span style="color:#1F497D"><o:p> </o:p></span></p>
<p class="MsoNormal"><span style="color:#1F497D">Douglas Yung<o:p></o:p></span></p>
<p class="MsoNormal"><span style="color:#1F497D"><o:p> </o:p></span></p>
<div>
<div style="border:none;border-top:solid #B5C4DF 1.0pt;padding:3.0pt 0in 0in 0in">
<p class="MsoNormal"><b><span style="font-size:10.0pt;font-family:"Tahoma","sans-serif"">From:</span></b><span style="font-size:10.0pt;font-family:"Tahoma","sans-serif""> Yung, Douglas
<br>
<b>Sent:</b> Thursday, March 19, 2015 1:20<br>
<b>To:</b> llvm-commits@cs.uiuc.edu<br>
<b>Subject:</b> [PATCH] Allow compile_commands.json files in subdirectories<o:p></o:p></span></p>
</div>
</div>
<p class="MsoNormal"><o:p> </o:p></p>
<p class="MsoNormal"><span style="font-size:10.0pt">Hi,</span> <br>
<span style="font-size:10.0pt"> </span> <br>
<span style="font-size:10.0pt">In the top-level .gitignore file of the llvm project, there is an entry in the .gitignore file to ignore the file compile_commands.json. This was added by David Blaikie in 162305 to ignore the compile_commands.json that may be
present at the root of the LLVM source tree. The problem with how it was done though is that it is excluding compile_commands.json files anywhere in the LLVM source tree. In our case, we included the clang extra user tools in our repository under tools/clang/tools/extra,
which contains 3 instances of the file compile_commands.json under tools/clang/tools/extra which were being ignored causing tests to fail due to this missing file. The proposed fix as seen below is to simply restrict the ignoring of compile_commands.json to
an instance at the root of the LLVM source tree.<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:10.0pt"><o:p> </o:p></span></p>
<p class="MsoNormal" style="margin-bottom:12.0pt"><span style="font-size:10.0pt">Douglas Yung</span><br>
<br>
<span style="font-size:10.0pt;font-family:Consolas">Files:</span> <br>
<span style="font-size:10.0pt;font-family:Consolas"> .gitignore</span> <br>
<span style="font-size:10.0pt;font-family:Consolas"> </span> <br>
<span style="font-size:10.0pt;font-family:Consolas">Index: .gitignore</span> <br>
<span style="font-size:10.0pt;font-family:Consolas">===================================================================</span>
<br>
<span style="font-size:10.0pt;font-family:Consolas">--- .gitignore (revision 232698)</span>
<br>
<span style="font-size:10.0pt;font-family:Consolas">+++ .gitignore (working copy)</span>
<br>
<span style="font-size:10.0pt;font-family:Consolas">@@ -37,7 +37,7 @@</span> <br>
<span style="font-size:10.0pt;font-family:Consolas">cscope.out</span> <br>
<span style="font-size:10.0pt;font-family:Consolas">autoconf/aclocal.m4</span> <br>
<span style="font-size:10.0pt;font-family:Consolas">autoconf/autom4te.cache</span>
<br>
<span style="font-size:10.0pt;font-family:Consolas">-compile_commands.json</span>
<br>
<span style="font-size:10.0pt;font-family:Consolas">+/compile_commands.json</span>
<br>
<span style="font-size:10.0pt;font-family:Consolas"> </span> <br>
<span style="font-size:10.0pt;font-family:Consolas"> #==============================================================================#</span>
<br>
<span style="font-size:10.0pt;font-family:Consolas"># Directories to ignore (do not add trailing '/'s, they skip symlinks).</span>
<o:p></o:p></p>
</div>
</body>
</html>