From f8433bbd9dbe3316d29bd6b24e3b81f347c9da4c Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Fri, 14 Aug 2009 06:45:16 +0000 Subject: [PATCH] Reverted r10802. git-svn-id: svn://svn.valgrind.org/valgrind/trunk@10807 --- drd/tests/Makefile.am | 4 ++++ drd/tests/annotate_order_2.stderr.exp | 6 ++++++ drd/tests/annotate_order_2.vgtest | 5 +++++ drd/tests/annotate_order_3.stderr.exp | 6 ++++++ drd/tests/annotate_order_3.vgtest | 5 +++++ drd/tests/tsan_thread_wrappers_pthread.h | 2 +- 6 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 drd/tests/annotate_order_2.stderr.exp create mode 100644 drd/tests/annotate_order_2.vgtest create mode 100644 drd/tests/annotate_order_3.stderr.exp create mode 100644 drd/tests/annotate_order_3.vgtest diff --git a/drd/tests/Makefile.am b/drd/tests/Makefile.am index 21f56bdad8..54ff4d694c 100644 --- 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 index 0000000000..731cd660cb --- /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 index 0000000000..8b22fbb988 --- /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 index 0000000000..a5a9f85795 --- /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 index 0000000000..76b4595bbd --- /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 4428a5d285..36e3b10b76 100644 --- 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 -- 2.47.3