drd/tests/annotate_smart_pointer2: Filter out offset

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@11898

diff --git a/drd/tests/Makefile.am b/drd/tests/Makefile.am
index 836aeae304457db8d853e87e4585507f8ca96ad2..191316bb8afd3dacd343658839b3d491a7d732a0 100644 (file)
--- a/drd/tests/Makefile.am
+++ b/drd/tests/Makefile.am
@@ -6,6 +6,7 @@ dist_noinst_SCRIPTS =               \
        filter_error_summary        \
        filter_stderr               \
        filter_stderr_and_thread_no \
+       filter_stderr_and_thread_no_and_offset \
        run_openmp_test             \
        supported_libpthread        \
        supported_sem_init

diff --git a/drd/tests/annotate_smart_pointer2.stderr.exp b/drd/tests/annotate_smart_pointer2.stderr.exp
index c06d9381699702b9460aaf345a11f16064bca161..154b5acd610219fa29ff403b1be92dbfa69dedb7 100644 (file)
--- a/drd/tests/annotate_smart_pointer2.stderr.exp
+++ b/drd/tests/annotate_smart_pointer2.stderr.exp
@@ -1,7 +1,7 @@
 
 Conflicting store by thread x at 0x........ size 4
    at 0x........: main (annotate_smart_pointer.cpp:?)
-Address 0x........ is at offset 24 from 0x......... Allocation context:
+Address 0x........ is at offset ... from 0x......... Allocation context:
    at 0x........: ...operator new... (vg_replace_malloc.c:...)
    by 0x........: main (annotate_smart_pointer.cpp:?)
 

diff --git a/drd/tests/annotate_smart_pointer2.vgtest b/drd/tests/annotate_smart_pointer2.vgtest
index 6ba234ecb441e1898b33420ccc20b408083b3266..7556ce47ec4d4402e3c1abd238ef571abdd82b61 100644 (file)
--- a/drd/tests/annotate_smart_pointer2.vgtest
+++ b/drd/tests/annotate_smart_pointer2.vgtest
@@ -2,4 +2,4 @@ prereq: test -e annotate_smart_pointer && ./supported_libpthread
 vgopts: --read-var-info=yes --check-stack-var=yes --show-confl-seg=no
 prog: annotate_smart_pointer
 args: 1 1 0
-stderr_filter: filter_stderr_and_thread_no
+stderr_filter: filter_stderr_and_thread_no_and_offset

diff --git a/drd/tests/filter_stderr_and_thread_no_and_offset b/drd/tests/filter_stderr_and_thread_no_and_offset
new file mode 100755 (executable)
index 0000000..b0e75a4
--- /dev/null
+++ b/drd/tests/filter_stderr_and_thread_no_and_offset
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+./filter_stderr_and_thread_no \
+| sed "s/ is at offset [0-9]* from / is at offset ... from /"