[ASan] Remove %symbolize from lit tests: we now use external symbolizer instead of...

llvm-svn: 185163

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 2c1b707026bc92d71b6803838d9750ca37b3750a..4c5744a78bd4f91ea3a2cb68a10a23d86ea96f43 100644 (file)
--- 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 <stdio.h>
 #include <string.h>

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 c33f5cc776f0c157750c010447d35b17aff36592..0f1ea3e324cb7cc6c25cfe5957be4c084de62316 100644 (file)
--- 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 32c2ca7ea051142aa8c0da1c6bcffeedd6976343..c2ba82e483f0f6dd788e4d6b60647f804dbc4925 100644 (file)
--- 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 f34b33a38fb3145bbbf5a0f8491b94ed0e7448d2..984ac8fef4ccb4c30afd82c05b3ac3df9ed8db36 100644 (file)
--- 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 19e73f67c49ba9713dda36f7356e416207f1a190..f4f2ca0713ba38bd3728103c14fc34a621c2d767 100644 (file)
--- 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 8356eac220b6d45b6a08b9cc4b5d73fdb8724cae..c6195f638952535b6fe0076fdf0c3be450dbf717 100644 (file)
--- 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 <assert.h>
 #include <stdio.h>

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 e7acdba07ec871c0320f25639abb5a2ae6b07a86..7352914bac28113b7d9ef652f1c5ac182b12e558 100644 (file)
--- 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 <assert.h>
 #include <errno.h>

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 7579a44644f4ec43df56104a313d58d3cafb4c62..566409be6a1903ce1956b37130151672a037e134 100644 (file)
--- 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 5406b8a155a60e71c6b7ba0e333d1a1b30b88e64..5ef087b1db913e548c61cfa984ed32596b35361a 100644 (file)
--- 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 c02c923b82d44ff1354bd7978bcc201d3b2ad24d..a726b449496028cdf608996d9179e031561bea2d 100644 (file)
--- 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 536cddb15d9a6f7eba81e3240cbd1f461a36d5d7..6ab515e111db0041e665c823fed9ce9a164c0930 100644 (file)
--- 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 <stdlib.h>
 #include <stdio.h>
 

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 87d8886c054797c16415a1770c9c493f1f0005f4..8a1b3e8fe0e9ed2e1a643692e99690b5b97aea15 100644 (file)
--- 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 ecc6fffc9062d6bcf99dd84d9f263104255c6e59..10954f28eee7ef947cc5137dad22beab0c196d93 100644 (file)
--- 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 <pthread.h>
 

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 6e6f4bbdc984a6e02ba196ebe4aa133dfe8ff8d5..a3d307d5b6d949764ae3a0542eca7711a7d02885 100644 (file)
--- 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 <stdlib.h>
 #include <string.h>

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 75001ae4192b134df2a76dea9461248e19db661d..bad37da32b992b2bdc6e2ec360ee58889fecc8d9 100644 (file)
--- 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 e5723355156a1f4cdd83482d44e2aa0493a0d909..5b75efaf65b1e55e315992cfda23c172518f2d54 100644 (file)
--- 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 <string.h>
 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 664b2646d7794cb77c488171d78e5aac6bc98472..05aad02c1782a8ce8ca857862b1c1f2c4a11637e 100644 (file)
--- 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 <stdlib.h>

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 91fe7dbd4b6434b2e9f2fbcd0a434f39cbec6a61..3a05cc2889ea004e0c23d74a980c36d22c71ae79 100644 (file)
--- 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 c17441318880535d862364231f678eeff5252917..8e1c086530f0a6102227669e5dbe8081b567b1e5 100644 (file)
--- 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 <stdlib.h>
 #include <string.h>

diff --git a/compiler-rt/lib/asan/lit_tests/TestCases/ioctl.cc b/compiler-rt/lib/asan/lit_tests/TestCases/ioctl.cc
index 0939d6cb9bb052ccbdb85bfa2d75b72298e759dc..46f344faf4ace625f57331cb74bf1bbfb1b96c55 100644 (file)
--- 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 d550a969e8b4257dfa494ddbe4781a143d3ea470..201f5d5f9c48d7490431e5450e5ae7c58d979318 100644 (file)
--- 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 <stdlib.h>

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 881410e261a424331ed065a3f15eeb8b66e508fa..a29282b01135423cd68d7c3e7f5a9895d366142b 100644 (file)
--- 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 <stdio.h>
 #include <string.h>

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 78c151f044349b2f07c6dd36537232d3aa547b8d..2d7d4f42fa7a9c018577a315f2373c079e00abf6 100644 (file)
--- 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 <string.h>
 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 a5374f5c28cf76e653fefc4a385a1c1946a915dd..4d501c611e66dcf2bc5a0a8cdf3c0dea76cb8a2a 100644 (file)
