update

[l4.git] / l4 / pkg / valgrind / src / valgrind-3.6.0-svn / drd / tests / annotate_hb_err.stderr.exp

diff --git a/l4/pkg/valgrind/src/valgrind-3.6.0-svn/drd/tests/annotate_hb_err.stderr.exp b/l4/pkg/valgrind/src/valgrind-3.6.0-svn/drd/tests/annotate_hb_err.stderr.exp
index bf96a09b77d4b07a8c1fe73c55891b69aebdda0e..b52069bf1b1fcf0f666c91bb5763f8e42db77fe1 100644 (file)
--- a/l4/pkg/valgrind/src/valgrind-3.6.0-svn/drd/tests/annotate_hb_err.stderr.exp
+++ b/l4/pkg/valgrind/src/valgrind-3.6.0-svn/drd/tests/annotate_hb_err.stderr.exp
@@ -1,17 +1,13 @@
 
-missing happens-before annotation
-   at 0x........: vgDrdCl_annotate_happens_after (drd.h:?)
-   by 0x........: main (annotate_hb_err.c:?)
-
 wrong type of synchronization object
-   at 0x........: vgDrdCl_annotate_happens_before (drd.h:?)
+   at 0x........: U_AnnotateHappensBefore (unified_annotations.h:?)
    by 0x........: main (annotate_hb_err.c:?)
 mutex 0x........ was first observed at:
    at 0x........: pthread_mutex_init (drd_pthread_intercepts.c:?)
    by 0x........: main (annotate_hb_err.c:?)
 
 wrong type of synchronization object
-   at 0x........: vgDrdCl_annotate_happens_before (drd.h:?)
+   at 0x........: U_AnnotateHappensBefore (unified_annotations.h:?)
    by 0x........: main (annotate_hb_err.c:?)
 cond 0x........ was first observed at:
    at 0x........: pthread_cond_init (drd_pthread_intercepts.c:?)
@@ -21,16 +17,9 @@ wrong type of synchronization object
    at 0x........: pthread_cond_init (drd_pthread_intercepts.c:?)
    by 0x........: main (annotate_hb_err.c:?)
 order annotation 0x........ was first observed at:
-   at 0x........: vgDrdCl_annotate_happens_before (drd.h:?)
-   by 0x........: main (annotate_hb_err.c:?)
-
-happens-before after happens-after
-   at 0x........: vgDrdCl_annotate_happens_before (drd.h:?)
-   by 0x........: main (annotate_hb_err.c:?)
-order annotation 0x........ was first observed at:
-   at 0x........: vgDrdCl_annotate_happens_before (drd.h:?)
+   at 0x........: U_AnnotateHappensAfter (unified_annotations.h:?)
    by 0x........: main (annotate_hb_err.c:?)
 
 Done.
 
-ERROR SUMMARY: 5 errors from 5 contexts (suppressed: 0 from 0)
+ERROR SUMMARY: 3 errors from 3 contexts (suppressed: 0 from 0)