<div dir="ltr">The failures went away after running tests and rebuilding a few times, so I guess this is doing the right thing already.</div><div class="gmail_extra"><br><br><div class="gmail_quote">On Tue, May 7, 2013 at 11:52 AM, Nico Weber <span dir="ltr"><<a href="mailto:thakis@chromium.org" target="_blank">thakis@chromium.org</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">Should these use %clang-format (which lit would have to learn about), so that they pick up the newly-build clang-format for sure? On my system, `clang-format` is some older binary in my path, which makes these tests fail.</div>
<div class="HOEnZb"><div class="h5">
<div class="gmail_extra"><br><br><div class="gmail_quote">On Mon, Mar 25, 2013 at 2:14 AM, Daniel Jasper <span dir="ltr"><<a href="mailto:djasper@google.com" target="_blank">djasper@google.com</a>></span> wrote:<br>

<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: djasper<br>
Date: Mon Mar 25 04:14:25 2013<br>
New Revision: 177853<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=177853&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=177853&view=rev</a><br>
Log:<br>
Re-add clang-format tests to clang/test.<br>
<br>
Also now use -strict-whitespace as the tests are confusing otherwise.<br>
<br>
Added:<br>
    cfe/trunk/test/Format/<br>
    cfe/trunk/test/Format/basic.cpp<br>
    cfe/trunk/test/Format/diagnostic.cpp<br>
    cfe/trunk/test/Format/ranges.cpp<br>
Modified:<br>
    cfe/trunk/test/CMakeLists.txt<br>
<br>
Modified: cfe/trunk/test/CMakeLists.txt<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CMakeLists.txt?rev=177853&r1=177852&r2=177853&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CMakeLists.txt?rev=177853&r1=177852&r2=177853&view=diff</a><br>


==============================================================================<br>
--- cfe/trunk/test/CMakeLists.txt (original)<br>
+++ cfe/trunk/test/CMakeLists.txt Mon Mar 25 04:14:25 2013<br>
@@ -29,7 +29,7 @@ endif ()<br>
 set(CLANG_TEST_DEPS<br>
   clang clang-headers<br>
   c-index-test diagtool arcmt-test c-arcmt-test<br>
-  clang-check<br>
+  clang-check clang-format<br>
   )<br>
 set(CLANG_TEST_PARAMS<br>
   clang_site_config=${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg<br>
<br>
Added: cfe/trunk/test/Format/basic.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Format/basic.cpp?rev=177853&view=auto" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Format/basic.cpp?rev=177853&view=auto</a><br>


==============================================================================<br>
--- cfe/trunk/test/Format/basic.cpp (added)<br>
+++ cfe/trunk/test/Format/basic.cpp Mon Mar 25 04:14:25 2013<br>
@@ -0,0 +1,6 @@<br>
+// RUN: grep -Ev "// *[A-Z-]+:" %s > %t.cpp<br>
+// RUN: clang-format -i %t.cpp<br>
+// RUN: FileCheck -strict-whitespace -input-file=%t.cpp %s<br>
+<br>
+// CHECK: {{^int\ \*i;}}<br>
+ int   *  i  ;<br>
<br>
Added: cfe/trunk/test/Format/diagnostic.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Format/diagnostic.cpp?rev=177853&view=auto" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Format/diagnostic.cpp?rev=177853&view=auto</a><br>


==============================================================================<br>
--- cfe/trunk/test/Format/diagnostic.cpp (added)<br>
+++ cfe/trunk/test/Format/diagnostic.cpp Mon Mar 25 04:14:25 2013<br>
@@ -0,0 +1,4 @@<br>
+// RUN: clang-format 2>&1 >/dev/null %s |FileCheck %s<br>
+<br>
+}<br>
+// CHECK: diagnostic.cpp:[[@LINE-1]]:1: error: unexpected '}'<br>
<br>
Added: cfe/trunk/test/Format/ranges.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Format/ranges.cpp?rev=177853&view=auto" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Format/ranges.cpp?rev=177853&view=auto</a><br>


==============================================================================<br>
--- cfe/trunk/test/Format/ranges.cpp (added)<br>
+++ cfe/trunk/test/Format/ranges.cpp Mon Mar 25 04:14:25 2013<br>
@@ -0,0 +1,11 @@<br>
+// RUN: grep -Ev "// *[A-Z-]+:" %s > %t.cpp<br>
+// RUN: clang-format -offset=2 -length=0 -offset=28 -length=0 -i %t.cpp<br>
+// RUN: FileCheck -strict-whitespace -input-file=%t.cpp %s<br>
+// CHECK: {{^int\ \*i;$}}<br>
+  int*i;<br>
+<br>
+// CHECK: {{^\ \ int\ \ \*\ \ i;$}}<br>
+  int  *  i;<br>
+<br>
+// CHECK: {{^\ \ int\ \*i;$}}<br>
+  int   *   i;<br>
<br>
<br>
_______________________________________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@cs.uiuc.edu" target="_blank">cfe-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits</a><br>
</blockquote></div><br></div>
</div></div></blockquote></div><br></div>