[PATCH] Fix sanitizer/68042

[PATCH] Fix sanitizer/68042

[Maxim Ostapenko]

[-- Attachment #1: Type: text/plain, Size: 308 bytes --]

Hi,

currently we have memcmp-1.c and sanity-check-pure-c-1.c (ASan 
testsuite) output pattern test failures on x86_64-apple-darwin14. This 
patch adjusts their expecting patterns to match real ones.

Tested by me on x86_64-unknown-linux-gnu and by Dominique on 
x86_64-apple-darwin14.

Ok to apply?

-Maxim

[-- Attachment #2: darwin-tests-1.diff --]
[-- Type: text/x-patch, Size: 1879 bytes --]

gcc/testsuite/ChangeLog:

2015-10-22  Maxim Ostapenko  <m.ostapenko@partner.samsung.com>

	PR sanitizer/68042
	* c-c++-common/asan/memcmp-1.c: Adjust test to pass on Darwin.
	* c-c++-common/asan/sanity-check-pure-c-1.c: Likewise.

Index: gcc/testsuite/c-c++-common/asan/memcmp-1.c
===================================================================
--- gcc/testsuite/c-c++-common/asan/memcmp-1.c	(revision 229169)
+++ gcc/testsuite/c-c++-common/asan/memcmp-1.c	(working copy)
@@ -16,5 +16,5 @@
 }
 
 /* { dg-output "ERROR: AddressSanitizer: stack-buffer-overflow.*(\n|\r\n|\r)" } */
-/* { dg-output "    #0 0x\[0-9a-f\]+ +(in _*(interceptor_|wrap_|)memcmp |\[(\])\[^\n\r]*(\n|\r\n|\r)" } */
+/* { dg-output "    #0 0x\[0-9a-f\]+ +(in _*(interceptor_|wrap_|)memcmp|\[(\])\[^\n\r]*(\n|\r\n|\r)" } */
 /* { dg-output "    #1 0x\[0-9a-f\]+ +(in _*main|\[(\])\[^\n\r]*(\n|\r\n|\r)" } */
Index: gcc/testsuite/c-c++-common/asan/sanity-check-pure-c-1.c
===================================================================
--- gcc/testsuite/c-c++-common/asan/sanity-check-pure-c-1.c	(revision 229169)
+++ gcc/testsuite/c-c++-common/asan/sanity-check-pure-c-1.c	(working copy)
@@ -10,7 +10,7 @@
 }
 
 /* { dg-output "heap-use-after-free.*(\n|\r\n|\r)" } */
-/* { dg-output "    #0 \[^\n\r]*(in _*(interceptor_|)free|\[(\])\[^\n\r]*(\n|\r\n|\r)" } */
+/* { dg-output "    #0 \[^\n\r]*(in _*(interceptor_|wrap_)free|\[(\])\[^\n\r]*(\n|\r\n|\r)" } */
 /* { dg-output "    #1 \[^\n\r]*(in _*main (\[^\n\r]*sanity-check-pure-c-1.c:8|\[^\n\r]*:0)|\[(\]).*(\n|\r\n|\r)" } */
-/* { dg-output "    #0 \[^\n\r]*(in _*(interceptor_|)malloc|\[(\])\[^\n\r]*(\n|\r\n|\r)" } */
+/* { dg-output "    #0 \[^\n\r]*(in _*(interceptor_|wrap_)malloc|\[(\])\[^\n\r]*(\n|\r\n|\r)" } */
 /* { dg-output "    #1 \[^\n\r]*(in _*main (\[^\n\r]*sanity-check-pure-c-1.c:7|\[^\n\r]*:0)|\[(\])\[^\n\r]*(\n|\r\n|\r)" } */

Re: [PATCH] Fix sanitizer/68042

[Jeff Law]

On 10/22/2015 10:45 AM, Maxim Ostapenko wrote:
> Hi,
>
> currently we have memcmp-1.c and sanity-check-pure-c-1.c (ASan
> testsuite) output pattern test failures on x86_64-apple-darwin14. This
> patch adjusts their expecting patterns to match real ones.
>
> Tested by me on x86_64-unknown-linux-gnu and by Dominique on
> x86_64-apple-darwin14.
>
> Ok to apply?
OK.
jeff