Darwin regtest: filter malloc_zone_memalign

diff --git a/memcheck/tests/Makefile.am b/memcheck/tests/Makefile.am
index f85b69ba0b5aefbcb359afc094b91ac8bace21d8..fd3f89cd286ad9bd3e6e12210411c25232f534af 100644 (file)
--- a/memcheck/tests/Makefile.am
+++ b/memcheck/tests/Makefile.am
@@ -95,7 +95,8 @@ dist_noinst_SCRIPTS = \
        filter_stanza \
        filter_stanza.awk \
        filter_used_supp \
-       filter_stanza_and_size_t
+       filter_stanza_and_size_t \
+       filter_malloc_zone
 
 noinst_SCRIPTS = \
        filter_dw4 \

diff --git a/memcheck/tests/filter_malloc_zone b/memcheck/tests/filter_malloc_zone
new file mode 100755 (executable)
index 0000000..793dfe5
--- /dev/null
+++ b/memcheck/tests/filter_malloc_zone
@@ -0,0 +1,4 @@
+#! /bin/sh
+
+./filter_stderr "$@" |
+sed 's/malloc_zone_memalign/memalign/'

diff --git a/memcheck/tests/posix_memalign.stderr.exp-darwin b/memcheck/tests/posix_memalign.stderr.exp-darwin
index 26472d08bbf61d5439398d66a53046b716aea14c..f044fa1bf0a755da4d234c393a6154658fff442f 100644 (file)
--- a/memcheck/tests/posix_memalign.stderr.exp-darwin
+++ b/memcheck/tests/posix_memalign.stderr.exp-darwin
@@ -1,4 +1,4 @@
-posix_memalign() invalid size value: 0
+Unsafe allocation with size of zero is implementation-defined
    at 0x........: malloc_zone_memalign (vg_replace_malloc.c:...)
    by 0x........: posix_memalign (in /...libc...)
    by 0x........: main (posix_memalign.c:32)

diff --git a/memcheck/tests/test-plo-no.vgtest b/memcheck/tests/test-plo-no.vgtest
index cbe322cbc7235e862c304e14ddf4f73512d06c99..b09ebad9521c2d97b62e864b0b35b12ed777dc8c 100644 (file)
--- a/memcheck/tests/test-plo-no.vgtest
+++ b/memcheck/tests/test-plo-no.vgtest
@@ -1,2 +1,3 @@
 prog: test-plo
 vgopts: -q --partial-loads-ok=no --keep-stacktraces=alloc-then-free
+stderr_filter: filter_malloc_zone