From a7b079534a01b963eed70706af47b4fc990af583 Mon Sep 17 00:00:00 2001 From: Vitaly Buka Date: Sat, 1 Dec 2018 01:24:29 +0000 Subject: [PATCH] [compiler-rt] Use "ColumnLimit: 0" instead of "clang-format off" in tests Reviewers: eugenis, jfb Subscribers: kubamracek, dberris, llvm-commits Differential Revision: https://reviews.llvm.org/D55152 llvm-svn: 348061 --- compiler-rt/test/.clang-format | 2 ++ compiler-rt/test/asan/TestCases/Linux/preinstalled_signal.cc | 2 -- .../test/sanitizer_common/TestCases/Linux/allow_user_segv.cc | 2 -- compiler-rt/test/sanitizer_common/TestCases/Linux/assert.cc | 2 -- compiler-rt/test/sanitizer_common/TestCases/Linux/ill.cc | 2 -- .../sanitizer_common/TestCases/Linux/signal_segv_handler.cc | 2 -- .../sanitizer_common/TestCases/Posix/dump_instruction_bytes.cc | 2 -- 7 files changed, 2 insertions(+), 12 deletions(-) create mode 100644 compiler-rt/test/.clang-format diff --git a/compiler-rt/test/.clang-format b/compiler-rt/test/.clang-format new file mode 100644 index 000000000000..4799b66f3e9a --- /dev/null +++ b/compiler-rt/test/.clang-format @@ -0,0 +1,2 @@ +BasedOnStyle: LLVM +ColumnLimit: 0 diff --git a/compiler-rt/test/asan/TestCases/Linux/preinstalled_signal.cc b/compiler-rt/test/asan/TestCases/Linux/preinstalled_signal.cc index ac4ea93a5418..2b50944c6f2f 100644 --- a/compiler-rt/test/asan/TestCases/Linux/preinstalled_signal.cc +++ b/compiler-rt/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 #include diff --git a/compiler-rt/test/sanitizer_common/TestCases/Linux/allow_user_segv.cc b/compiler-rt/test/sanitizer_common/TestCases/Linux/allow_user_segv.cc index e17de1853eb3..bd58f4bd9265 100644 --- a/compiler-rt/test/sanitizer_common/TestCases/Linux/allow_user_segv.cc +++ b/compiler-rt/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 diff --git a/compiler-rt/test/sanitizer_common/TestCases/Linux/assert.cc b/compiler-rt/test/sanitizer_common/TestCases/Linux/assert.cc index 9c5263f8e776..2a73c508844b 100644 --- a/compiler-rt/test/sanitizer_common/TestCases/Linux/assert.cc +++ b/compiler-rt/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 #include diff --git a/compiler-rt/test/sanitizer_common/TestCases/Linux/ill.cc b/compiler-rt/test/sanitizer_common/TestCases/Linux/ill.cc index 43f7a7830495..bbde13b5675b 100644 --- a/compiler-rt/test/sanitizer_common/TestCases/Linux/ill.cc +++ b/compiler-rt/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 diff --git a/compiler-rt/test/sanitizer_common/TestCases/Linux/signal_segv_handler.cc b/compiler-rt/test/sanitizer_common/TestCases/Linux/signal_segv_handler.cc index d6c3ecbff475..9802617c2d05 100644 --- a/compiler-rt/test/sanitizer_common/TestCases/Linux/signal_segv_handler.cc +++ b/compiler-rt/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. diff --git a/compiler-rt/test/sanitizer_common/TestCases/Posix/dump_instruction_bytes.cc b/compiler-rt/test/sanitizer_common/TestCases/Posix/dump_instruction_bytes.cc index 87e797a00ae1..f42802a34582 100644 --- a/compiler-rt/test/sanitizer_common/TestCases/Posix/dump_instruction_bytes.cc +++ b/compiler-rt/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