|
From: <sv...@va...> - 2009-08-14 06:45:27
|
Author: bart
Date: 2009-08-14 07:45:16 +0100 (Fri, 14 Aug 2009)
New Revision: 10807
Log:
Reverted r10802.
Added:
trunk/drd/tests/annotate_order_2.stderr.exp
trunk/drd/tests/annotate_order_2.vgtest
trunk/drd/tests/annotate_order_3.stderr.exp
trunk/drd/tests/annotate_order_3.vgtest
Modified:
trunk/drd/tests/Makefile.am
trunk/drd/tests/tsan_thread_wrappers_pthread.h
Modified: trunk/drd/tests/Makefile.am
===================================================================
--- trunk/drd/tests/Makefile.am 2009-08-14 06:32:20 UTC (rev 10806)
+++ trunk/drd/tests/Makefile.am 2009-08-14 06:45:16 UTC (rev 10807)
@@ -15,6 +15,10 @@
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 \
Copied: trunk/drd/tests/annotate_order_2.stderr.exp (from rev 10801, trunk/drd/tests/annotate_order_2.stderr.exp)
===================================================================
--- trunk/drd/tests/annotate_order_2.stderr.exp (rev 0)
+++ trunk/drd/tests/annotate_order_2.stderr.exp 2009-08-14 06:45:16 UTC (rev 10807)
@@ -0,0 +1,6 @@
+
+FLAGS [phb=1, fm=0]
+test30: negative
+ GLOB=47
+
+ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
Copied: trunk/drd/tests/annotate_order_2.vgtest (from rev 10801, trunk/drd/tests/annotate_order_2.vgtest)
===================================================================
--- trunk/drd/tests/annotate_order_2.vgtest (rev 0)
+++ trunk/drd/tests/annotate_order_2.vgtest 2009-08-14 06:45:16 UTC (rev 10807)
@@ -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
Copied: trunk/drd/tests/annotate_order_3.stderr.exp (from rev 10801, trunk/drd/tests/annotate_order_3.stderr.exp)
===================================================================
--- trunk/drd/tests/annotate_order_3.stderr.exp (rev 0)
+++ trunk/drd/tests/annotate_order_3.stderr.exp 2009-08-14 06:45:16 UTC (rev 10807)
@@ -0,0 +1,6 @@
+
+FLAGS [phb=1, fm=0]
+test31: negative
+ GLOB=48
+
+ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
Copied: trunk/drd/tests/annotate_order_3.vgtest (from rev 10801, trunk/drd/tests/annotate_order_3.vgtest)
===================================================================
--- trunk/drd/tests/annotate_order_3.vgtest (rev 0)
+++ trunk/drd/tests/annotate_order_3.vgtest 2009-08-14 06:45:16 UTC (rev 10807)
@@ -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
Modified: trunk/drd/tests/tsan_thread_wrappers_pthread.h
===================================================================
--- trunk/drd/tests/tsan_thread_wrappers_pthread.h 2009-08-14 06:32:20 UTC (rev 10806)
+++ trunk/drd/tests/tsan_thread_wrappers_pthread.h 2009-08-14 06:45:16 UTC (rev 10807)
@@ -65,7 +65,7 @@
#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>
|