From 13f89cd19b5425e2671390ef971f00b51f6bb113 Mon Sep 17 00:00:00 2001 From: Alexey Samsonov Date: Fri, 28 Jun 2013 15:52:44 +0000 Subject: [PATCH] [ASan] Remove %symbolize from lit tests: we now use external symbolizer instead of python script llvm-svn: 185163 --- .../TestCases/Linux/heavy_uar_test.cc | 4 +-- .../Linux/initialization-bug-any-order.cc | 4 +-- .../TestCases/Linux/malloc-in-qsort.cc | 4 +-- .../TestCases/Linux/malloc_delete_mismatch.cc | 3 +- .../TestCases/Linux/overflow-in-qsort.cc | 4 +-- .../asan/lit_tests/TestCases/Linux/ptrace.cc | 2 +- .../lit_tests/TestCases/Linux/syscalls.cc | 4 +-- .../TestCases/Linux/time_null_regtest.cc | 2 +- .../TestCases/Linux/zero-base-shadow32.cc | 6 ++-- .../TestCases/Linux/zero-base-shadow64.cc | 6 ++-- .../lit_tests/TestCases/deep_stack_uaf.cc | 2 +- .../lit_tests/TestCases/deep_tail_call.cc | 8 +++--- .../lit_tests/TestCases/deep_thread_stack.cc | 8 +++--- .../asan/lit_tests/TestCases/double-free.cc | 2 +- .../lit_tests/TestCases/global-demangle.cc | 1 - .../lit_tests/TestCases/global-overflow.cc | 8 +++--- .../asan/lit_tests/TestCases/heap-overflow.cc | 8 +++--- .../lit_tests/TestCases/initialization-bug.cc | 2 +- .../asan/lit_tests/TestCases/invalid-free.cc | 2 +- .../lib/asan/lit_tests/TestCases/ioctl.cc | 4 +-- .../lit_tests/TestCases/large_func_test.cc | 8 +++--- .../lit_tests/TestCases/memcmp_strict_test.cc | 6 ++-- .../asan/lit_tests/TestCases/memcmp_test.cc | 8 +++--- .../asan/lit_tests/TestCases/null_deref.cc | 8 +++--- .../asan/lit_tests/TestCases/partial_right.cc | 8 +++--- .../lib/asan/lit_tests/TestCases/readv.cc | 2 +- .../lit_tests/TestCases/sanity_check_pure_c.c | 4 +-- .../lit_tests/TestCases/shared-lib-test.cc | 8 +++--- .../TestCases/stack-frame-demangle.cc | 2 +- .../lit_tests/TestCases/stack-oob-frames.cc | 8 +++--- .../lit_tests/TestCases/stack-overflow.cc | 8 +++--- .../TestCases/stack-use-after-return.cc | 8 +++--- .../lit_tests/TestCases/strdup_oob_test.cc | 8 +++--- .../lit_tests/TestCases/strncpy-overflow.cc | 8 +++--- .../lit_tests/TestCases/time_interceptor.cc | 2 +- .../TestCases/unaligned_loads_and_stores.cc | 20 ++++++------- .../TestCases/use-after-free-right.cc | 8 +++--- .../lit_tests/TestCases/use-after-free.cc | 8 +++--- .../lit_tests/TestCases/use-after-poison.cc | 2 +- .../TestCases/use-after-scope-dtor-order.cc | 2 +- .../TestCases/use-after-scope-inlined.cc | 2 +- .../TestCases/use-after-scope-temp.cc | 2 +- .../lit_tests/TestCases/use-after-scope.cc | 2 +- .../lib/asan/lit_tests/TestCases/wait.cc | 28 +++++++++---------- compiler-rt/lib/asan/lit_tests/lit.cfg | 4 --- 45 files changed, 126 insertions(+), 132 deletions(-) diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/Linux/heavy_uar_test.cc b/compiler-rt/lib/asan/lit_tests/TestCases/Linux/heavy_uar_test.cc index 2c1b707026bc..4c5744a78bd4 100644 --- a/compiler-rt/lib/asan/lit_tests/TestCases/Linux/heavy_uar_test.cc +++ b/compiler-rt/lib/asan/lit_tests/TestCases/Linux/heavy_uar_test.cc @@ -1,7 +1,7 @@ // RUN: %clangxx_asan -fsanitize=use-after-return -O0 %s -o %t && \ -// RUN: %t 2>&1 | %symbolize | FileCheck %s +// RUN: %t 2>&1 | FileCheck %s // RUN: %clangxx_asan -fsanitize=use-after-return -O2 %s -o %t && \ -// RUN: %t 2>&1 | %symbolize | FileCheck %s +// RUN: %t 2>&1 | FileCheck %s #include #include diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/Linux/initialization-bug-any-order.cc b/compiler-rt/lib/asan/lit_tests/TestCases/Linux/initialization-bug-any-order.cc index c33f5cc776f0..0f1ea3e324cb 100644 --- a/compiler-rt/lib/asan/lit_tests/TestCases/Linux/initialization-bug-any-order.cc +++ b/compiler-rt/lib/asan/lit_tests/TestCases/Linux/initialization-bug-any-order.cc @@ -5,10 +5,10 @@ // RUN: %clangxx_asan -O0 %s %p/../Helpers/initialization-bug-extra.cc -o %t // RUN: ASAN_OPTIONS=check_initialization_order=true:strict_init_order=true %t 2>&1 \ -// RUN: | %symbolize | FileCheck %s +// RUN: | FileCheck %s // RUN: %clangxx_asan -O0 %p/../Helpers/initialization-bug-extra.cc %s -o %t // RUN: ASAN_OPTIONS=check_initialization_order=true:strict_init_order=true %t 2>&1 \ -// RUN: | %symbolize | FileCheck %s +// RUN: | FileCheck %s // Do not test with optimization -- the error may be optimized away. diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/Linux/malloc-in-qsort.cc b/compiler-rt/lib/asan/lit_tests/TestCases/Linux/malloc-in-qsort.cc index 32c2ca7ea051..c2ba82e483f0 100644 --- a/compiler-rt/lib/asan/lit_tests/TestCases/Linux/malloc-in-qsort.cc +++ b/compiler-rt/lib/asan/lit_tests/TestCases/Linux/malloc-in-qsort.cc @@ -1,6 +1,6 @@ // RUN: %clangxx_asan -O2 %s -o %t -// RUN: ASAN_OPTIONS=fast_unwind_on_malloc=1 %t 2>&1 | %symbolize | FileCheck %s --check-prefix=CHECK-FAST -// RUN: ASAN_OPTIONS=fast_unwind_on_malloc=0 %t 2>&1 | %symbolize | FileCheck %s --check-prefix=CHECK-SLOW +// RUN: ASAN_OPTIONS=fast_unwind_on_malloc=1 %t 2>&1 | FileCheck %s --check-prefix=CHECK-FAST +// RUN: ASAN_OPTIONS=fast_unwind_on_malloc=0 %t 2>&1 | FileCheck %s --check-prefix=CHECK-SLOW // Test how well we unwind in presence of qsort in the stack // (i.e. if we can unwind through a function compiled w/o frame pointers). diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/Linux/malloc_delete_mismatch.cc b/compiler-rt/lib/asan/lit_tests/TestCases/Linux/malloc_delete_mismatch.cc index f34b33a38fb3..984ac8fef4cc 100644 --- a/compiler-rt/lib/asan/lit_tests/TestCases/Linux/malloc_delete_mismatch.cc +++ b/compiler-rt/lib/asan/lit_tests/TestCases/Linux/malloc_delete_mismatch.cc @@ -2,8 +2,7 @@ // is set. // RUN: %clangxx_asan -g %s -o %t 2>&1 -// RUN: ASAN_OPTIONS=alloc_dealloc_mismatch=1 %t 2>&1 | \ -// RUN: %symbolize | FileCheck %s +// RUN: ASAN_OPTIONS=alloc_dealloc_mismatch=1 %t 2>&1 | FileCheck %s // No error here. // RUN: ASAN_OPTIONS=alloc_dealloc_mismatch=0 %t diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/Linux/overflow-in-qsort.cc b/compiler-rt/lib/asan/lit_tests/TestCases/Linux/overflow-in-qsort.cc index 19e73f67c49b..f4f2ca0713ba 100644 --- a/compiler-rt/lib/asan/lit_tests/TestCases/Linux/overflow-in-qsort.cc +++ b/compiler-rt/lib/asan/lit_tests/TestCases/Linux/overflow-in-qsort.cc @@ -1,6 +1,6 @@ // RUN: %clangxx_asan -O2 %s -o %t -// RUN: ASAN_OPTIONS=fast_unwind_on_fatal=1 %t 2>&1 | %symbolize | FileCheck %s --check-prefix=CHECK-FAST -// RUN: ASAN_OPTIONS=fast_unwind_on_fatal=0 %t 2>&1 | %symbolize | FileCheck %s --check-prefix=CHECK-SLOW +// RUN: ASAN_OPTIONS=fast_unwind_on_fatal=1 %t 2>&1 | FileCheck %s --check-prefix=CHECK-FAST +// RUN: ASAN_OPTIONS=fast_unwind_on_fatal=0 %t 2>&1 | FileCheck %s --check-prefix=CHECK-SLOW // Test how well we unwind in presence of qsort in the stack // (i.e. if we can unwind through a function compiled w/o frame pointers). diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/Linux/ptrace.cc b/compiler-rt/lib/asan/lit_tests/TestCases/Linux/ptrace.cc index 8356eac220b6..c6195f638952 100644 --- a/compiler-rt/lib/asan/lit_tests/TestCases/Linux/ptrace.cc +++ b/compiler-rt/lib/asan/lit_tests/TestCases/Linux/ptrace.cc @@ -1,5 +1,5 @@ // RUN: %clangxx_asan -O0 %s -o %t && %t -// RUN: %clangxx_asan -DPOSITIVE -O0 %s -o %t && %t 2>&1 | %symbolize | FileCheck %s +// RUN: %clangxx_asan -DPOSITIVE -O0 %s -o %t && %t 2>&1 | FileCheck %s #include #include diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/Linux/syscalls.cc b/compiler-rt/lib/asan/lit_tests/TestCases/Linux/syscalls.cc index e7acdba07ec8..7352914bac28 100644 --- a/compiler-rt/lib/asan/lit_tests/TestCases/Linux/syscalls.cc +++ b/compiler-rt/lib/asan/lit_tests/TestCases/Linux/syscalls.cc @@ -1,5 +1,5 @@ -// RUN: %clangxx_asan -O0 %s -o %t && %t 2>&1 | %symbolize | FileCheck %s -// RUN: %clangxx_asan -O3 %s -o %t && %t 2>&1 | %symbolize | FileCheck %s +// RUN: %clangxx_asan -O0 %s -o %t && %t 2>&1 | FileCheck %s +// RUN: %clangxx_asan -O3 %s -o %t && %t 2>&1 | FileCheck %s #include #include diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/Linux/time_null_regtest.cc b/compiler-rt/lib/asan/lit_tests/TestCases/Linux/time_null_regtest.cc index 7579a44644f4..566409be6a19 100644 --- a/compiler-rt/lib/asan/lit_tests/TestCases/Linux/time_null_regtest.cc +++ b/compiler-rt/lib/asan/lit_tests/TestCases/Linux/time_null_regtest.cc @@ -1,4 +1,4 @@ -// RUN: %clangxx_asan -O0 %s -fsanitize-address-zero-base-shadow -pie -o %t && %t 2>&1 | %symbolize | FileCheck %s +// RUN: %clangxx_asan -O0 %s -fsanitize-address-zero-base-shadow -pie -o %t && %t 2>&1 | FileCheck %s // Zero-base shadow only works on x86_64 and i386. // REQUIRES: x86_64-supported-target diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/Linux/zero-base-shadow32.cc b/compiler-rt/lib/asan/lit_tests/TestCases/Linux/zero-base-shadow32.cc index 5406b8a155a6..5ef087b1db91 100644 --- a/compiler-rt/lib/asan/lit_tests/TestCases/Linux/zero-base-shadow32.cc +++ b/compiler-rt/lib/asan/lit_tests/TestCases/Linux/zero-base-shadow32.cc @@ -1,9 +1,9 @@ // RUN: %clangxx_asan -O0 -fsanitize-address-zero-base-shadow -fPIE -pie %s -o %t -// RUN: %t 2>&1 | %symbolize | FileCheck %s +// RUN: %t 2>&1 | FileCheck %s // RUN: %clangxx_asan -O1 -fsanitize-address-zero-base-shadow -fPIE -pie %s -o %t -// RUN: %t 2>&1 | %symbolize | FileCheck %s +// RUN: %t 2>&1 | FileCheck %s // RUN: %clangxx_asan -O2 -fsanitize-address-zero-base-shadow -fPIE -pie %s -o %t -// RUN: %t 2>&1 | %symbolize | FileCheck %s +// RUN: %t 2>&1 | FileCheck %s // Zero-base shadow only works on x86_64 and i386. // REQUIRES: i386-supported-target, asan-32-bits diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/Linux/zero-base-shadow64.cc b/compiler-rt/lib/asan/lit_tests/TestCases/Linux/zero-base-shadow64.cc index c02c923b82d4..a726b4494960 100644 --- a/compiler-rt/lib/asan/lit_tests/TestCases/Linux/zero-base-shadow64.cc +++ b/compiler-rt/lib/asan/lit_tests/TestCases/Linux/zero-base-shadow64.cc @@ -1,9 +1,9 @@ // RUN: %clangxx_asan -O0 -fsanitize-address-zero-base-shadow -fPIE -pie %s -o %t -// RUN: %t 2>&1 | %symbolize | FileCheck %s +// RUN: %t 2>&1 | FileCheck %s // RUN: %clangxx_asan -O1 -fsanitize-address-zero-base-shadow -fPIE -pie %s -o %t -// RUN: %t 2>&1 | %symbolize | FileCheck %s +// RUN: %t 2>&1 | FileCheck %s // RUN: %clangxx_asan -O2 -fsanitize-address-zero-base-shadow -fPIE -pie %s -o %t -// RUN: %t 2>&1 | %symbolize | FileCheck %s +// RUN: %t 2>&1 | FileCheck %s // Zero-base shadow only works on x86_64 and i386. // REQUIRES: x86_64-supported-target, asan-64-bits diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/deep_stack_uaf.cc b/compiler-rt/lib/asan/lit_tests/TestCases/deep_stack_uaf.cc index 536cddb15d9a..6ab515e111db 100644 --- a/compiler-rt/lib/asan/lit_tests/TestCases/deep_stack_uaf.cc +++ b/compiler-rt/lib/asan/lit_tests/TestCases/deep_stack_uaf.cc @@ -1,7 +1,7 @@ // Check that we can store lots of stack frames if asked to. // RUN: %clangxx_asan -O0 %s -o %t 2>&1 -// RUN: ASAN_OPTIONS=malloc_context_size=120:redzone=512 %t 2>&1 | %symbolize | FileCheck %s +// RUN: ASAN_OPTIONS=malloc_context_size=120:redzone=512 %t 2>&1 | FileCheck %s #include #include diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/deep_tail_call.cc b/compiler-rt/lib/asan/lit_tests/TestCases/deep_tail_call.cc index 87d8886c0547..8a1b3e8fe0e9 100644 --- a/compiler-rt/lib/asan/lit_tests/TestCases/deep_tail_call.cc +++ b/compiler-rt/lib/asan/lit_tests/TestCases/deep_tail_call.cc @@ -1,7 +1,7 @@ -// RUN: %clangxx_asan -O0 %s -o %t && %t 2>&1 | %symbolize | FileCheck %s -// RUN: %clangxx_asan -O1 %s -o %t && %t 2>&1 | %symbolize | FileCheck %s -// RUN: %clangxx_asan -O2 %s -o %t && %t 2>&1 | %symbolize | FileCheck %s -// RUN: %clangxx_asan -O3 %s -o %t && %t 2>&1 | %symbolize | FileCheck %s +// RUN: %clangxx_asan -O0 %s -o %t && %t 2>&1 | FileCheck %s +// RUN: %clangxx_asan -O1 %s -o %t && %t 2>&1 | FileCheck %s +// RUN: %clangxx_asan -O2 %s -o %t && %t 2>&1 | FileCheck %s +// RUN: %clangxx_asan -O3 %s -o %t && %t 2>&1 | FileCheck %s // CHECK: AddressSanitizer: global-buffer-overflow int global[10]; diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/deep_thread_stack.cc b/compiler-rt/lib/asan/lit_tests/TestCases/deep_thread_stack.cc index ecc6fffc9062..10954f28eee7 100644 --- a/compiler-rt/lib/asan/lit_tests/TestCases/deep_thread_stack.cc +++ b/compiler-rt/lib/asan/lit_tests/TestCases/deep_thread_stack.cc @@ -1,7 +1,7 @@ -// RUN: %clangxx_asan -O0 %s -o %t && %t 2>&1 | %symbolize | FileCheck %s -// RUN: %clangxx_asan -O1 %s -o %t && %t 2>&1 | %symbolize | FileCheck %s -// RUN: %clangxx_asan -O2 %s -o %t && %t 2>&1 | %symbolize | FileCheck %s -// RUN: %clangxx_asan -O3 %s -o %t && %t 2>&1 | %symbolize | FileCheck %s +// RUN: %clangxx_asan -O0 %s -o %t && %t 2>&1 | FileCheck %s +// RUN: %clangxx_asan -O1 %s -o %t && %t 2>&1 | FileCheck %s +// RUN: %clangxx_asan -O2 %s -o %t && %t 2>&1 | FileCheck %s +// RUN: %clangxx_asan -O3 %s -o %t && %t 2>&1 | FileCheck %s #include diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/double-free.cc b/compiler-rt/lib/asan/lit_tests/TestCases/double-free.cc index 6e6f4bbdc984..a3d307d5b6d9 100644 --- a/compiler-rt/lib/asan/lit_tests/TestCases/double-free.cc +++ b/compiler-rt/lib/asan/lit_tests/TestCases/double-free.cc @@ -1,4 +1,4 @@ -// RUN: %clangxx_asan -O0 %s -o %t && %t 2>&1 | %symbolize | FileCheck %s +// RUN: %clangxx_asan -O0 %s -o %t && %t 2>&1 | FileCheck %s #include #include diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/global-demangle.cc b/compiler-rt/lib/asan/lit_tests/TestCases/global-demangle.cc index 75001ae4192b..bad37da32b99 100644 --- a/compiler-rt/lib/asan/lit_tests/TestCases/global-demangle.cc +++ b/compiler-rt/lib/asan/lit_tests/TestCases/global-demangle.cc @@ -1,4 +1,3 @@ -// Don't run through %symbolize to avoid c++filt demangling. // RUN: %clangxx_asan -O0 %s -o %t && %t 2>&1 | FileCheck %s namespace XXX { diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/global-overflow.cc b/compiler-rt/lib/asan/lit_tests/TestCases/global-overflow.cc index e5723355156a..5b75efaf65b1 100644 --- a/compiler-rt/lib/asan/lit_tests/TestCases/global-overflow.cc +++ b/compiler-rt/lib/asan/lit_tests/TestCases/global-overflow.cc @@ -1,7 +1,7 @@ -// RUN: %clangxx_asan -O0 %s -o %t && %t 2>&1 | %symbolize | FileCheck %s -// RUN: %clangxx_asan -O1 %s -o %t && %t 2>&1 | %symbolize | FileCheck %s -// RUN: %clangxx_asan -O2 %s -o %t && %t 2>&1 | %symbolize | FileCheck %s -// RUN: %clangxx_asan -O3 %s -o %t && %t 2>&1 | %symbolize | FileCheck %s +// RUN: %clangxx_asan -O0 %s -o %t && %t 2>&1 | FileCheck %s +// RUN: %clangxx_asan -O1 %s -o %t && %t 2>&1 | FileCheck %s +// RUN: %clangxx_asan -O2 %s -o %t && %t 2>&1 | FileCheck %s +// RUN: %clangxx_asan -O3 %s -o %t && %t 2>&1 | FileCheck %s #include int main(int argc, char **argv) { diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/heap-overflow.cc b/compiler-rt/lib/asan/lit_tests/TestCases/heap-overflow.cc index 664b2646d779..05aad02c1782 100644 --- a/compiler-rt/lib/asan/lit_tests/TestCases/heap-overflow.cc +++ b/compiler-rt/lib/asan/lit_tests/TestCases/heap-overflow.cc @@ -1,10 +1,10 @@ -// RUN: %clangxx_asan -O0 %s -o %t && %t 2>&1 | %symbolize > %t.out +// RUN: %clangxx_asan -O0 %s -o %t && not %t 2>%t.out // RUN: FileCheck %s < %t.out && FileCheck %s --check-prefix=CHECK-%os < %t.out -// RUN: %clangxx_asan -O1 %s -o %t && %t 2>&1 | %symbolize > %t.out +// RUN: %clangxx_asan -O1 %s -o %t && not %t 2>%t.out // RUN: FileCheck %s < %t.out && FileCheck %s --check-prefix=CHECK-%os < %t.out -// RUN: %clangxx_asan -O2 %s -o %t && %t 2>&1 | %symbolize > %t.out +// RUN: %clangxx_asan -O2 %s -o %t && not %t 2>%t.out // RUN: FileCheck %s < %t.out && FileCheck %s --check-prefix=CHECK-%os < %t.out -// RUN: %clangxx_asan -O3 %s -o %t && %t 2>&1 | %symbolize > %t.out +// RUN: %clangxx_asan -O3 %s -o %t && not %t 2>%t.out // RUN: FileCheck %s < %t.out && FileCheck %s --check-prefix=CHECK-%os < %t.out #include diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/initialization-bug.cc b/compiler-rt/lib/asan/lit_tests/TestCases/initialization-bug.cc index 91fe7dbd4b64..3a05cc2889ea 100644 --- a/compiler-rt/lib/asan/lit_tests/TestCases/initialization-bug.cc +++ b/compiler-rt/lib/asan/lit_tests/TestCases/initialization-bug.cc @@ -1,7 +1,7 @@ // Test to make sure basic initialization order errors are caught. // RUN: %clangxx_asan -O0 %s %p/Helpers/initialization-bug-extra2.cc -o %t -// RUN: ASAN_OPTIONS=check_initialization_order=true %t 2>&1 | %symbolize | FileCheck %s +// RUN: ASAN_OPTIONS=check_initialization_order=true %t 2>&1 | FileCheck %s // Do not test with optimization -- the error may be optimized away. diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/invalid-free.cc b/compiler-rt/lib/asan/lit_tests/TestCases/invalid-free.cc index c17441318880..8e1c086530f0 100644 --- a/compiler-rt/lib/asan/lit_tests/TestCases/invalid-free.cc +++ b/compiler-rt/lib/asan/lit_tests/TestCases/invalid-free.cc @@ -1,4 +1,4 @@ -// RUN: %clangxx_asan -O0 %s -o %t && %t 2>&1 | %symbolize | FileCheck %s +// RUN: %clangxx_asan -O0 %s -o %t && %t 2>&1 | FileCheck %s #include #include diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/ioctl.cc b/compiler-rt/lib/asan/lit_tests/TestCases/ioctl.cc index 0939d6cb9bb0..46f344faf4ac 100644 --- a/compiler-rt/lib/asan/lit_tests/TestCases/ioctl.cc +++ b/compiler-rt/lib/asan/lit_tests/TestCases/ioctl.cc @@ -1,5 +1,5 @@ -// RUN: %clangxx_asan -O0 -g %s -o %t && ASAN_OPTIONS=handle_ioctl=1 %t 2>&1 | %symbolize | FileCheck %s -// RUN: %clangxx_asan -O3 -g %s -o %t && ASAN_OPTIONS=handle_ioctl=1 %t 2>&1 | %symbolize | FileCheck %s +// RUN: %clangxx_asan -O0 -g %s -o %t && ASAN_OPTIONS=handle_ioctl=1 %t 2>&1 | FileCheck %s +// RUN: %clangxx_asan -O3 -g %s -o %t && ASAN_OPTIONS=handle_ioctl=1 %t 2>&1 | FileCheck %s // RUN: %clangxx_asan -O0 -g %s -o %t && %t // RUN: %clangxx_asan -O3 -g %s -o %t && %t diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/large_func_test.cc b/compiler-rt/lib/asan/lit_tests/TestCases/large_func_test.cc index d550a969e8b4..201f5d5f9c48 100644 --- a/compiler-rt/lib/asan/lit_tests/TestCases/large_func_test.cc +++ b/compiler-rt/lib/asan/lit_tests/TestCases/large_func_test.cc @@ -1,10 +1,10 @@ -// RUN: %clangxx_asan -O0 %s -o %t && %t 2>&1 | %symbolize > %t.out +// RUN: %clangxx_asan -O0 %s -o %t && not %t 2>%t.out // RUN: FileCheck %s < %t.out && FileCheck %s --check-prefix=CHECK-%os < %t.out -// RUN: %clangxx_asan -O1 %s -o %t && %t 2>&1 | %symbolize > %t.out +// RUN: %clangxx_asan -O1 %s -o %t && not %t 2>%t.out // RUN: FileCheck %s < %t.out && FileCheck %s --check-prefix=CHECK-%os < %t.out -// RUN: %clangxx_asan -O2 %s -o %t && %t 2>&1 | %symbolize > %t.out +// RUN: %clangxx_asan -O2 %s -o %t && not %t 2>%t.out // RUN: FileCheck %s < %t.out && FileCheck %s --check-prefix=CHECK-%os < %t.out -// RUN: %clangxx_asan -O3 %s -o %t && %t 2>&1 | %symbolize > %t.out +// RUN: %clangxx_asan -O3 %s -o %t && not %t 2>%t.out // RUN: FileCheck %s < %t.out && FileCheck %s --check-prefix=CHECK-%os < %t.out #include diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/memcmp_strict_test.cc b/compiler-rt/lib/asan/lit_tests/TestCases/memcmp_strict_test.cc index 881410e261a4..a29282b01135 100644 --- a/compiler-rt/lib/asan/lit_tests/TestCases/memcmp_strict_test.cc +++ b/compiler-rt/lib/asan/lit_tests/TestCases/memcmp_strict_test.cc @@ -1,7 +1,7 @@ -// RUN: %clangxx_asan -O0 %s -o %t && ASAN_OPTIONS=strict_memcmp=0 %t 2>&1 | %symbolize | FileCheck %s --check-prefix=CHECK-nonstrict -// RUN: %clangxx_asan -O0 %s -o %t && ASAN_OPTIONS=strict_memcmp=1 %t 2>&1 | %symbolize | FileCheck %s --check-prefix=CHECK-strict +// RUN: %clangxx_asan -O0 %s -o %t && ASAN_OPTIONS=strict_memcmp=0 %t 2>&1 | FileCheck %s --check-prefix=CHECK-nonstrict +// RUN: %clangxx_asan -O0 %s -o %t && ASAN_OPTIONS=strict_memcmp=1 %t 2>&1 | FileCheck %s --check-prefix=CHECK-strict // Default to strict_memcmp=1. -// RUN: %clangxx_asan -O0 %s -o %t && %t 2>&1 | %symbolize | FileCheck %s --check-prefix=CHECK-strict +// RUN: %clangxx_asan -O0 %s -o %t && %t 2>&1 | FileCheck %s --check-prefix=CHECK-strict #include #include diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/memcmp_test.cc b/compiler-rt/lib/asan/lit_tests/TestCases/memcmp_test.cc index 78c151f04434..2d7d4f42fa7a 100644 --- a/compiler-rt/lib/asan/lit_tests/TestCases/memcmp_test.cc +++ b/compiler-rt/lib/asan/lit_tests/TestCases/memcmp_test.cc @@ -1,7 +1,7 @@ -// RUN: %clangxx_asan -O0 %s -o %t && %t 2>&1 | %symbolize | FileCheck %s -// RUN: %clangxx_asan -O1 %s -o %t && %t 2>&1 | %symbolize | FileCheck %s -// RUN: %clangxx_asan -O2 %s -o %t && %t 2>&1 | %symbolize | FileCheck %s -// RUN: %clangxx_asan -O3 %s -o %t && %t 2>&1 | %symbolize | FileCheck %s +// RUN: %clangxx_asan -O0 %s -o %t && %t 2>&1 | FileCheck %s +// RUN: %clangxx_asan -O1 %s -o %t && %t 2>&1 | FileCheck %s +// RUN: %clangxx_asan -O2 %s -o %t && %t 2>&1 | FileCheck %s +// RUN: %clangxx_asan -O3 %s -o %t && %t 2>&1 | FileCheck %s #include int main(int argc, char **argv) { diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/null_deref.cc b/compiler-rt/lib/asan/lit_tests/TestCases/null_deref.cc index a5374f5c28cf..4d501c611e66 100644 --- a/compiler-rt/lib/asan/lit_tests/TestCases/null_deref.cc +++ b/compiler-rt/lib/asan/lit_tests/TestCases/null_deref.cc @@ -1,10 +1,10 @@ -// RUN: %clangxx_asan -O0 %s -o %t && %t 2>&1 | %symbolize > %t.out +// RUN: %clangxx_asan -O0 %s -o %t && not %t 2>%t.out // RUN: FileCheck %s < %t.out && FileCheck %s --check-prefix=CHECK-%os < %t.out -// RUN: %clangxx_asan -O1 %s -o %t && %t 2>&1 | %symbolize > %t.out +// RUN: %clangxx_asan -O1 %s -o %t && not %t 2>%t.out // RUN: FileCheck %s < %t.out && FileCheck %s --check-prefix=CHECK-%os < %t.out -// RUN: %clangxx_asan -O2 %s -o %t && %t 2>&1 | %symbolize > %t.out +// RUN: %clangxx_asan -O2 %s -o %t && not %t 2>%t.out // RUN: FileCheck %s < %t.out && FileCheck %s --check-prefix=CHECK-%os < %t.out -// RUN: %clangxx_asan -O3 %s -o %t && %t 2>&1 | %symbolize > %t.out +// RUN: %clangxx_asan -O3 %s -o %t && not %t 2>%t.out // RUN: FileCheck %s < %t.out && FileCheck %s --check-prefix=CHECK-%os < %t.out __attribute__((noinline)) diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/partial_right.cc b/compiler-rt/lib/asan/lit_tests/TestCases/partial_right.cc index 43c14537e4b3..0beece39a7f2 100644 --- a/compiler-rt/lib/asan/lit_tests/TestCases/partial_right.cc +++ b/compiler-rt/lib/asan/lit_tests/TestCases/partial_right.cc @@ -1,7 +1,7 @@ -// RUN: %clangxx_asan -O0 %s -o %t && %t 2>&1 | %symbolize | FileCheck %s -// RUN: %clangxx_asan -O1 %s -o %t && %t 2>&1 | %symbolize | FileCheck %s -// RUN: %clangxx_asan -O2 %s -o %t && %t 2>&1 | %symbolize | FileCheck %s -// RUN: %clangxx_asan -O3 %s -o %t && %t 2>&1 | %symbolize | FileCheck %s +// RUN: %clangxx_asan -O0 %s -o %t && %t 2>&1 | FileCheck %s +// RUN: %clangxx_asan -O1 %s -o %t && %t 2>&1 | FileCheck %s +// RUN: %clangxx_asan -O2 %s -o %t && %t 2>&1 | FileCheck %s +// RUN: %clangxx_asan -O3 %s -o %t && %t 2>&1 | FileCheck %s #include int main(int argc, char **argv) { diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/readv.cc b/compiler-rt/lib/asan/lit_tests/TestCases/readv.cc index 5120b77e7686..920ebc8fa86a 100644 --- a/compiler-rt/lib/asan/lit_tests/TestCases/readv.cc +++ b/compiler-rt/lib/asan/lit_tests/TestCases/readv.cc @@ -1,5 +1,5 @@ // RUN: %clangxx_asan -O0 %s -o %t && %t -// RUN: %clangxx_asan -O0 %s -DPOSITIVE -o %t && %t 2>&1 | %symbolize | FileCheck %s +// RUN: %clangxx_asan -O0 %s -DPOSITIVE -o %t && %t 2>&1 | FileCheck %s // Test the readv() interceptor. diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/sanity_check_pure_c.c b/compiler-rt/lib/asan/lit_tests/TestCases/sanity_check_pure_c.c index ac4f034a8fe2..3eb9931ed129 100644 --- a/compiler-rt/lib/asan/lit_tests/TestCases/sanity_check_pure_c.c +++ b/compiler-rt/lib/asan/lit_tests/TestCases/sanity_check_pure_c.c @@ -1,10 +1,10 @@ // Sanity checking a test in pure C. // RUN: %clang_asan -O2 %s -o %t -// RUN: %t 2>&1 | %symbolize | FileCheck %s +// RUN: %t 2>&1 | FileCheck %s // Sanity checking a test in pure C with -pie. // RUN: %clang_asan -O2 %s -pie -o %t -// RUN: %t 2>&1 | %symbolize | FileCheck %s +// RUN: %t 2>&1 | FileCheck %s #include int main() { diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/shared-lib-test.cc b/compiler-rt/lib/asan/lit_tests/TestCases/shared-lib-test.cc index 205143d8249e..c8fd0a8188eb 100644 --- a/compiler-rt/lib/asan/lit_tests/TestCases/shared-lib-test.cc +++ b/compiler-rt/lib/asan/lit_tests/TestCases/shared-lib-test.cc @@ -1,15 +1,15 @@ // RUN: %clangxx_asan -O0 %p/SharedLibs/shared-lib-test-so.cc \ // RUN: -fPIC -shared -o %t-so.so -// RUN: %clangxx_asan -O0 %s -o %t && %t 2>&1 | %symbolize | FileCheck %s +// RUN: %clangxx_asan -O0 %s -o %t && %t 2>&1 | FileCheck %s // RUN: %clangxx_asan -O1 %p/SharedLibs/shared-lib-test-so.cc \ // RUN: -fPIC -shared -o %t-so.so -// RUN: %clangxx_asan -O1 %s -o %t && %t 2>&1 | %symbolize | FileCheck %s +// RUN: %clangxx_asan -O1 %s -o %t && %t 2>&1 | FileCheck %s // RUN: %clangxx_asan -O2 %p/SharedLibs/shared-lib-test-so.cc \ // RUN: -fPIC -shared -o %t-so.so -// RUN: %clangxx_asan -O2 %s -o %t && %t 2>&1 | %symbolize | FileCheck %s +// RUN: %clangxx_asan -O2 %s -o %t && %t 2>&1 | FileCheck %s // RUN: %clangxx_asan -O3 %p/SharedLibs/shared-lib-test-so.cc \ // RUN: -fPIC -shared -o %t-so.so -// RUN: %clangxx_asan -O3 %s -o %t && %t 2>&1 | %symbolize | FileCheck %s +// RUN: %clangxx_asan -O3 %s -o %t && %t 2>&1 | FileCheck %s #include #include diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/stack-frame-demangle.cc b/compiler-rt/lib/asan/lit_tests/TestCases/stack-frame-demangle.cc index a4afe5d28c9d..68f38728f6b6 100644 --- a/compiler-rt/lib/asan/lit_tests/TestCases/stack-frame-demangle.cc +++ b/compiler-rt/lib/asan/lit_tests/TestCases/stack-frame-demangle.cc @@ -1,4 +1,4 @@ -// RUN: %clangxx_asan -O0 %s -o %t && %t 2>&1 | %symbolize | FileCheck %s +// RUN: %clangxx_asan -O0 %s -o %t && %t 2>&1 | FileCheck %s #include diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/stack-oob-frames.cc b/compiler-rt/lib/asan/lit_tests/TestCases/stack-oob-frames.cc index a4acd592af75..dc2615c2c9ca 100644 --- a/compiler-rt/lib/asan/lit_tests/TestCases/stack-oob-frames.cc +++ b/compiler-rt/lib/asan/lit_tests/TestCases/stack-oob-frames.cc @@ -1,8 +1,8 @@ // RUN: %clangxx_asan -O1 %s -o %t -// RUN: %t 0 2>&1 | %symbolize | FileCheck %s --check-prefix=CHECK0 -// RUN: %t 1 2>&1 | %symbolize | FileCheck %s --check-prefix=CHECK1 -// RUN: %t 2 2>&1 | %symbolize | FileCheck %s --check-prefix=CHECK2 -// RUN: %t 3 2>&1 | %symbolize | FileCheck %s --check-prefix=CHECK3 +// RUN: %t 0 2>&1 | FileCheck %s --check-prefix=CHECK0 +// RUN: %t 1 2>&1 | FileCheck %s --check-prefix=CHECK1 +// RUN: %t 2 2>&1 | FileCheck %s --check-prefix=CHECK2 +// RUN: %t 3 2>&1 | FileCheck %s --check-prefix=CHECK3 #define NOINLINE __attribute__((noinline)) inline void break_optimization(void *arg) { diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/stack-overflow.cc b/compiler-rt/lib/asan/lit_tests/TestCases/stack-overflow.cc index 371948253902..f91b391a7f86 100644 --- a/compiler-rt/lib/asan/lit_tests/TestCases/stack-overflow.cc +++ b/compiler-rt/lib/asan/lit_tests/TestCases/stack-overflow.cc @@ -1,7 +1,7 @@ -// RUN: %clangxx_asan -O0 %s -o %t && %t 2>&1 | %symbolize | FileCheck %s -// RUN: %clangxx_asan -O1 %s -o %t && %t 2>&1 | %symbolize | FileCheck %s -// RUN: %clangxx_asan -O2 %s -o %t && %t 2>&1 | %symbolize | FileCheck %s -// RUN: %clangxx_asan -O3 %s -o %t && %t 2>&1 | %symbolize | FileCheck %s +// RUN: %clangxx_asan -O0 %s -o %t && %t 2>&1 | FileCheck %s +// RUN: %clangxx_asan -O1 %s -o %t && %t 2>&1 | FileCheck %s +// RUN: %clangxx_asan -O2 %s -o %t && %t 2>&1 | FileCheck %s +// RUN: %clangxx_asan -O3 %s -o %t && %t 2>&1 | FileCheck %s #include int main(int argc, char **argv) { diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/stack-use-after-return.cc b/compiler-rt/lib/asan/lit_tests/TestCases/stack-use-after-return.cc index 11bdfdf7c868..8064ffd8c959 100644 --- a/compiler-rt/lib/asan/lit_tests/TestCases/stack-use-after-return.cc +++ b/compiler-rt/lib/asan/lit_tests/TestCases/stack-use-after-return.cc @@ -1,12 +1,12 @@ // XFAIL: * // RUN: %clangxx_asan -fsanitize=use-after-return -O0 %s -o %t && \ -// RUN: %t 2>&1 | %symbolize | FileCheck %s +// RUN: %t 2>&1 | FileCheck %s // RUN: %clangxx_asan -fsanitize=use-after-return -O1 %s -o %t && \ -// RUN: %t 2>&1 | %symbolize | FileCheck %s +// RUN: %t 2>&1 | FileCheck %s // RUN: %clangxx_asan -fsanitize=use-after-return -O2 %s -o %t && \ -// RUN: %t 2>&1 | %symbolize | FileCheck %s +// RUN: %t 2>&1 | FileCheck %s // RUN: %clangxx_asan -fsanitize=use-after-return -O3 %s -o %t && \ -// RUN: %t 2>&1 | %symbolize | FileCheck %s +// RUN: %t 2>&1 | FileCheck %s #include diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/strdup_oob_test.cc b/compiler-rt/lib/asan/lit_tests/TestCases/strdup_oob_test.cc index f8366ddbbaea..bdaef4f12082 100644 --- a/compiler-rt/lib/asan/lit_tests/TestCases/strdup_oob_test.cc +++ b/compiler-rt/lib/asan/lit_tests/TestCases/strdup_oob_test.cc @@ -1,7 +1,7 @@ -// RUN: %clangxx_asan -O0 %s -o %t && %t 2>&1 | %symbolize | FileCheck %s -// RUN: %clangxx_asan -O1 %s -o %t && %t 2>&1 | %symbolize | FileCheck %s -// RUN: %clangxx_asan -O2 %s -o %t && %t 2>&1 | %symbolize | FileCheck %s -// RUN: %clangxx_asan -O3 %s -o %t && %t 2>&1 | %symbolize | FileCheck %s +// RUN: %clangxx_asan -O0 %s -o %t && %t 2>&1 | FileCheck %s +// RUN: %clangxx_asan -O1 %s -o %t && %t 2>&1 | FileCheck %s +// RUN: %clangxx_asan -O2 %s -o %t && %t 2>&1 | FileCheck %s +// RUN: %clangxx_asan -O3 %s -o %t && %t 2>&1 | FileCheck %s #include diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/strncpy-overflow.cc b/compiler-rt/lib/asan/lit_tests/TestCases/strncpy-overflow.cc index 91dbec488b66..54eabe13234c 100644 --- a/compiler-rt/lib/asan/lit_tests/TestCases/strncpy-overflow.cc +++ b/compiler-rt/lib/asan/lit_tests/TestCases/strncpy-overflow.cc @@ -1,10 +1,10 @@ -// RUN: %clangxx_asan -O0 %s -o %t && %t 2>&1 | %symbolize > %t.out +// RUN: %clangxx_asan -O0 %s -o %t && not %t 2>%t.out // RUN: FileCheck %s < %t.out && FileCheck %s --check-prefix=CHECK-%os < %t.out -// RUN: %clangxx_asan -O1 %s -o %t && %t 2>&1 | %symbolize > %t.out +// RUN: %clangxx_asan -O1 %s -o %t && not %t 2>%t.out // RUN: FileCheck %s < %t.out && FileCheck %s --check-prefix=CHECK-%os < %t.out -// RUN: %clangxx_asan -O2 %s -o %t && %t 2>&1 | %symbolize > %t.out +// RUN: %clangxx_asan -O2 %s -o %t && not %t 2>%t.out // RUN: FileCheck %s < %t.out && FileCheck %s --check-prefix=CHECK-%os < %t.out -// RUN: %clangxx_asan -O3 %s -o %t && %t 2>&1 | %symbolize > %t.out +// RUN: %clangxx_asan -O3 %s -o %t && not %t 2>%t.out // RUN: FileCheck %s < %t.out && FileCheck %s --check-prefix=CHECK-%os < %t.out #include diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/time_interceptor.cc b/compiler-rt/lib/asan/lit_tests/TestCases/time_interceptor.cc index a0de68b03e38..e270af9d2070 100644 --- a/compiler-rt/lib/asan/lit_tests/TestCases/time_interceptor.cc +++ b/compiler-rt/lib/asan/lit_tests/TestCases/time_interceptor.cc @@ -1,4 +1,4 @@ -// RUN: %clangxx_asan -O0 %s -o %t && %t 2>&1 | %symbolize | FileCheck %s +// RUN: %clangxx_asan -O0 %s -o %t && %t 2>&1 | FileCheck %s // Test the time() interceptor. diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/unaligned_loads_and_stores.cc b/compiler-rt/lib/asan/lit_tests/TestCases/unaligned_loads_and_stores.cc index cf58e9017162..c46d42e0796b 100644 --- a/compiler-rt/lib/asan/lit_tests/TestCases/unaligned_loads_and_stores.cc +++ b/compiler-rt/lib/asan/lit_tests/TestCases/unaligned_loads_and_stores.cc @@ -1,15 +1,15 @@ // RUN: %clangxx_asan -O0 %s -o %t -// RUN: %t A 2>&1 | %symbolize | FileCheck --check-prefix=CHECK-A %s -// RUN: %t B 2>&1 | %symbolize | FileCheck --check-prefix=CHECK-B %s -// RUN: %t C 2>&1 | %symbolize | FileCheck --check-prefix=CHECK-C %s -// RUN: %t D 2>&1 | %symbolize | FileCheck --check-prefix=CHECK-D %s -// RUN: %t E 2>&1 | %symbolize | FileCheck --check-prefix=CHECK-E %s +// RUN: %t A 2>&1 | FileCheck --check-prefix=CHECK-A %s +// RUN: %t B 2>&1 | FileCheck --check-prefix=CHECK-B %s +// RUN: %t C 2>&1 | FileCheck --check-prefix=CHECK-C %s +// RUN: %t D 2>&1 | FileCheck --check-prefix=CHECK-D %s +// RUN: %t E 2>&1 | FileCheck --check-prefix=CHECK-E %s -// RUN: %t K 2>&1 | %symbolize | FileCheck --check-prefix=CHECK-K %s -// RUN: %t L 2>&1 | %symbolize | FileCheck --check-prefix=CHECK-L %s -// RUN: %t M 2>&1 | %symbolize | FileCheck --check-prefix=CHECK-M %s -// RUN: %t N 2>&1 | %symbolize | FileCheck --check-prefix=CHECK-N %s -// RUN: %t O 2>&1 | %symbolize | FileCheck --check-prefix=CHECK-O %s +// RUN: %t K 2>&1 | FileCheck --check-prefix=CHECK-K %s +// RUN: %t L 2>&1 | FileCheck --check-prefix=CHECK-L %s +// RUN: %t M 2>&1 | FileCheck --check-prefix=CHECK-M %s +// RUN: %t N 2>&1 | FileCheck --check-prefix=CHECK-N %s +// RUN: %t O 2>&1 | FileCheck --check-prefix=CHECK-O %s #include diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/use-after-free-right.cc b/compiler-rt/lib/asan/lit_tests/TestCases/use-after-free-right.cc index 58c5e080b052..37132a622980 100644 --- a/compiler-rt/lib/asan/lit_tests/TestCases/use-after-free-right.cc +++ b/compiler-rt/lib/asan/lit_tests/TestCases/use-after-free-right.cc @@ -1,10 +1,10 @@ -// RUN: %clangxx_asan -O0 %s -o %t && %t 2>&1 | %symbolize > %t.out +// RUN: %clangxx_asan -O0 %s -o %t && not %t 2>%t.out // RUN: FileCheck %s < %t.out && FileCheck %s --check-prefix=CHECK-%os < %t.out -// RUN: %clangxx_asan -O1 %s -o %t && %t 2>&1 | %symbolize > %t.out +// RUN: %clangxx_asan -O1 %s -o %t && not %t 2>%t.out // RUN: FileCheck %s < %t.out && FileCheck %s --check-prefix=CHECK-%os < %t.out -// RUN: %clangxx_asan -O2 %s -o %t && %t 2>&1 | %symbolize > %t.out +// RUN: %clangxx_asan -O2 %s -o %t && not %t 2>%t.out // RUN: FileCheck %s < %t.out && FileCheck %s --check-prefix=CHECK-%os < %t.out -// RUN: %clangxx_asan -O3 %s -o %t && %t 2>&1 | %symbolize > %t.out +// RUN: %clangxx_asan -O3 %s -o %t && not %t 2>%t.out // RUN: FileCheck %s < %t.out && FileCheck %s --check-prefix=CHECK-%os < %t.out // Test use-after-free report in the case when access is at the right border of diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/use-after-free.cc b/compiler-rt/lib/asan/lit_tests/TestCases/use-after-free.cc index 54af66d8a4e2..5322cb628ac4 100644 --- a/compiler-rt/lib/asan/lit_tests/TestCases/use-after-free.cc +++ b/compiler-rt/lib/asan/lit_tests/TestCases/use-after-free.cc @@ -1,10 +1,10 @@ -// RUN: %clangxx_asan -O0 %s -o %t && %t 2>&1 | %symbolize > %t.out +// RUN: %clangxx_asan -O0 %s -o %t && not %t 2>%t.out // RUN: FileCheck %s < %t.out && FileCheck %s --check-prefix=CHECK-%os < %t.out -// RUN: %clangxx_asan -O1 %s -o %t && %t 2>&1 | %symbolize > %t.out +// RUN: %clangxx_asan -O1 %s -o %t && not %t 2>%t.out // RUN: FileCheck %s < %t.out && FileCheck %s --check-prefix=CHECK-%os < %t.out -// RUN: %clangxx_asan -O2 %s -o %t && %t 2>&1 | %symbolize > %t.out +// RUN: %clangxx_asan -O2 %s -o %t && not %t 2>%t.out // RUN: FileCheck %s < %t.out && FileCheck %s --check-prefix=CHECK-%os < %t.out -// RUN: %clangxx_asan -O3 %s -o %t && %t 2>&1 | %symbolize > %t.out +// RUN: %clangxx_asan -O3 %s -o %t && not %t 2>%t.out // RUN: FileCheck %s < %t.out && FileCheck %s --check-prefix=CHECK-%os < %t.out #include diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/use-after-poison.cc b/compiler-rt/lib/asan/lit_tests/TestCases/use-after-poison.cc index 03a241764d48..33c1ab5da909 100644 --- a/compiler-rt/lib/asan/lit_tests/TestCases/use-after-poison.cc +++ b/compiler-rt/lib/asan/lit_tests/TestCases/use-after-poison.cc @@ -1,5 +1,5 @@ // Check that __asan_poison_memory_region works. -// RUN: %clangxx_asan -O0 %s -o %t && %t 2>&1 | %symbolize | FileCheck %s +// RUN: %clangxx_asan -O0 %s -o %t && %t 2>&1 | FileCheck %s // // Check that we can disable it // RUN: ASAN_OPTIONS=allow_user_poisoning=0 %t diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/use-after-scope-dtor-order.cc b/compiler-rt/lib/asan/lit_tests/TestCases/use-after-scope-dtor-order.cc index 8c5bd3a93587..11179e698d16 100644 --- a/compiler-rt/lib/asan/lit_tests/TestCases/use-after-scope-dtor-order.cc +++ b/compiler-rt/lib/asan/lit_tests/TestCases/use-after-scope-dtor-order.cc @@ -1,5 +1,5 @@ // RUN: %clangxx_asan -O0 -fsanitize=use-after-scope %s -o %t && \ -// RUN: %t 2>&1 | %symbolize | FileCheck %s +// RUN: %t 2>&1 | FileCheck %s #include struct IntHolder { diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/use-after-scope-inlined.cc b/compiler-rt/lib/asan/lit_tests/TestCases/use-after-scope-inlined.cc index 37f92e59c1a0..100c26249ba7 100644 --- a/compiler-rt/lib/asan/lit_tests/TestCases/use-after-scope-inlined.cc +++ b/compiler-rt/lib/asan/lit_tests/TestCases/use-after-scope-inlined.cc @@ -2,7 +2,7 @@ // happens. "always_inline" is not enough, as Clang doesn't emit // llvm.lifetime intrinsics at -O0. // -// RUN: %clangxx_asan -O2 -fsanitize=use-after-scope %s -o %t && %t 2>&1 | %symbolize | FileCheck %s +// RUN: %clangxx_asan -O2 -fsanitize=use-after-scope %s -o %t && %t 2>&1 | FileCheck %s int *arr; diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/use-after-scope-temp.cc b/compiler-rt/lib/asan/lit_tests/TestCases/use-after-scope-temp.cc index 4b1d6f02ce1e..1bb309b23925 100644 --- a/compiler-rt/lib/asan/lit_tests/TestCases/use-after-scope-temp.cc +++ b/compiler-rt/lib/asan/lit_tests/TestCases/use-after-scope-temp.cc @@ -1,5 +1,5 @@ // RUN: %clangxx_asan -O0 -fsanitize=use-after-scope %s -o %t && \ -// RUN: %t 2>&1 | %symbolize | FileCheck %s +// RUN: %t 2>&1 | FileCheck %s // // Lifetime for temporaries is not emitted yet. // XFAIL: * diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/use-after-scope.cc b/compiler-rt/lib/asan/lit_tests/TestCases/use-after-scope.cc index 5a74fda78be7..f45c2627abf0 100644 --- a/compiler-rt/lib/asan/lit_tests/TestCases/use-after-scope.cc +++ b/compiler-rt/lib/asan/lit_tests/TestCases/use-after-scope.cc @@ -1,5 +1,5 @@ // RUN: %clangxx_asan -O0 -fsanitize=use-after-scope %s -o %t && \ -// RUN: %t 2>&1 | %symbolize | FileCheck %s +// RUN: %t 2>&1 | FileCheck %s int main() { int *p = 0; diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/wait.cc b/compiler-rt/lib/asan/lit_tests/TestCases/wait.cc index 154df56e0f38..ff87a2df73df 100644 --- a/compiler-rt/lib/asan/lit_tests/TestCases/wait.cc +++ b/compiler-rt/lib/asan/lit_tests/TestCases/wait.cc @@ -1,23 +1,23 @@ -// RUN: %clangxx_asan -DWAIT -O0 %s -o %t && %t 2>&1 | %symbolize | FileCheck %s -// RUN: %clangxx_asan -DWAIT -O3 %s -o %t && %t 2>&1 | %symbolize | FileCheck %s +// RUN: %clangxx_asan -DWAIT -O0 %s -o %t && %t 2>&1 | FileCheck %s +// RUN: %clangxx_asan -DWAIT -O3 %s -o %t && %t 2>&1 | FileCheck %s -// RUN: %clangxx_asan -DWAITPID -O0 %s -o %t && %t 2>&1 | %symbolize | FileCheck %s -// RUN: %clangxx_asan -DWAITPID -O3 %s -o %t && %t 2>&1 | %symbolize | FileCheck %s +// RUN: %clangxx_asan -DWAITPID -O0 %s -o %t && %t 2>&1 | FileCheck %s +// RUN: %clangxx_asan -DWAITPID -O3 %s -o %t && %t 2>&1 | FileCheck %s -// RUN: %clangxx_asan -DWAITID -O0 %s -o %t && %t 2>&1 | %symbolize | FileCheck %s -// RUN: %clangxx_asan -DWAITID -O3 %s -o %t && %t 2>&1 | %symbolize | FileCheck %s +// RUN: %clangxx_asan -DWAITID -O0 %s -o %t && %t 2>&1 | FileCheck %s +// RUN: %clangxx_asan -DWAITID -O3 %s -o %t && %t 2>&1 | FileCheck %s -// RUN: %clangxx_asan -DWAIT3 -O0 %s -o %t && %t 2>&1 | %symbolize | FileCheck %s -// RUN: %clangxx_asan -DWAIT3 -O3 %s -o %t && %t 2>&1 | %symbolize | FileCheck %s +// RUN: %clangxx_asan -DWAIT3 -O0 %s -o %t && %t 2>&1 | FileCheck %s +// RUN: %clangxx_asan -DWAIT3 -O3 %s -o %t && %t 2>&1 | FileCheck %s -// RUN: %clangxx_asan -DWAIT4 -O0 %s -o %t && %t 2>&1 | %symbolize | FileCheck %s -// RUN: %clangxx_asan -DWAIT4 -O3 %s -o %t && %t 2>&1 | %symbolize | FileCheck %s +// RUN: %clangxx_asan -DWAIT4 -O0 %s -o %t && %t 2>&1 | FileCheck %s +// RUN: %clangxx_asan -DWAIT4 -O3 %s -o %t && %t 2>&1 | FileCheck %s -// RUN: %clangxx_asan -DWAIT3_RUSAGE -O0 %s -o %t && %t 2>&1 | %symbolize | FileCheck %s -// RUN: %clangxx_asan -DWAIT3_RUSAGE -O3 %s -o %t && %t 2>&1 | %symbolize | FileCheck %s +// RUN: %clangxx_asan -DWAIT3_RUSAGE -O0 %s -o %t && %t 2>&1 | FileCheck %s +// RUN: %clangxx_asan -DWAIT3_RUSAGE -O3 %s -o %t && %t 2>&1 | FileCheck %s -// RUN: %clangxx_asan -DWAIT4_RUSAGE -O0 %s -o %t && %t 2>&1 | %symbolize | FileCheck %s -// RUN: %clangxx_asan -DWAIT4_RUSAGE -O3 %s -o %t && %t 2>&1 | %symbolize | FileCheck %s +// RUN: %clangxx_asan -DWAIT4_RUSAGE -O0 %s -o %t && %t 2>&1 | FileCheck %s +// RUN: %clangxx_asan -DWAIT4_RUSAGE -O3 %s -o %t && %t 2>&1 | FileCheck %s #include diff --git a/compiler-rt/lib/asan/lit_tests/lit.cfg b/compiler-rt/lib/asan/lit_tests/lit.cfg index 1e6725e3dfff..c215651debca 100644 --- a/compiler-rt/lib/asan/lit_tests/lit.cfg +++ b/compiler-rt/lib/asan/lit_tests/lit.cfg @@ -72,10 +72,6 @@ if llvm_tools_dir: config.environment['ASAN_SYMBOLIZER_PATH'] = os.path.join( llvm_tools_dir, "llvm-symbolizer") -# Define %symbolize substitution that filters output through -# c++filt (for demangling, somewhy it doesn't work for symbolizer on Mac). -config.substitutions.append( ("%symbolize ", " c++filt ")) - # Define CHECK-%os to check for OS-dependent output. config.substitutions.append( ('CHECK-%os', ("CHECK-" + config.host_os)))