Re-add clang-format tests to clang/test.

Also now use -strict-whitespace as the tests are confusing otherwise.

llvm-svn: 177853

4 files changed, 22 insertions, 1 deletions

diff --git a/clang/test/CMakeLists.txt b/clang/test/CMakeLists.txt
index 114015bfe0b..a11b83a854c 100644
--- a/clang/test/CMakeLists.txt
+++ b/clang/test/CMakeLists.txt
@@ -29,7 +29,7 @@ endif ()
 set(CLANG_TEST_DEPS
   clang clang-headers
   c-index-test diagtool arcmt-test c-arcmt-test
-  clang-check
+  clang-check clang-format
   )
 set(CLANG_TEST_PARAMS
   clang_site_config=${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg
diff --git a/clang/test/Format/basic.cpp b/clang/test/Format/basic.cpp
new file mode 100644
index 00000000000..375bbd2ec71
--- /dev/null
+++ b/clang/test/Format/basic.cpp
@@ -0,0 +1,6 @@
+// RUN: grep -Ev "// *[A-Z-]+:" %s > %t.cpp
+// RUN: clang-format -i %t.cpp
+// RUN: FileCheck -strict-whitespace -input-file=%t.cpp %s
+
+// CHECK: {{^int\ \*i;}}
+ int   *  i  ;
diff --git a/clang/test/Format/diagnostic.cpp b/clang/test/Format/diagnostic.cpp
new file mode 100644
index 00000000000..2e930ee5b79
--- /dev/null
+++ b/clang/test/Format/diagnostic.cpp
@@ -0,0 +1,4 @@
+// RUN: clang-format 2>&1 >/dev/null %s |FileCheck %s
+
+}
+// CHECK: diagnostic.cpp:[[@LINE-1]]:1: error: unexpected '}'
diff --git a/clang/test/Format/ranges.cpp b/clang/test/Format/ranges.cpp
new file mode 100644
index 00000000000..0244fc195ca
--- /dev/null
+++ b/clang/test/Format/ranges.cpp
@@ -0,0 +1,11 @@
+// RUN: grep -Ev "// *[A-Z-]+:" %s > %t.cpp
+// RUN: clang-format -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;
+
+// CHECK: {{^\ \ int\ \ \*\ \ i;$}}
+  int  *  i; 
+
+// CHECK: {{^\ \ int\ \*i;$}}
+  int   *   i;