diff options
| author | Krasimir Georgiev <krasimir@google.com> | 2017-01-20 12:39:05 +0000 |
|---|---|---|
| committer | Krasimir Georgiev <krasimir@google.com> | 2017-01-20 12:39:05 +0000 |
| commit | 3f02d105b54fd0502b54e0d2c9068ca1cd00bf6c (patch) | |
| tree | 34e808db1ff6d54d5e6121ab08577a8523ff4e6c | |
| parent | 1629014b3c7b7c0fee6257392f9f7904517110eb (diff) | |
[clang-format] Remove redundant test in style-on-command-line.cpp
Summary:
rL292562 added a fix to always format if the fallback style is set to "none".
In test/Format/style-on-command-line.cpp:19 is redundant, since -fallback-style
has a default value of LLVM set in ClangFormat.cpp:72.
@amaiorano: I believe that the rest of the test cases still cover your change in
case the fallback style is explicitly set to "none". Please, if this is not the
case, initiate a discussion.
Reviewers: ioeric, bkramer
Reviewed By: ioeric
Subscribers: cfe-commits, klimek, amaiorano
Differential Revision: https://reviews.llvm.org/D28943
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@292604 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | test/Format/style-on-command-line.cpp | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/test/Format/style-on-command-line.cpp b/test/Format/style-on-command-line.cpp index 441797f206..d6ab41f575 100644 --- a/test/Format/style-on-command-line.cpp +++ b/test/Format/style-on-command-line.cpp @@ -16,15 +16,13 @@ // RUN: rm %T/_clang-format // Test no config file found, WebKit fallback style is applied // RUN: clang-format -style=file -fallback-style=WebKit -assume-filename=%T/foo.cpp < %s 2>&1 | FileCheck -strict-whitespace -check-prefix=CHECK10 %s -// Test no config file and no fallback style, LLVM style is applied -// RUN: clang-format -style=file -assume-filename=%T/foo.cpp < %s 2>&1 | FileCheck -strict-whitespace -check-prefix=CHECK11 %s // Test no config file and fallback style "none", no formatting is applied -// RUN: clang-format -style=file -fallback-style=none -assume-filename=%T/foo.cpp < %s 2>&1 | FileCheck -strict-whitespace -check-prefix=CHECK12 %s +// RUN: clang-format -style=file -fallback-style=none -assume-filename=%T/foo.cpp < %s 2>&1 | FileCheck -strict-whitespace -check-prefix=CHECK11 %s // Test config file with no based style, and fallback style "none", formatting is applied // RUN: printf "IndentWidth: 6\n" > %T/_clang-format -// RUN: clang-format -style=file -fallback-style=none -assume-filename=%T/foo.cpp < %s 2>&1 | FileCheck -strict-whitespace -check-prefix=CHECK13 %s +// RUN: clang-format -style=file -fallback-style=none -assume-filename=%T/foo.cpp < %s 2>&1 | FileCheck -strict-whitespace -check-prefix=CHECK12 %s // Test yaml with no based style, and fallback style "none", LLVM formatting applied -// RUN: clang-format -style="{IndentWidth: 7}" -fallback-style=none %s | FileCheck -strict-whitespace -check-prefix=CHECK14 %s +// RUN: clang-format -style="{IndentWidth: 7}" -fallback-style=none %s | FileCheck -strict-whitespace -check-prefix=CHECK13 %s void f() { // CHECK1: {{^ int\* i;$}} @@ -38,10 +36,9 @@ void f() { // CHECK8: {{^ int\* i;$}} // CHECK9: {{^ int \*i;$}} // CHECK10: {{^ int\* i;$}} -// CHECK11: {{^ int \*i;$}} -// CHECK12: {{^int\*i;$}} -// CHECK13: {{^ int \*i;$}} -// CHECK14: {{^ int \*i;$}} +// CHECK11: {{^int\*i;$}} +// CHECK12: {{^ int \*i;$}} +// CHECK13: {{^ int \*i;$}} int*i; int j; } |