diff options
| author | Kostya Serebryany <kcc@google.com> | 2014-05-22 07:09:21 +0000 |
|---|---|---|
| committer | Kostya Serebryany <kcc@gcc.gnu.org> | 2014-05-22 07:09:21 +0000 |
| commit | dee5ea7a0bfe95367820a443ef4a7c813e598b55 (patch) | |
| tree | f90afdf42b3ae78508a5c6422f458a5bb0216aa2 /gcc | |
| parent | b95591361e32a755231d99c348f8a43e2aed0187 (diff) | |
| download | gcc-dee5ea7a0bfe95367820a443ef4a7c813e598b55.zip gcc-dee5ea7a0bfe95367820a443ef4a7c813e598b55.tar.gz gcc-dee5ea7a0bfe95367820a443ef4a7c813e598b55.tar.bz2 | |
libsanitizer merge from upstream r209283
From-SVN: r210743
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/testsuite/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/testsuite/c-c++-common/tsan/mutexset1.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/asan/symbolize-callback-1.C | 21 |
3 files changed, 7 insertions, 22 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 876967a..edbb9c6 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2014-05-22 Kostya Serebryany <kcc@google.com> + + * c-c++-common/tsan/mutexset1.c: Update the test to match + upstream r209283. + * g++.dg/asan/symbolize-callback-1.C: Delete the deprecated test. + 2014-05-21 Marek Polacek <polacek@redhat.com> PR sanitizer/61272 diff --git a/gcc/testsuite/c-c++-common/tsan/mutexset1.c b/gcc/testsuite/c-c++-common/tsan/mutexset1.c index 7c32a85..d27f7c8 100644 --- a/gcc/testsuite/c-c++-common/tsan/mutexset1.c +++ b/gcc/testsuite/c-c++-common/tsan/mutexset1.c @@ -35,6 +35,6 @@ int main() { /* { dg-output "WARNING: ThreadSanitizer: data race.*(\n|\r\n|\r)" } */ /* { dg-output " Read of size 4 at 0x\[0-9a-f\]+ by thread T1 \\(mutexes: write M\[0-9\]\\):.*" } */ /* { dg-output " Previous write of size 4 at 0x\[0-9a-f\]+ by thread T2:.*" } */ -/* { dg-output " Mutex M\[0-9\] created at:.*" } */ +/* { dg-output " Mutex M\[0-9\] \\(0x.*\\) created at:.*" } */ /* { dg-output " #0 pthread_mutex_init.*" } */ /* { dg-output " #1 main (.*mutexset1.c|\\?{2}):\[0-9]+.*" } */ diff --git a/gcc/testsuite/g++.dg/asan/symbolize-callback-1.C b/gcc/testsuite/g++.dg/asan/symbolize-callback-1.C deleted file mode 100644 index 9978958..0000000 --- a/gcc/testsuite/g++.dg/asan/symbolize-callback-1.C +++ /dev/null @@ -1,21 +0,0 @@ -// { dg-do run } -// { dg-skip-if "" { *-*-* } { "*" } { "-O2" } } -// { dg-options "-fno-builtin-malloc -fno-builtin-free" } -// { dg-shouldfail "asan" } - -#include <stdio.h> -#include <stdlib.h> - -extern "C" -bool __asan_symbolize(const void *, char *out_buffer, int out_size) { - snprintf(out_buffer, out_size, "MySymbolizer"); - return true; -} - -int main() { - char *x = (char*)malloc(10); - free(x); - return x[5]; -} - -// { dg-output "MySymbolizer" } |