From patchwork Mon Dec 10 12:22:21 2012
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [asan,committed] Sync asan_test.cc from upstream
Date: Mon, 10 Dec 2012 02:22:21 -0000
From: Jakub Jelinek <jakub@redhat.com>
X-Patchwork-Id: 204861
Message-Id: <20121210122221.GH2315@tucnak.redhat.com>
To: gcc-patches@gcc.gnu.org

Hi!

I've committed as obvious this change to sync the test from upstream
to avoid one unnecessary FAIL.

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.


	Jakub


--- gcc/testsuite/g++.dg/asan/asan_test.cc	2012-12-03 12:44:13.828811869 +0100
+++ gcc/testsuite/g++.dg/asan/asan_test.cc	2012-12-05 19:06:52.288213731 +0100
@@ -1604,7 +1606,7 @@ NOINLINE static int LargeFunction(bool d
 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 +1750,7 @@ TEST(AddressSanitizer, FileNameInGlobalR
   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() {
--- gcc/testsuite/g++.dg/asan/asan_test_utils.h	2012-12-03 12:44:48.868608115 +0100
+++ gcc/testsuite/g++.dg/asan/asan_test_utils.h	2012-12-05 19:06:52.308213631 +0100
@@ -53,7 +55,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