diff options
| author | Alexander Kornienko <alexfh@google.com> | 2013-09-02 14:25:56 +0000 |
|---|---|---|
| committer | Alexander Kornienko <alexfh@google.com> | 2013-09-02 14:25:56 +0000 |
| commit | 22479f7d9999bed7d589b319a2d24d511ededc80 (patch) | |
| tree | f8326ff1194ac76651a7c5fd468269700e40767d | |
| parent | bbca4903c4620f0de83bd2ba33293f2fe6ab394b (diff) | |
| download | bcm5719-llvm-22479f7d9999bed7d589b319a2d24d511ededc80.tar.gz bcm5719-llvm-22479f7d9999bed7d589b319a2d24d511ededc80.zip | |
Trying to fix tests with in-tree builds, that contain a .clang-format files in
both tools/clang and llvm directories.
llvm-svn: 189761
| -rw-r--r-- | clang/test/Format/style-on-command-line.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/clang/test/Format/style-on-command-line.cpp b/clang/test/Format/style-on-command-line.cpp index 044264b9160..3e22daddc22 100644 --- a/clang/test/Format/style-on-command-line.cpp +++ b/clang/test/Format/style-on-command-line.cpp @@ -1,4 +1,4 @@ -// RUN: grep -Ev "// *[A-Z0-9]+:" %s > %t.cpp +// RUN: grep -Ev "// *[A-Z0-9_]+:" %s > %t.cpp // RUN: clang-format -style="{BasedOnStyle: Google, IndentWidth: 8}" %t.cpp | FileCheck -strict-whitespace -check-prefix=CHECK1 %s // RUN: clang-format -style="{BasedOnStyle: LLVM, IndentWidth: 7}" %t.cpp | FileCheck -strict-whitespace -check-prefix=CHECK2 %s // RUN: clang-format -style="{BasedOnStyle: invalid, IndentWidth: 7}" %t.cpp 2>&1 | FileCheck -strict-whitespace -check-prefix=CHECK3 %s @@ -17,7 +17,7 @@ void f() { // CHECK4: Error parsing -style: Invalid argument, using LLVM style // CHECK4: {{^ int \*i;$}} // CHECK5: {{^ int\* i;$}} -// CHECK6: Can't find usable .clang-format, using LLVM style +// CHECK6: {{^Error reading .*\.clang-format: Invalid argument}} // CHECK6: {{^ int \*i;$}} int*i; int j; |
