From: Bart Van Assche Date: Mon, 4 Jan 2010 10:49:48 +0000 (+0000) Subject: Merged tc23_bogus_condwait.stderr.exp-linux-x86 and -ppc. X-Git-Tag: svn/VALGRIND_3_6_0~414 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=958a879bd100e70592d212c809e4f7974962d2a7;p=thirdparty%2Fvalgrind.git Merged tc23_bogus_condwait.stderr.exp-linux-x86 and -ppc. git-svn-id: svn://svn.valgrind.org/valgrind/trunk@11010 --- diff --git a/drd/tests/Makefile.am b/drd/tests/Makefile.am index a252ec0460..9f4e0be6d9 100644 --- a/drd/tests/Makefile.am +++ b/drd/tests/Makefile.am @@ -227,8 +227,7 @@ EXTRA_DIST = \ tc22_exit_w_lock.stderr.exp-32bit \ tc22_exit_w_lock.stderr.exp-64bit \ tc22_exit_w_lock.vgtest \ - tc23_bogus_condwait.stderr.exp-linux-x86 \ - tc23_bogus_condwait.stderr.exp-linux-ppc \ + tc23_bogus_condwait.stderr.exp-linux \ tc23_bogus_condwait.stderr.exp-darwin \ tc23_bogus_condwait.vgtest \ tc24_nonzero_sem.stderr.exp \ diff --git a/drd/tests/tc23_bogus_condwait.stderr.exp-linux-ppc b/drd/tests/tc23_bogus_condwait.stderr.exp-linux similarity index 100% rename from drd/tests/tc23_bogus_condwait.stderr.exp-linux-ppc rename to drd/tests/tc23_bogus_condwait.stderr.exp-linux diff --git a/drd/tests/tc23_bogus_condwait.stderr.exp-linux-x86 b/drd/tests/tc23_bogus_condwait.stderr.exp-linux-x86 deleted file mode 100644 index 5e16bd2e46..0000000000 --- a/drd/tests/tc23_bogus_condwait.stderr.exp-linux-x86 +++ /dev/null @@ -1,86 +0,0 @@ - -The object at address 0x........ is not a mutex. - at 0x........: pthread_cond_wait (drd_pthread_intercepts.c:?) - by 0x........: main (tc23_bogus_condwait.c:69) - -Thread 3: -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........: rescue_me (tc23_bogus_condwait.c:20) - by 0x........: vgDrd_thread_wrapper (drd_pthread_intercepts.c:?) -cond 0x........ was first observed at: - at 0x........: pthread_cond_init (drd_pthread_intercepts.c:?) - by 0x........: main (tc23_bogus_condwait.c:56) - -Thread 1: -Mutex not locked: mutex 0x........, recursion count 0, owner 0. - at 0x........: pthread_cond_wait (drd_pthread_intercepts.c:?) - by 0x........: main (tc23_bogus_condwait.c:72) -mutex 0x........ was first observed at: - at 0x........: pthread_mutex_init (drd_pthread_intercepts.c:?) - by 0x........: main (tc23_bogus_condwait.c:51) - -Thread 3: -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........: rescue_me (tc23_bogus_condwait.c:24) - by 0x........: vgDrd_thread_wrapper (drd_pthread_intercepts.c:?) -cond 0x........ was first observed at: - at 0x........: pthread_cond_init (drd_pthread_intercepts.c:?) - by 0x........: main (tc23_bogus_condwait.c:56) -mutex 0x........ was first observed at: - at 0x........: pthread_mutex_init (drd_pthread_intercepts.c:?) - by 0x........: main (tc23_bogus_condwait.c:51) - -Thread 1: -The object at address 0x........ is not a mutex. - at 0x........: pthread_cond_wait (drd_pthread_intercepts.c:?) - by 0x........: main (tc23_bogus_condwait.c:75) -rwlock 0x........ was first observed at: - at 0x........: pthread_rwlock_init (drd_pthread_intercepts.c:?) - by 0x........: main (tc23_bogus_condwait.c:57) - -Thread 3: -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........: rescue_me (tc23_bogus_condwait.c:28) - by 0x........: vgDrd_thread_wrapper (drd_pthread_intercepts.c:?) -cond 0x........ was first observed at: - at 0x........: pthread_cond_init (drd_pthread_intercepts.c:?) - by 0x........: main (tc23_bogus_condwait.c:56) -rwlock 0x........ was first observed at: - at 0x........: pthread_rwlock_init (drd_pthread_intercepts.c:?) - by 0x........: main (tc23_bogus_condwait.c:57) - -Thread 1: -Mutex not locked by calling thread: mutex 0x........, recursion count 1, owner 2. - at 0x........: pthread_cond_wait (drd_pthread_intercepts.c:?) - by 0x........: main (tc23_bogus_condwait.c:78) -mutex 0x........ was first observed at: - at 0x........: pthread_mutex_init (drd_pthread_intercepts.c:?) - by 0x........: main (tc23_bogus_condwait.c:53) - -Thread 3: -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........: rescue_me (tc23_bogus_condwait.c:32) - by 0x........: vgDrd_thread_wrapper (drd_pthread_intercepts.c:?) -cond 0x........ was first observed at: - at 0x........: pthread_cond_init (drd_pthread_intercepts.c:?) - by 0x........: main (tc23_bogus_condwait.c:56) -mutex 0x........ was first observed at: - at 0x........: pthread_mutex_init (drd_pthread_intercepts.c:?) - by 0x........: main (tc23_bogus_condwait.c:53) - -The impossible happened: mutex 0x........ is locked simultaneously by two threads (recursion count 1, owners 2 and 1) ! -Thread 2: -Mutex not locked by calling thread: mutex 0x........, recursion count 2, owner 1. - at 0x........: pthread_mutex_unlock (drd_pthread_intercepts.c:?) - by 0x........: grab_the_lock (tc23_bogus_condwait.c:42) - by 0x........: vgDrd_thread_wrapper (drd_pthread_intercepts.c:?) -mutex 0x........ was first observed at: - at 0x........: pthread_mutex_init (drd_pthread_intercepts.c:?) - by 0x........: main (tc23_bogus_condwait.c:53) - - -ERROR SUMMARY: 11 errors from 9 contexts (suppressed: 0 from 0)