[clang-format][tests] Explicitly specify style in some tests

Summary: This fixes broken tests when doing an out-of-source build that picks up a random .clang-format on the file system due to the default "file" style.

Reviewers: djasper, klimek, MyDeveloperDay, krasimir

Reviewed By: MyDeveloperDay

Subscribers: lebedev.ri, cfe-commits

Tags: #clang

Differential Revision: https://reviews.llvm.org/D61001

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@365909 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/test/Format/adjust-indent.cpp b/test/Format/adjust-indent.cpp
index 5565dc00b62d0b4f6ccd920e5610b3d94e001194..a97eed30afad0f083fde28f6b86f814b3cffc60b 100644 (file)
--- a/test/Format/adjust-indent.cpp
+++ b/test/Format/adjust-indent.cpp
@@ -1,4 +1,4 @@
-// RUN: grep -Ev "// *[A-Z-]+:" %s | clang-format -lines=2:2 \
+// RUN: grep -Ev "// *[A-Z-]+:" %s | clang-format -style=LLVM -lines=2:2 \
 // RUN:   | FileCheck -strict-whitespace %s
 
 void  f() {

diff --git a/test/Format/disable-include-sorting.cpp b/test/Format/disable-include-sorting.cpp
index 875a0af400e9a79ac5938cc3d21f13d5b3e9796f..2e9d378c283b7d9c479246560a3ec86c08718e33 100644 (file)
--- a/test/Format/disable-include-sorting.cpp
+++ b/test/Format/disable-include-sorting.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-format %s | FileCheck %s
+// RUN: clang-format %s -style=LLVM | FileCheck %s
 // RUN: clang-format %s -sort-includes -style="{SortIncludes: false}" | FileCheck %s
 // RUN: clang-format %s -sort-includes=false | FileCheck %s -check-prefix=NOT-SORTED
 

diff --git a/test/Format/language-detection.cpp b/test/Format/language-detection.cpp
index 2a53be71dafa108a9f3555573b0b5f32bce3ebc4..72e2146c54a3ac0b797c2f828bf2bece20c2df61 100644 (file)
--- a/test/Format/language-detection.cpp
+++ b/test/Format/language-detection.cpp
@@ -1,8 +1,8 @@
 // RUN: grep -Ev "// *[A-Z0-9_]+:" %s \
-// RUN:   | clang-format -style=llvm -assume-filename=foo.js \
+// RUN:   | clang-format -style=LLVM -assume-filename=foo.js \
 // RUN:   | FileCheck -strict-whitespace -check-prefix=CHECK1 %s
 // RUN: grep -Ev "// *[A-Z0-9_]+:" %s \
-// RUN:   | clang-format -style=llvm -assume-filename=foo.cpp \
+// RUN:   | clang-format -style=LLVM -assume-filename=foo.cpp \
 // RUN:   | FileCheck -strict-whitespace -check-prefix=CHECK2 %s
 // CHECK1: {{^a >>>= b;$}}
 // CHECK2: {{^a >> >= b;$}}

diff --git a/test/Format/xmloutput.cpp b/test/Format/xmloutput.cpp
index 3d84a2f5e4c29bbd8015c41d8358bae214d25883..525810143f9b898547faae58f74c508b801f1e5d 100644 (file)
--- a/test/Format/xmloutput.cpp
+++ b/test/Format/xmloutput.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-format -output-replacements-xml -sort-includes %s \
+// RUN: clang-format -style=LLVM -output-replacements-xml -sort-includes %s \
 // RUN:   | FileCheck -strict-whitespace %s
 
 // CHECK: <?xml