summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBill Wendling <isanbard@gmail.com>2013-11-19 02:25:28 +0000
committerBill Wendling <isanbard@gmail.com>2013-11-19 02:25:28 +0000
commitef9315d942a0499141769e3c53c8830ee1e74841 (patch)
tree268ad3591e2d0639cbf5aabae7c403df4d1974ab
parent171cedf61ef142c724af16425ffba34bbda3fc66 (diff)
downloadllvm-ef9315d942a0499141769e3c53c8830ee1e74841.tar.gz
Disable this check temporarily.
This is failing for me. When I run the command on my own, I get this: Error reading /usr/local/google/home/morbo/llvm/llvm.obj/tools/clang/test/Format/Output/.clang-format: Invalid argument void f() { int* i; int j; } The formatting is like this because I have the Google format version in my ~/.clang-format file. This test should be made independent of that. llvm-svn: 195080
-rw-r--r--clang/test/Format/style-on-command-line.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/clang/test/Format/style-on-command-line.cpp b/clang/test/Format/style-on-command-line.cpp
index 7fd61341c5ab..22131a1ebe1b 100644
--- a/clang/test/Format/style-on-command-line.cpp
+++ b/clang/test/Format/style-on-command-line.cpp
@@ -22,7 +22,7 @@ void f() {
// CHECK4: {{^ int \*i;$}}
// CHECK5: {{^ int\* i;$}}
// CHECK6: {{^Error reading .*\.clang-format: Invalid argument}}
-// CHECK6: {{^ int \*i;$}}
+// XCHECK6X: {{^ int \*i;$}}
// CHECK7: {{^ int\* i;$}}
int*i;
int j;