From: Bart Van Assche <bvanassche@acm.org>
Date: Tue, 20 Jan 2009 14:25:22 +0000 (+0000)
Subject: Added yet another output variant.
X-Git-Tag: svn/VALGRIND_3_5_0~1075
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ce5fd5bf82647d7c8ba4e19ae0d9396457bb7266;p=thirdparty%2Fvalgrind.git

Added yet another output variant.

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

diff --git a/drd/tests/Makefile.am b/drd/tests/Makefile.am
index b161de02a4..b8c870a90a 100644
--- a/drd/tests/Makefile.am
+++ b/drd/tests/Makefile.am
@@ -108,7 +108,8 @@ EXTRA_DIST =                                        \
 	pth_detached_sem.stderr.exp                 \
 	pth_detached_sem.stdout.exp                 \
 	pth_detached_sem.vgtest                     \
-	pth_inconsistent_cond_wait.stderr.exp       \
+	pth_inconsistent_cond_wait.stderr.exp1      \
+	pth_inconsistent_cond_wait.stderr.exp2      \
 	pth_inconsistent_cond_wait.vgtest           \
 	pth_spinlock.stderr.exp                     \
 	pth_spinlock.vgtest                         \
diff --git a/drd/tests/pth_inconsistent_cond_wait.stderr.exp b/drd/tests/pth_inconsistent_cond_wait.stderr.exp1
similarity index 100%
rename from drd/tests/pth_inconsistent_cond_wait.stderr.exp
rename to drd/tests/pth_inconsistent_cond_wait.stderr.exp1
diff --git a/drd/tests/pth_inconsistent_cond_wait.stderr.exp2 b/drd/tests/pth_inconsistent_cond_wait.stderr.exp2
new file mode 100644
index 0000000000..83ea73e0f1
--- /dev/null
+++ b/drd/tests/pth_inconsistent_cond_wait.stderr.exp2
@@ -0,0 +1,40 @@
+
+Thread 2:
+Inconsistent association of condition variable and mutex: condition variable 0x........, mutexes 0x........ and 0x........
+   at 0x........: pthread_cond_wait* (drd_pthread_intercepts.c:?)
+   by 0x........: thread1 (pth_inconsistent_cond_wait.c:?)
+   by 0x........: vg_thread_wrapper (drd_pthread_intercepts.c:?)
+   by 0x........: (within libpthread-?.?.so)
+   by 0x........: clone (in /...libc...)
+cond 0x........ was first observed at:
+   at 0x........: pthread_cond_init* (drd_pthread_intercepts.c:?)
+   by 0x........: main (pth_inconsistent_cond_wait.c:?)
+mutex 0x........ was first observed at:
+   at 0x........: pthread_mutex_init (drd_pthread_intercepts.c:?)
+   by 0x........: main (pth_inconsistent_cond_wait.c:?)
+mutex 0x........ was first observed at:
+   at 0x........: pthread_mutex_init (drd_pthread_intercepts.c:?)
+   by 0x........: main (pth_inconsistent_cond_wait.c:?)
+
+Thread 1:
+Probably a race condition: condition variable 0x........ has been signaled but the associated mutex 0x........ is not locked by the signalling thread.
+   at 0x........: pthread_cond_signal* (drd_pthread_intercepts.c:?)
+   by 0x........: main (pth_inconsistent_cond_wait.c:?)
+cond 0x........ was first observed at:
+   at 0x........: pthread_cond_init* (drd_pthread_intercepts.c:?)
+   by 0x........: main (pth_inconsistent_cond_wait.c:?)
+mutex 0x........ was first observed at:
+   at 0x........: pthread_mutex_init (drd_pthread_intercepts.c:?)
+   by 0x........: main (pth_inconsistent_cond_wait.c:?)
+
+Probably a race condition: condition variable 0x........ has been signaled but the associated mutex 0x........ is not locked by the signalling thread.
+   at 0x........: pthread_cond_signal* (drd_pthread_intercepts.c:?)
+   by 0x........: main (pth_inconsistent_cond_wait.c:?)
+cond 0x........ was first observed at:
+   at 0x........: pthread_cond_init* (drd_pthread_intercepts.c:?)
+   by 0x........: main (pth_inconsistent_cond_wait.c:?)
+mutex 0x........ was first observed at:
+   at 0x........: pthread_mutex_init (drd_pthread_intercepts.c:?)
+   by 0x........: main (pth_inconsistent_cond_wait.c:?)
+
+ERROR SUMMARY: 3 errors from 3 contexts (suppressed: 0 from 0)