From f342398b6fd29a6a78c07555c75c70b53bef2108 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Fri, 31 Jul 2009 18:49:29 +0000 Subject: [PATCH] Added an output variant for the pth_cancel_locked regression test. Apparently when canceling a thread waiting inside pthread_cond_wait() on Linux the specified mutex is left unlocked while on Darwin the mutex specified in the pthread_cond_wait() call is reacquired before the thread is terminated. git-svn-id: svn://svn.valgrind.org/valgrind/trunk@10682 --- drd/tests/Makefile.am | 1 + drd/tests/pth_cancel_locked.stderr.exp-darwin | 17 +++++++++++++++++ 2 files changed, 18 insertions(+) create mode 100644 drd/tests/pth_cancel_locked.stderr.exp-darwin diff --git a/drd/tests/Makefile.am b/drd/tests/Makefile.am index 7f0b704f0f..d949ebcc7f 100644 --- a/drd/tests/Makefile.am +++ b/drd/tests/Makefile.am @@ -97,6 +97,7 @@ EXTRA_DIST = \ pth_broadcast.stderr.exp \ pth_broadcast.vgtest \ pth_cancel_locked.stderr.exp \ + pth_cancel_locked.stderr.exp-darwin \ pth_cancel_locked.vgtest \ pth_cleanup_handler.stderr.exp \ pth_cleanup_handler.vgtest \ diff --git a/drd/tests/pth_cancel_locked.stderr.exp-darwin b/drd/tests/pth_cancel_locked.stderr.exp-darwin new file mode 100644 index 0000000000..1621f4570d --- /dev/null +++ b/drd/tests/pth_cancel_locked.stderr.exp-darwin @@ -0,0 +1,17 @@ + +Mutex still locked at thread exit: mutex 0x........, recursion count 1, owner 2. + at 0x........: pthread_join (drd_pthread_intercepts.c:?) + by 0x........: main (pth_cancel_locked.c:?) +mutex 0x........ was first observed at: + at 0x........: pthread_mutex_init (drd_pthread_intercepts.c:?) + by 0x........: main (pth_cancel_locked.c:?) + +Mutex still locked at thread exit: mutex 0x........, recursion count 1, owner 2. + at 0x........: pthread_join (drd_pthread_intercepts.c:?) + by 0x........: main (pth_cancel_locked.c:?) +mutex 0x........ was first observed at: + at 0x........: pthread_mutex_init (drd_pthread_intercepts.c:?) + by 0x........: main (pth_cancel_locked.c:?) +Test finished. + +ERROR SUMMARY: 2 errors from 2 contexts (suppressed: 0 from 0) -- 2.47.3