From f625a8a250b393b29a277ca790f6bc2fce7aa192 Mon Sep 17 00:00:00 2001
From: Rafael Stahl <r.stahl@tum.de>
Date: Fri, 12 Jul 2019 15:56:18 +0000
Subject: [PATCH] [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

llvm-svn: 365909
---
 clang/test/Format/adjust-indent.cpp           | 2 +-
 clang/test/Format/disable-include-sorting.cpp | 2 +-
 clang/test/Format/language-detection.cpp      | 4 ++--
 clang/test/Format/xmloutput.cpp               | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/clang/test/Format/adjust-indent.cpp b/clang/test/Format/adjust-indent.cpp
index 5565dc00b62d0..a97eed30afad0 100644
--- a/clang/test/Format/adjust-indent.cpp
+++ b/clang/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/clang/test/Format/disable-include-sorting.cpp b/clang/test/Format/disable-include-sorting.cpp
index 875a0af400e9a..2e9d378c283b7 100644
--- a/clang/test/Format/disable-include-sorting.cpp
+++ b/clang/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/clang/test/Format/language-detection.cpp b/clang/test/Format/language-detection.cpp
index 2a53be71dafa1..72e2146c54a3a 100644
--- a/clang/test/Format/language-detection.cpp
+++ b/clang/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/clang/test/Format/xmloutput.cpp b/clang/test/Format/xmloutput.cpp
index 3d84a2f5e4c29..525810143f9b8 100644
--- a/clang/test/Format/xmloutput.cpp
+++ b/clang/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