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

diff --git a/drd/tests/Makefile.am b/drd/tests/Makefile.am
index 7f0b704f0f5a019902d0d69951d28b71708054e6..d949ebcc7ff075d72a5c7f6f30a370f4dfab27fb 100644 (file)
--- 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 (file)
index 0000000..1621f45
--- /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)