From 3eb7d935d1eba0d2ac08df0f8387a59b3a55e6b9 Mon Sep 17 00:00:00 2001
From: Bart Van Assche <bvanassche@acm.org>
Date: Fri, 14 Aug 2009 13:25:38 +0000
Subject: [PATCH] Made ANNOTATE_HAPPENS_BEFORE()/_AFTER() binary compatible
 with Helgrind.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@10814
---
 drd/drd.h                             | 6 ++++--
 drd/tests/Makefile.am                 | 2 ++
 drd/tests/annotate_hbefore.stderr.exp | 3 +++
 drd/tests/annotate_hbefore.vgtest     | 4 ++++
 4 files changed, 13 insertions(+), 2 deletions(-)
 create mode 100644 drd/tests/annotate_hbefore.stderr.exp
 create mode 100644 drd/tests/annotate_hbefore.vgtest

diff --git a/drd/drd.h b/drd/drd.h
index b42785805..37230d100 100644
--- a/drd/drd.h
+++ b/drd/drd.h
@@ -321,10 +321,12 @@ enum {
    /* 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
diff --git a/drd/tests/Makefile.am b/drd/tests/Makefile.am
index d859735f2..ad3592481 100644
--- a/drd/tests/Makefile.am
+++ b/drd/tests/Makefile.am
@@ -13,6 +13,8 @@ noinst_HEADERS =                                    \
 	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		    \
diff --git a/drd/tests/annotate_hbefore.stderr.exp b/drd/tests/annotate_hbefore.stderr.exp
new file mode 100644
index 000000000..d18786f80
--- /dev/null
+++ b/drd/tests/annotate_hbefore.stderr.exp
@@ -0,0 +1,3 @@
+
+
+ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
diff --git a/drd/tests/annotate_hbefore.vgtest b/drd/tests/annotate_hbefore.vgtest
new file mode 100644
index 000000000..d89891584
--- /dev/null
+++ b/drd/tests/annotate_hbefore.vgtest
@@ -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