[Valgrind-developers] valgrind: r10814 - in trunk/drd: . tests

[<sv...@va...>]

Author: bart
Date: 2009-08-14 14:25:38 +0100 (Fri, 14 Aug 2009)
New Revision: 10814

Log:
Made ANNOTATE_HAPPENS_BEFORE()/_AFTER() binary compatible with Helgrind.


Added:
   trunk/drd/tests/annotate_hbefore.stderr.exp
   trunk/drd/tests/annotate_hbefore.vgtest
Modified:
   trunk/drd/drd.h
   trunk/drd/tests/Makefile.am


Modified: trunk/drd/drd.h
===================================================================
--- trunk/drd/drd.h	2009-08-14 13:23:00 UTC (rev 10813)
+++ trunk/drd/drd.h	2009-08-14 13:25:38 UTC (rev 10814)
@@ -321,10 +321,12 @@
    /* args: null-terminated character string. */
 
    /* Tell DRD to insert a happens before annotation. */
-   VG_USERREQ__DRD_ANNOTATE_HAPPENS_BEFORE,
+   VG_USERREQ__DRD_ANNOTATE_HAPPENS_BEFORE
+      = VG_USERREQ_TOOL_BASE('H','G') + 256 + 33,
    /* args: Addr. */
    /* Tell DRD to insert a happens after annotation. */
-   VG_USERREQ__DRD_ANNOTATE_HAPPENS_AFTER,
+   VG_USERREQ__DRD_ANNOTATE_HAPPENS_AFTER
+      = VG_USERREQ_TOOL_BASE('H','G') + 256 + 34,
    /* args: Addr. */
 
    /* Tell DRD about an operation performed on a user-defined reader-writer

Modified: trunk/drd/tests/Makefile.am
===================================================================
--- trunk/drd/tests/Makefile.am	2009-08-14 13:23:00 UTC (rev 10813)
+++ trunk/drd/tests/Makefile.am	2009-08-14 13:25:38 UTC (rev 10814)
@@ -13,6 +13,8 @@
 	tsan_thread_wrappers_pthread.h
 
 EXTRA_DIST =                                        \
+	annotate_hbefore.stderr.exp		    \
+	annotate_hbefore.vgtest			    \
 	annotate_order_1.stderr.exp		    \
 	annotate_order_1.vgtest			    \
 	annotate_order_2.stderr.exp		    \

Added: trunk/drd/tests/annotate_hbefore.stderr.exp
===================================================================
--- trunk/drd/tests/annotate_hbefore.stderr.exp	                        (rev 0)
+++ trunk/drd/tests/annotate_hbefore.stderr.exp	2009-08-14 13:25:38 UTC (rev 10814)
@@ -0,0 +1,3 @@
+
+
+ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)

Added: trunk/drd/tests/annotate_hbefore.vgtest
===================================================================
--- trunk/drd/tests/annotate_hbefore.vgtest	                        (rev 0)
+++ trunk/drd/tests/annotate_hbefore.vgtest	2009-08-14 13:25:38 UTC (rev 10814)
@@ -0,0 +1,4 @@
+prereq: test -e ../../helgrind/tests/annotate_hbefore && ./supported_libpthread
+vgopts: --read-var-info=yes --check-stack-var=yes --show-confl-seg=no
+prog: ../../helgrind/tests/annotate_hbefore
+stderr_filter: filter_stderr