aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorKostya Serebryany <kcc@google.com>2012-11-23 14:46:25 +0000
committerKostya Serebryany <kcc@gcc.gnu.org>2012-11-23 14:46:25 +0000
commite297eb600dd52acd73fb64ca45905b68f4e9b99b (patch)
treea354102cd1c27b09eefe0b04f517d4ecac5bc566 /gcc
parent8ddf5c28ea6be09213739c94f9765019be476bb0 (diff)
downloadgcc-e297eb600dd52acd73fb64ca45905b68f4e9b99b.zip
gcc-e297eb600dd52acd73fb64ca45905b68f4e9b99b.tar.gz
gcc-e297eb600dd52acd73fb64ca45905b68f4e9b99b.tar.bz2
[libsanitizer] merge from upstream r168514
From-SVN: r193756
Diffstat (limited to 'gcc')
-rw-r--r--gcc/testsuite/ChangeLog4
-rw-r--r--gcc/testsuite/c-c++-common/asan/memcmp-1.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 8021aef..74a120d 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2012-11-23 Kostya Serebryany <kcc@google.com>
+
+ * c-c++-common/asan/memcmp-1.c: Update to match the new libsanitizer.
+
2012-11-23 Eric Botcazou <ebotcazou@adacore.com>
* gnat.dg/discr40.ad[sb]: New test.
diff --git a/gcc/testsuite/c-c++-common/asan/memcmp-1.c b/gcc/testsuite/c-c++-common/asan/memcmp-1.c
index 8f45a3f..a23ff23 100644
--- a/gcc/testsuite/c-c++-common/asan/memcmp-1.c
+++ b/gcc/testsuite/c-c++-common/asan/memcmp-1.c
@@ -13,6 +13,6 @@ main (int argc, char **argv)
return res;
}
-/* { dg-output "ERROR: AddressSanitizer stack-buffer-overflow.*(\n|\r\n|\r)" } */
+/* { dg-output "ERROR: AddressSanitizer: stack-buffer-overflow.*(\n|\r\n|\r)" } */
/* { dg-output " #0 0x\[0-9a-f\]+ (in _*(interceptor_|)memcmp |\[(\])\[^\n\r]*(\n|\r\n|\r)" } */
/* { dg-output " #1 0x\[0-9a-f\]+ (in _*main|\[(\])\[^\n\r]*(\n|\r\n|\r)" } */