Index: test/.clang-format
===================================================================
--- test/.clang-format
+++ test/.clang-format
@@ -0,0 +1,2 @@
+BasedOnStyle: LLVM
+ColumnLimit: 0
Index: test/asan/TestCases/Linux/preinstalled_signal.cc
===================================================================
--- test/asan/TestCases/Linux/preinstalled_signal.cc
+++ test/asan/TestCases/Linux/preinstalled_signal.cc
@@ -1,4 +1,3 @@
-// clang-format off
 // RUN: %clangxx -std=c++11 %s -o %t
 // RUN: env LD_PRELOAD=%shared_libasan %env_asan_opts=handle_segv=1 not %run %t 2>&1 | FileCheck %s
 // RUN: env LD_PRELOAD=%shared_libasan %env_asan_opts=handle_segv=2 not %run %t 2>&1 | FileCheck %s
@@ -17,7 +16,6 @@
 
 // This way of setting LD_PRELOAD does not work with Android test runner.
 // REQUIRES: !android
-// clang-format on
 
 #include <assert.h>
 #include <signal.h>
Index: test/sanitizer_common/TestCases/Linux/allow_user_segv.cc
===================================================================
--- test/sanitizer_common/TestCases/Linux/allow_user_segv.cc
+++ test/sanitizer_common/TestCases/Linux/allow_user_segv.cc
@@ -1,7 +1,6 @@
 // Regression test for
 // https://code.google.com/p/address-sanitizer/issues/detail?id=180
 
-// clang-format off
 // RUN: %clangxx -O0 %s -o %t
 
 // RUN: %env_tool_opts=handle_segv=0 not %run %t 2>&1 | FileCheck %s --check-prefix=CHECK0
@@ -15,7 +14,6 @@
 // RUN: %env_tool_opts=handle_segv=0:allow_user_segv_handler=1 not %run %t 2>&1 | FileCheck %s --check-prefix=CHECK0
 // RUN: %env_tool_opts=handle_segv=1:allow_user_segv_handler=1 not %run %t 2>&1 | FileCheck %s --check-prefix=CHECK1
 // RUN: %env_tool_opts=handle_segv=2:allow_user_segv_handler=1 not %run %t 2>&1 | FileCheck %s --check-prefix=CHECK2
-// clang-format on
 
 // Flaky errors in debuggerd with "waitpid returned unexpected pid (0)" in logcat.
 // UNSUPPORTED: android && i386-target-arch
Index: test/sanitizer_common/TestCases/Linux/assert.cc
===================================================================
--- test/sanitizer_common/TestCases/Linux/assert.cc
+++ test/sanitizer_common/TestCases/Linux/assert.cc
@@ -1,11 +1,9 @@
 // Test the handle_abort option.
 
-// clang-format off
 // RUN: %clangxx %s -o %t
 // RUN:                              not --crash %run %t 2>&1 | FileCheck --check-prefix=CHECK0 %s
 // RUN: %env_tool_opts=handle_abort=0 not --crash %run %t 2>&1 | FileCheck --check-prefix=CHECK0 %s
 // RUN: %env_tool_opts=handle_abort=1 not         %run %t 2>&1 | FileCheck --check-prefix=CHECK1 %s
-// clang-format on
 
 #include <assert.h>
 #include <stdio.h>
Index: test/sanitizer_common/TestCases/Linux/ill.cc
===================================================================
--- test/sanitizer_common/TestCases/Linux/ill.cc
+++ test/sanitizer_common/TestCases/Linux/ill.cc
@@ -1,11 +1,9 @@
 // Test the handle_sigill option.
 
-// clang-format off
 // RUN: %clangxx %s -o %t -O1
 // RUN:                                not --crash %run %t 2>&1 | FileCheck --check-prefix=CHECK0 %s
 // RUN: %env_tool_opts=handle_sigill=0 not --crash %run %t 2>&1 | FileCheck --check-prefix=CHECK0 %s
 // RUN: %env_tool_opts=handle_sigill=1 not         %run %t 2>&1 | FileCheck --check-prefix=CHECK1 %s
-// clang-format on
 
 // FIXME: seems to fail on ARM
 // REQUIRES: x86_64-target-arch
Index: test/sanitizer_common/TestCases/Linux/signal_segv_handler.cc
===================================================================
--- test/sanitizer_common/TestCases/Linux/signal_segv_handler.cc
+++ test/sanitizer_common/TestCases/Linux/signal_segv_handler.cc
@@ -1,6 +1,4 @@
-// clang-format off
 // RUN: %clangxx -O1 %s -o %t && TSAN_OPTIONS="flush_memory_ms=1 memory_limit_mb=1" %run %t 2>&1 | FileCheck %s
-// clang-format on
 
 // JVM uses SEGV to preempt threads. All threads do a load from a known address
 // periodically. When runtime needs to preempt threads, it unmaps the page.
Index: test/sanitizer_common/TestCases/Posix/dump_instruction_bytes.cc
===================================================================
--- test/sanitizer_common/TestCases/Posix/dump_instruction_bytes.cc
+++ test/sanitizer_common/TestCases/Posix/dump_instruction_bytes.cc
@@ -1,11 +1,9 @@
 // Check that sanitizer prints the faulting instruction bytes on
 // dump_instruction_bytes=1
 
-// clang-format off
 // RUN: %clangxx  %s -o %t
 // RUN: %env_tool_opts=dump_instruction_bytes=1 not %run %t 2>&1 | FileCheck %s --check-prefix=CHECK-DUMP
 // RUN: not %run %t 2>&1 | FileCheck %s --check-prefix=CHECK-NODUMP
-// clang-format on
 
 // REQUIRES: x86-target-arch