Added another Darwin regression tests output variant.

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

diff --git a/drd/tests/Makefile.am b/drd/tests/Makefile.am
index 535f5e4b1f1bcaf7ea6d3d33b57a1b8d80fa96ba..2abf581c51e664fb11ea0dddb8167d9dc77c1231 100644 (file)
--- a/drd/tests/Makefile.am
+++ b/drd/tests/Makefile.am
@@ -207,8 +207,8 @@ 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              \
-       tc23_bogus_condwait.stderr.exp2             \
+       tc23_bogus_condwait.stderr.exp-linux        \
+       tc23_bogus_condwait.stderr.exp-darwin       \
        tc23_bogus_condwait.vgtest                  \
        tc24_nonzero_sem.stderr.exp                 \
        tc24_nonzero_sem.vgtest                     \

diff --git a/drd/tests/tc23_bogus_condwait.stderr.exp-darwin b/drd/tests/tc23_bogus_condwait.stderr.exp-darwin
new file mode 100644 (file)
index 0000000..90492ba
--- /dev/null
+++ b/drd/tests/tc23_bogus_condwait.stderr.exp-darwin
@@ -0,0 +1,38 @@
+
+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)
+
+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)
+
+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:78)
+mutex 0x........ was first observed at:
+   at 0x........: pthread_mutex_init (drd_pthread_intercepts.c:?)
+   by 0x........: main (tc23_bogus_condwait.c:57)
+
+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:81)
+rwlock 0x........ was first observed at:
+   at 0x........: pthread_rwlock_init* (drd_pthread_intercepts.c:?)
+   by 0x........: main (tc23_bogus_condwait.c:63)
+
+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:81)
+rwlock 0x........ was first observed at:
+   at 0x........: pthread_rwlock_init* (drd_pthread_intercepts.c:?)
+   by 0x........: main (tc23_bogus_condwait.c:63)
+
+Mutex not locked by calling thread: mutex 0x........, recursion count 0, owner 2.
+   at 0x........: pthread_cond_wait* (drd_pthread_intercepts.c:?)
+   by 0x........: main (tc23_bogus_condwait.c:84)
+mutex 0x........ was first observed at:
+   at 0x........: pthread_mutex_init (drd_pthread_intercepts.c:?)
+   by 0x........: main (tc23_bogus_condwait.c:59)
+
+ERROR SUMMARY: 6 errors from 6 contexts (suppressed: 0 from 0)

diff --git a/drd/tests/tc23_bogus_condwait.stderr.exp b/drd/tests/tc23_bogus_condwait.stderr.exp-linux
similarity index 100%
rename from drd/tests/tc23_bogus_condwait.stderr.exp
rename to drd/tests/tc23_bogus_condwait.stderr.exp-linux