|
From: <sv...@va...> - 2014-02-17 22:59:52
|
Author: tom
Date: Mon Feb 17 22:59:42 2014
New Revision: 13814
Log:
Filter out differences in structure size
Patch from Ivo Raisr on BZ#331254
Added:
trunk/memcheck/tests/filter_dw4 (with props)
Modified:
trunk/NEWS
trunk/memcheck/tests/dw4.stderr.exp
trunk/memcheck/tests/dw4.vgtest
Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS (original)
+++ trunk/NEWS Mon Feb 17 22:59:42 2014
@@ -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
Modified: trunk/memcheck/tests/dw4.stderr.exp
==============================================================================
--- trunk/memcheck/tests/dw4.stderr.exp (original)
+++ trunk/memcheck/tests/dw4.stderr.exp Mon Feb 17 22:59:42 2014
@@ -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)
Modified: trunk/memcheck/tests/dw4.vgtest
==============================================================================
--- trunk/memcheck/tests/dw4.vgtest (original)
+++ trunk/memcheck/tests/dw4.vgtest Mon Feb 17 22:59:42 2014
@@ -1,3 +1,4 @@
prereq: test -e dw4
prog: dw4
vgopts: --read-var-info=yes -q
+stderr_filter: filter_dw4
Added: trunk/memcheck/tests/filter_dw4
==============================================================================
--- trunk/memcheck/tests/filter_dw4 (added)
+++ trunk/memcheck/tests/filter_dw4 Mon Feb 17 22:59:42 2014
@@ -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
|