diff options
| author | Antonio Maiorano <amaiorano@gmail.com> | 2017-01-23 13:20:23 +0000 |
|---|---|---|
| committer | Antonio Maiorano <amaiorano@gmail.com> | 2017-01-23 13:20:23 +0000 |
| commit | 041d1987715362de105d30ff4139412f5743e66e (patch) | |
| tree | f6f2df21be28e25b6e966f1cde6d6c5e76b64886 | |
| parent | ed28a0f8768b67b4caa5a3da1ff260589cc28549 (diff) | |
clang-format: remove tests that assume no config file will be found as this is not always the case
These tests fail for developers who place their build directories under the
llvm root directory because llvm's own .clang-format file will be found.
Anyway these cases are covered by FormatStyle.GetStyleOfFile tests
(FormatTest.cpp).
Differential Revision: https://reviews.llvm.org/D28983
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@292787 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | test/Format/style-on-command-line.cpp | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/test/Format/style-on-command-line.cpp b/test/Format/style-on-command-line.cpp index d6ab41f575..b2724353da 100644 --- a/test/Format/style-on-command-line.cpp +++ b/test/Format/style-on-command-line.cpp @@ -13,16 +13,11 @@ // RUN: clang-format -style="{BasedOnStyle: WebKit, PointerBindsToType: false}" %s | FileCheck -strict-whitespace -check-prefix=CHECK9 %s // Fallback style tests -// 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 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=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=CHECK12 %s +// RUN: clang-format -style=file -fallback-style=none -assume-filename=%T/foo.cpp < %s 2>&1 | FileCheck -strict-whitespace -check-prefix=CHECK10 %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=CHECK13 %s +// RUN: clang-format -style="{IndentWidth: 7}" -fallback-style=none %s | FileCheck -strict-whitespace -check-prefix=CHECK11 %s void f() { // CHECK1: {{^ int\* i;$}} @@ -35,10 +30,8 @@ void f() { // CHECK7: {{^ int\* i;$}} // CHECK8: {{^ int\* i;$}} // CHECK9: {{^ int \*i;$}} -// CHECK10: {{^ int\* i;$}} -// CHECK11: {{^int\*i;$}} -// CHECK12: {{^ int \*i;$}} -// CHECK13: {{^ int \*i;$}} +// CHECK10: {{^ int \*i;$}} +// CHECK11: {{^ int \*i;$}} int*i; int j; } |