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 | 4ca401b88cd17223ece8a244fc39aab5864ff66a (patch) | |
| tree | 506928ac6fb802e27c1d1560a1ffa639a02d610b /test/Format | |
| parent | 97eb2d54e03fcfdc083992de358f29fffcf998cb (diff) | |
Trying to fix tests with in-tree builds, that contain a .clang-format files in
both tools/clang and llvm directories.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@189761 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test/Format')
| -rw-r--r-- | test/Format/style-on-command-line.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/Format/style-on-command-line.cpp b/test/Format/style-on-command-line.cpp index 044264b916..3e22daddc2 100644 --- a/test/Format/style-on-command-line.cpp +++ b/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; |