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

diff --git a/test/Format/style-on-command-line.cpp b/test/Format/style-on-command-line.cpp
index 044264b916053a0ed1c3583bf420f0d17fdb38c8..3e22daddc22fa46fc5e47f8f35958ee608c5e911 100644 (file)
--- 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;