diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2012-12-10 13:19:10 +0100 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2012-12-10 13:19:10 +0100 |
| commit | 8bdfe1fae6c7ef58c4f1a23ecf247e85c9f64a3f (patch) | |
| tree | ddecacd9edc83237f302ed916373437ee9dbeed7 | |
| parent | 94fce891a5960da058f25840e23318f6991dee4d (diff) | |
| download | gcc-8bdfe1fae6c7ef58c4f1a23ecf247e85c9f64a3f.zip gcc-8bdfe1fae6c7ef58c4f1a23ecf247e85c9f64a3f.tar.gz gcc-8bdfe1fae6c7ef58c4f1a23ecf247e85c9f64a3f.tar.bz2 | |
asan_test.cc: Sync from upstream.
* g++.dg/asan/asan_test.cc: Sync from upstream.
* g++.dg/asan/asan_test_utils.h: Likewise.
From-SVN: r194356
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/asan/asan_test.cc | 4 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/asan/asan_test_utils.h | 2 |
3 files changed, 8 insertions, 3 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 57caf46..60d95ae 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2012-12-10 Jakub Jelinek <jakub@redhat.com> + + * g++.dg/asan/asan_test.cc: Sync from upstream. + * g++.dg/asan/asan_test_utils.h: Likewise. + 2012-12-10 Kyrylo Tkachov <kyrylo.tkachov@arm.com> * gcc.target/arm/neon/vrndaf32.c: New test. diff --git a/gcc/testsuite/g++.dg/asan/asan_test.cc b/gcc/testsuite/g++.dg/asan/asan_test.cc index 763b2d7..32c2ad2 100644 --- a/gcc/testsuite/g++.dg/asan/asan_test.cc +++ b/gcc/testsuite/g++.dg/asan/asan_test.cc @@ -1604,7 +1604,7 @@ NOINLINE static int LargeFunction(bool do_bad_access) { TEST(AddressSanitizer, DISABLED_LargeFunctionSymbolizeTest) { int failing_line = LargeFunction(false); char expected_warning[128]; - sprintf(expected_warning, "LargeFunction.*asan_test.cc:%d", failing_line); + sprintf(expected_warning, "LargeFunction.*asan_test.*:%d", failing_line); EXPECT_DEATH(LargeFunction(true), expected_warning); } @@ -1748,7 +1748,7 @@ TEST(AddressSanitizer, FileNameInGlobalReportTest) { static char zoo[10]; const char *p = Ident(zoo); // The file name should be present in the report. - EXPECT_DEATH(Ident(p[15]), "zoo.*asan_test.cc"); + EXPECT_DEATH(Ident(p[15]), "zoo.*asan_test."); } int *ReturnsPointerToALocalObject() { diff --git a/gcc/testsuite/g++.dg/asan/asan_test_utils.h b/gcc/testsuite/g++.dg/asan/asan_test_utils.h index a8f9ad8..fab20c5 100644 --- a/gcc/testsuite/g++.dg/asan/asan_test_utils.h +++ b/gcc/testsuite/g++.dg/asan/asan_test_utils.h @@ -53,7 +53,7 @@ typedef __int64 int64_t; // Make the compiler thinks that something is going on there. inline void break_optimization(void *arg) { - __asm__ __volatile__ ("" : : "r" (arg) : "memory"); + __asm__ __volatile__("" : : "r" (arg) : "memory"); } // This function returns its parameter but in such a way that compiler |