From: Bart Van Assche <bvanassche@acm.org>
Date: Wed, 13 Jul 2011 16:46:18 +0000 (+0000)
Subject: drd/tests/annotate_smart_pointer2: Filter out offset
X-Git-Tag: svn/VALGRIND_3_7_0~339
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9c8728c42191f0cacd2764fe2b7e99887840030d;p=thirdparty%2Fvalgrind.git

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 836aeae304..191316bb8a 100644
--- 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 c06d938169..154b5acd61 100644
--- 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 6ba234ecb4..7556ce47ec 100644
--- 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
index 0000000000..b0e75a4a7e
--- /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 /"