Regtest: clean aligned alloc tests on FreeBSD x86

Add a filter for size_t (unsigned long on 64bit platforms and unsigned
int on 32bit ones).

Add another expected for x86.

diff --git a/memcheck/tests/Makefile.am b/memcheck/tests/Makefile.am
index 0509d45869c51cd87ab50c2a24529160adb63162..ec16313ddfa8b20c61fd7960c0cbf7e5a82c25e5 100644 (file)
--- a/memcheck/tests/Makefile.am
+++ b/memcheck/tests/Makefile.am
@@ -80,7 +80,8 @@ dist_noinst_SCRIPTS = \
        filter_varinfo3 \
        filter_memcheck \
        filter_overlaperror \
-       filter_malloc_free
+       filter_malloc_free \
+       filter_size_t
 
 noinst_HEADERS = leak.h
 
@@ -228,6 +229,7 @@ EXTRA_DIST = \
                memalign_args.stderr.exp-glibc \
                memalign_args.stderr.exp-ppc64 \
                memalign_args.stderr.exp-arm \
+               memalign_args.stderr.exp-x86 \
        memcmptest.stderr.exp memcmptest.stderr.exp2 \
        memcmptest.stdout.exp memcmptest.vgtest \
        memmem.stderr.exp memmem.vgtest \

diff --git a/memcheck/tests/filter_size_t b/memcheck/tests/filter_size_t
new file mode 100755 (executable)
index 0000000..08386b2
--- /dev/null
+++ b/memcheck/tests/filter_size_t
@@ -0,0 +1,5 @@
+#! /bin/sh
+
+
+./filter_stderr "$@" |
+sed "s/unsigned int/unsigned long/"

diff --git a/memcheck/tests/memalign_args.stderr.exp-x86 b/memcheck/tests/memalign_args.stderr.exp-x86
new file mode 100644 (file)
index 0000000..1bb553e
--- /dev/null
+++ b/memcheck/tests/memalign_args.stderr.exp-x86
@@ -0,0 +1,28 @@
+Conditional jump or move depends on uninitialised value(s)
+   at 0x........: memalign (vg_replace_malloc.c:...)
+   by 0x........: main (memalign_args.c:19)
+
+Conditional jump or move depends on uninitialised value(s)
+   at 0x........: memalign (vg_replace_malloc.c:...)
+   by 0x........: main (memalign_args.c:19)
+
+Conditional jump or move depends on uninitialised value(s)
+   at 0x........: posix_memalign (vg_replace_malloc.c:...)
+   by 0x........: main (memalign_args.c:23)
+
+Conditional jump or move depends on uninitialised value(s)
+   at 0x........: posix_memalign (vg_replace_malloc.c:...)
+   by 0x........: main (memalign_args.c:23)
+
+Conditional jump or move depends on uninitialised value(s)
+   at 0x........: aligned_alloc (vg_replace_malloc.c:...)
+   by 0x........: main (memalign_args.c:26)
+
+Conditional jump or move depends on uninitialised value(s)
+   at 0x........: aligned_alloc (vg_replace_malloc.c:...)
+   by 0x........: main (memalign_args.c:26)
+
+Conditional jump or move depends on uninitialised value(s)
+   at 0x........: valloc (vg_replace_malloc.c:...)
+   by 0x........: main (memalign_args.c:29)
+

diff --git a/memcheck/tests/sized_aligned_new_delete_misaligned.vgtest b/memcheck/tests/sized_aligned_new_delete_misaligned.vgtest
index fc7b6f471207203dad9959c774086d9c73bdac27..13f61924b7a6f8f487a6e1f95e829757316e84ce 100644 (file)
--- a/memcheck/tests/sized_aligned_new_delete_misaligned.vgtest
+++ b/memcheck/tests/sized_aligned_new_delete_misaligned.vgtest
@@ -1,3 +1,4 @@
 prog: sized_aligned_new_delete_misaligned
 prereq: test -e ./sized_aligned_new_delete_misaligned
 vgopts: -q
+stderr_filter: filter_size_t