From 8bdfe1fae6c7ef58c4f1a23ecf247e85c9f64a3f Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Mon, 10 Dec 2012 13:19:10 +0100 Subject: [PATCH] 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 --- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/g++.dg/asan/asan_test.cc | 4 ++-- 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 57caf46ab3a..60d95aeabe0 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2012-12-10 Jakub Jelinek + + * g++.dg/asan/asan_test.cc: Sync from upstream. + * g++.dg/asan/asan_test_utils.h: Likewise. + 2012-12-10 Kyrylo Tkachov * 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 763b2d7700d..32c2ad2ab2a 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 a8f9ad8eaf0..fab20c5cd6c 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 -- 2.30.2