Reverted r10802.

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

diff --git a/drd/tests/Makefile.am b/drd/tests/Makefile.am
index 21f56bdad80551e265d9d76e245523c8eea29920..54ff4d694c3ede2e85b906b5597e8659f749a635 100644 (file)
--- a/drd/tests/Makefile.am
+++ b/drd/tests/Makefile.am
@@ -15,6 +15,10 @@ noinst_HEADERS =                                    \
 EXTRA_DIST =                                        \
        annotate_order_1.stderr.exp                 \
        annotate_order_1.vgtest                     \
+       annotate_order_2.stderr.exp                 \
+       annotate_order_2.vgtest                     \
+       annotate_order_3.stderr.exp                 \
+       annotate_order_3.vgtest                     \
        annotate_spinlock.stderr.exp                \
        annotate_spinlock.vgtest                    \
        annotate_rwlock.stderr.exp                  \

diff --git a/drd/tests/annotate_order_2.stderr.exp b/drd/tests/annotate_order_2.stderr.exp
new file mode 100644 (file)
index 0000000..731cd66
--- /dev/null
+++ b/drd/tests/annotate_order_2.stderr.exp
@@ -0,0 +1,6 @@
+
+FLAGS [phb=1, fm=0]
+test30: negative
+       GLOB=47
+
+ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)

diff --git a/drd/tests/annotate_order_2.vgtest b/drd/tests/annotate_order_2.vgtest
new file mode 100644 (file)
index 0000000..8b22fbb
--- /dev/null
+++ b/drd/tests/annotate_order_2.vgtest
@@ -0,0 +1,5 @@
+prereq: test -e tsan_unittest && ./supported_libpthread
+vgopts: --read-var-info=yes --check-stack-var=yes --show-confl-seg=no
+prog: tsan_unittest
+args: 30
+stderr_filter: filter_stderr_and_thread_no

diff --git a/drd/tests/annotate_order_3.stderr.exp b/drd/tests/annotate_order_3.stderr.exp
new file mode 100644 (file)
index 0000000..a5a9f85
--- /dev/null
+++ b/drd/tests/annotate_order_3.stderr.exp
@@ -0,0 +1,6 @@
+
+FLAGS [phb=1, fm=0]
+test31: negative
+       GLOB=48
+
+ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)

diff --git a/drd/tests/annotate_order_3.vgtest b/drd/tests/annotate_order_3.vgtest
new file mode 100644 (file)
index 0000000..76b4595
--- /dev/null
+++ b/drd/tests/annotate_order_3.vgtest
@@ -0,0 +1,5 @@
+prereq: test -e tsan_unittest && ./supported_libpthread
+vgopts: --read-var-info=yes --check-stack-var=yes --show-confl-seg=no
+prog: tsan_unittest
+args: 31
+stderr_filter: filter_stderr_and_thread_no

diff --git a/drd/tests/tsan_thread_wrappers_pthread.h b/drd/tests/tsan_thread_wrappers_pthread.h
index 4428a5d28536007aadd90d2966c51367a2f0cf0f..36e3b10b76c9e836d4704a0909e88af951d8e7d9 100644 (file)
--- a/drd/tests/tsan_thread_wrappers_pthread.h
+++ b/drd/tests/tsan_thread_wrappers_pthread.h
@@ -65,7 +65,7 @@ using namespace std;
 
 #include "../../drd/drd.h"
 #define ANNOTATE_NO_OP(arg) do { } while(0)
-#define ANNOTATE_EXPECT_RACE(addr, descr) do { } while(0)
+#define ANNOTATE_EXPECT_RACE(addr, descr) DRD_IGNORE_VAR(*(void**)addr)
 static inline bool RunningOnValgrind() { return RUNNING_ON_VALGRIND; }
 
 #include <assert.h>