--- 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 43c14537e4b3adbccc3041f2a6fdde041f4f1ae0..0beece39a7f2ac5127c78fdbadbfa569d33a8c4d 100644 (file)
--- 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 <stdlib.h>
 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 5120b77e7686204b868b63afc4e3ac1e651357a6..920ebc8fa86a826f4ae100c80737d786f6abbc47 100644 (file)
--- 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 ac4f034a8fe2a77387c97f36ca94be8725806f68..3eb9931ed1296a30f805181a77a1f3f45bd48e64 100644 (file)
--- 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 <stdlib.h>
 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 205143d8249e585336a2461f513cb9b388a41e2d..c8fd0a8188eb8f8bfeb9a99777850086d01b3298 100644 (file)
--- 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 <dlfcn.h>
 #include <stdio.h>

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 a4afe5d28c9ddbe814a60480bbbcb1038d6f9cce..68f38728f6b62fe4e5cfdd23dcdb852ba46d77d1 100644 (file)
--- 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 <string.h>
 

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 a4acd592af75bd03f91e815acc245fd63d8adae7..dc2615c2c9ca82e01af55905cd93c55059510a16 100644 (file)
--- 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 371948253902dda337f411a8bba59c019108a28a..f91b391a7f869d65de57e8350041b666d156dd26 100644 (file)
--- 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 <string.h>
 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 11bdfdf7c868e679257a2d9e1d0a23e2427f6dea..8064ffd8c959406912495e46e43a1af717cf518b 100644 (file)
--- 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 <stdio.h>
 

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 f8366ddbbaea33516aed29ce0a91fead6d2158fb..bdaef4f12082a7e0c47d5e089aeeec5c5fa65816 100644 (file)
--- 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 <string.h>
 

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 91dbec488b66a0ccfc5f4813ccca19fd79122f8b..54eabe13234ce8bd308deff0aacf32e9597cb3c4 100644 (file)
--- 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 <string.h>

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 a0de68b03e38fefeb05651cef055411e65c4890a..e270af9d2070698eca4523198bd3af64b11349b6 100644 (file)
--- 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 cf58e9017162f1fa3100917e8c79ad2bbb580c2a..c46d42e0796bd2803c80c6bef6fe6d3771990e02 100644 (file)
--- 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 <sanitizer/asan_interface.h>
 

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 58c5e080b052ee7bdc6c95c5af4826a0268c9de0..37132a6229806b9d5a85a80b9ad5e223e2a45fe6 100644 (file)
--- 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 54af66d8a4e2ae9f9039b67664b120f4f2994769..5322cb628ac46010b237c3a6ce16bdf99697f14d 100644 (file)
--- 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 <stdlib.h>

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 03a241764d487331554c5f8dadac71ffbb1b2a97..33c1ab5da909938b29ad310e1ffcb6f0acf42644 100644 (file)
--- 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 8c5bd3a9358737d5237a856c86b4202d5ebf403e..11179e698d1667938eab476538440c900a94f7bd 100644 (file)
--- 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 <stdio.h>
 
 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 37f92e59c1a0bdc5a43dbb334a423a8915073c98..100c26249ba7cfd39c68a5b8c0f63b29df918b10 100644 (file)
--- 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 4b1d6f02ce1ea38cca8cba348ca2aead4b3bffb8..1bb309b23925d96beeb28d66094fd32e8312685a 100644 (file)
--- 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 5a74fda78be74a1d6b04274592c83a178998d750..f45c2627abf082c049cc6f5db4532ecca1a0905d 100644 (file)
--- 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 154df56e0f389469772f1f6f6f43b86625731ffc..ff87a2df73df02a2245a8b5296bdc164877ad8b8 100644 (file)
--- 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 <assert.h>

diff --git a/compiler-rt/lib/asan/lit_tests/lit.cfg b/compiler-rt/lib/asan/lit_tests/lit.cfg
index 1e6725e3dfffc3fd23d22d57ec8be90f860ba26f..c215651debca6220001de77c9a84e9053b665c7e 100644 (file)
--- 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)))