diff options
| author | Antonio Maiorano <amaiorano@gmail.com> | 2017-01-17 00:12:27 +0000 |
|---|---|---|
| committer | Antonio Maiorano <amaiorano@gmail.com> | 2017-01-17 00:12:27 +0000 |
| commit | 3adfb6a3eed268a04275334147a57e165ceb5669 (patch) | |
| tree | d9e2df760d8962b208a846fb77da1f30e8edb99e /clang/test/Format | |
| parent | 2aab1d45ff6e76c851524b1933666681c6a87fc5 (diff) | |
| download | bcm5719-llvm-3adfb6a3eed268a04275334147a57e165ceb5669.tar.gz bcm5719-llvm-3adfb6a3eed268a04275334147a57e165ceb5669.zip | |
clang-format: Make GetStyle return Expected<FormatStyle> instead of FormatStyle
Change the contract of GetStyle so that it returns an error when an error occurs
(i.e. when it writes to stderr), and only returns the fallback style when it
can't find a configuration file.
Differential Revision: https://reviews.llvm.org/D28081
llvm-svn: 292174
Diffstat (limited to 'clang/test/Format')
| -rw-r--r-- | clang/test/Format/style-on-command-line.cpp | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/clang/test/Format/style-on-command-line.cpp b/clang/test/Format/style-on-command-line.cpp index 08da60a988d..0d2d69206dc 100644 --- a/clang/test/Format/style-on-command-line.cpp +++ b/clang/test/Format/style-on-command-line.cpp @@ -1,11 +1,11 @@ // RUN: clang-format -style="{BasedOnStyle: Google, IndentWidth: 8}" %s | FileCheck -strict-whitespace -check-prefix=CHECK1 %s // RUN: clang-format -style="{BasedOnStyle: LLVM, IndentWidth: 7}" %s | FileCheck -strict-whitespace -check-prefix=CHECK2 %s -// RUN: clang-format -style="{BasedOnStyle: invalid, IndentWidth: 7}" -fallback-style=LLVM %s 2>&1 | FileCheck -strict-whitespace -check-prefix=CHECK3 %s -// RUN: clang-format -style="{lsjd}" %s -fallback-style=LLVM 2>&1 | FileCheck -strict-whitespace -check-prefix=CHECK4 %s +// RUN: not clang-format -style="{BasedOnStyle: invalid, IndentWidth: 7}" -fallback-style=LLVM %s 2>&1 | FileCheck -strict-whitespace -check-prefix=CHECK3 %s +// RUN: not clang-format -style="{lsjd}" %s -fallback-style=LLVM 2>&1 | FileCheck -strict-whitespace -check-prefix=CHECK4 %s // RUN: printf "BasedOnStyle: google\nIndentWidth: 5\n" > %T/.clang-format // RUN: clang-format -style=file -assume-filename=%T/foo.cpp < %s | FileCheck -strict-whitespace -check-prefix=CHECK5 %s // RUN: printf "\n" > %T/.clang-format -// RUN: clang-format -style=file -fallback-style=webkit -assume-filename=%T/foo.cpp < %s 2>&1 | FileCheck -strict-whitespace -check-prefix=CHECK6 %s +// RUN: not clang-format -style=file -fallback-style=webkit -assume-filename=%T/foo.cpp < %s 2>&1 | FileCheck -strict-whitespace -check-prefix=CHECK6 %s // RUN: rm %T/.clang-format // RUN: printf "BasedOnStyle: google\nIndentWidth: 6\n" > %T/_clang-format // RUN: clang-format -style=file -assume-filename=%T/foo.cpp < %s | FileCheck -strict-whitespace -check-prefix=CHECK7 %s @@ -15,13 +15,10 @@ void f() { // CHECK1: {{^ int\* i;$}} // CHECK2: {{^ int \*i;$}} // CHECK3: Unknown value for BasedOnStyle: invalid -// CHECK3: Error parsing -style: {{I|i}}nvalid argument, using LLVM style -// CHECK3: {{^ int \*i;$}} -// CHECK4: Error parsing -style: {{I|i}}nvalid argument, using LLVM style -// CHECK4: {{^ int \*i;$}} +// CHECK3: Error parsing -style: {{I|i}}nvalid argument +// CHECK4: Error parsing -style: {{I|i}}nvalid argument // CHECK5: {{^ int\* i;$}} // CHECK6: {{^Error reading .*\.clang-format: (I|i)nvalid argument}} -// CHECK6: {{^ int\* i;$}} // CHECK7: {{^ int\* i;$}} // CHECK8: {{^ int\* i;$}} // CHECK9: {{^ int \*i;$}} |
