Filter out differences in structure size
Patch from Ivo Raisr on BZ#331254
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@13814 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/NEWS b/NEWS
index d10bebf..c051793 100644
--- a/NEWS
+++ b/NEWS
@@ -52,6 +52,7 @@
330469 Add clock_adjtime syscall support
330939 Support for AMD's syscall instruction on x86
330941 Typo in PRE(poll) syscall wrapper
+331254 Fix expected output for memcheck/tests/dw4
331255 Fix race condition in test none/tests/coolo_sigaction
331257 Fix type of jump buffer in test none/tests/faultstatus
n-i-bz Fix KVM_CREATE_IRQCHIP ioctl handling
diff --git a/memcheck/tests/dw4.stderr.exp b/memcheck/tests/dw4.stderr.exp
index 192ad0e..b4420a9 100644
--- a/memcheck/tests/dw4.stderr.exp
+++ b/memcheck/tests/dw4.stderr.exp
@@ -1,7 +1,7 @@
Uninitialised byte(s) found during client check request
at 0x........: croak (dw4.c:27)
by 0x........: main (dw4.c:49)
- Address 0x........ is 4 bytes inside a block of size 32 alloc'd
+ Address 0x........ is 4 bytes inside a block of size ... alloc'd
at 0x........: malloc (vg_replace_malloc.c:...)
by 0x........: main (dw4.c:47)
diff --git a/memcheck/tests/dw4.vgtest b/memcheck/tests/dw4.vgtest
index e904dbd..443597a 100644
--- a/memcheck/tests/dw4.vgtest
+++ b/memcheck/tests/dw4.vgtest
@@ -1,3 +1,4 @@
prereq: test -e dw4
prog: dw4
vgopts: --read-var-info=yes -q
+stderr_filter: filter_dw4
diff --git a/memcheck/tests/filter_dw4 b/memcheck/tests/filter_dw4
new file mode 100755
index 0000000..288cb18
--- /dev/null
+++ b/memcheck/tests/filter_dw4
@@ -0,0 +1,8 @@
+#! /bin/sh
+
+# Size of structure s1 differs between 32-bit and 64-bit programs.
+sed "s/inside a block of size [0-9]* alloc'd/inside a block of size ... alloc'd/" |
+
+./filter_stderr "$@"
+
+exit 0
