summaryrefslogtreecommitdiff
path: root/test/Format
diff options
context:
space:
mode:
authorDaniel Jasper <djasper@google.com>2013-04-12 10:12:01 +0000
committerDaniel Jasper <djasper@google.com>2013-04-12 10:12:01 +0000
commitc6d82ca9b28c39a988afd06a6359e09df033b846 (patch)
treea794ba27f78340bd8faa27f23338e8ebe5f9b179 /test/Format
parent6026df1e5d518a958aef342d55a9e5d0fbdb85ca (diff)
Provide better emacs integration.
The new emacs integration is simpler, does not save the current file before reformatting and ensures that emacs does not scroll as a result of formatting. Also explicitly set the style in clang-format tests to make them more robust. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@179372 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test/Format')
-rw-r--r--test/Format/basic.cpp2
-rw-r--r--test/Format/ranges.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/test/Format/basic.cpp b/test/Format/basic.cpp
index 375bbd2ec7..a12866b9c1 100644
--- a/test/Format/basic.cpp
+++ b/test/Format/basic.cpp
@@ -1,5 +1,5 @@
// RUN: grep -Ev "// *[A-Z-]+:" %s > %t.cpp
-// RUN: clang-format -i %t.cpp
+// RUN: clang-format -style=LLVM -i %t.cpp
// RUN: FileCheck -strict-whitespace -input-file=%t.cpp %s
// CHECK: {{^int\ \*i;}}
diff --git a/test/Format/ranges.cpp b/test/Format/ranges.cpp
index 0244fc195c..c7fdd4b97a 100644
--- a/test/Format/ranges.cpp
+++ b/test/Format/ranges.cpp
@@ -1,5 +1,5 @@
// RUN: grep -Ev "// *[A-Z-]+:" %s > %t.cpp
-// RUN: clang-format -offset=2 -length=0 -offset=28 -length=0 -i %t.cpp
+// RUN: clang-format -style=LLVM -offset=2 -length=0 -offset=28 -length=0 -i %t.cpp
// RUN: FileCheck -strict-whitespace -input-file=%t.cpp %s
// CHECK: {{^int\ \*i;$}}
int*i;