diff options
| author | Alexander Kornienko <alexfh@google.com> | 2013-04-24 12:46:44 +0000 |
|---|---|---|
| committer | Alexander Kornienko <alexfh@google.com> | 2013-04-24 12:46:44 +0000 |
| commit | 4cdc0cde1396df5d937c39c626abe99760197654 (patch) | |
| tree | aeaf54f04d2b55322a6c1c593dfb8670f2b04635 /test/Format | |
| parent | e0262e25206bef1d7efb0cb2f37abd1e42ada4cb (diff) | |
clang-format support for multiple input files.
Summary:
Added support for multiple input files, that can be used both with and
without in-place edit (-i) option. Added checks for -offset and -length options:
don't allow them on multiple files, check that they don't fall outside input
file, made both options unsigned, so that there's no need to check for negative
values. Removed "-1 can be used for end-of-file" from -length description.
Reviewers: djasper, klimek
Reviewed By: djasper
CC: cfe-commits
Differential Revision: http://llvm-reviews.chandlerc.com/D719
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@180185 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test/Format')
| -rw-r--r-- | test/Format/multiple-inputs-error.cpp | 6 | ||||
| -rw-r--r-- | test/Format/multiple-inputs-inplace.cpp | 8 | ||||
| -rw-r--r-- | test/Format/multiple-inputs.cpp | 7 |
3 files changed, 21 insertions, 0 deletions
diff --git a/test/Format/multiple-inputs-error.cpp b/test/Format/multiple-inputs-error.cpp new file mode 100644 index 0000000000..71f87e0b15 --- /dev/null +++ b/test/Format/multiple-inputs-error.cpp @@ -0,0 +1,6 @@ +// RUN: cp %s %t-1.cpp +// RUN: cp %s %t-2.cpp +// RUN: clang-format 2>&1 >/dev/null -offset=1 -length=0 %t-1.cpp %t-2.cpp |FileCheck %s +// CHECK: error: "-offset" and "-length" can only be used for single file. + +int i ; diff --git a/test/Format/multiple-inputs-inplace.cpp b/test/Format/multiple-inputs-inplace.cpp new file mode 100644 index 0000000000..74c30db71e --- /dev/null +++ b/test/Format/multiple-inputs-inplace.cpp @@ -0,0 +1,8 @@ +// RUN: cp %s %t-1.cpp +// RUN: cp %s %t-2.cpp +// RUN: clang-format -style=LLVM -i %t-1.cpp %t-2.cpp +// RUN: FileCheck -strict-whitespace -input-file=%t-1.cpp %s +// RUN: FileCheck -strict-whitespace -input-file=%t-2.cpp %s + +// CHECK: {{^int\ \*i;}} + int * i ; diff --git a/test/Format/multiple-inputs.cpp b/test/Format/multiple-inputs.cpp new file mode 100644 index 0000000000..df267149fe --- /dev/null +++ b/test/Format/multiple-inputs.cpp @@ -0,0 +1,7 @@ +// RUN: cp %s %t-1.cpp +// RUN: cp %s %t-2.cpp +// RUN: clang-format -style=LLVM %t-1.cpp %t-2.cpp|FileCheck -strict-whitespace %s + +// CHECK: {{^int\ \*i;}} +// CHECK: {{^int\ \*i;}} + int * i ; |