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

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 57caf46ab3a69c797d02576fec8e3401ef2e84b6..60d95aeabe0576a03ca17fefe1262f759816c0e0 100644 (file)
--- 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 763b2d7700ded07c840112d1a16871e33d6970d7..32c2ad2ab2ad6ceff1398f5a4b409e14602a9762 100644 (file)
--- 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 a8f9ad8eaf063b6db70e12557a8700fa01be1055..fab20c5cd6c4974312023504c886b566166fcb24 100644 (file)
--- 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