Darwin regtest: update a few expecteds

One predated correct redirection of the C++ library operator new
One has a few line number changes plus I removed an assert that is firing
(asserts firing in tests is never a good thing). And the last one is just
line number changes.

diff --git a/drd/tests/annotate_smart_pointer2.stderr.exp-darwin b/drd/tests/annotate_smart_pointer2.stderr.exp-darwin
index 54fa41e12a0428a9dd355bce569163fbc351d085..e3e33c5c5768bfc796cf4d663c33ca2ee5eda421 100644 (file)
--- a/drd/tests/annotate_smart_pointer2.stderr.exp-darwin
+++ b/drd/tests/annotate_smart_pointer2.stderr.exp-darwin
@@ -1,12 +1,12 @@
 
 Conflicting store by thread x at 0x........ size 4
    at 0x........: counter::~counter() (annotate_smart_pointer.cpp:?)
+   by 0x........: counter::~counter() (annotate_smart_pointer.cpp:?)
    by 0x........: smart_ptr<counter>::set(counter*, AtomicInt32*) (annotate_smart_pointer.cpp:?)
    by 0x........: smart_ptr<counter>::operator=(counter*) (annotate_smart_pointer.cpp:?)
    by 0x........: main (annotate_smart_pointer.cpp:?)
 Address 0x........ is at offset ... from 0x......... Allocation context:
-   at 0x........: malloc (vg_replace_malloc.c:...)
-   by 0x........: operator new(unsigned long) (in /usr/lib/libstdc++.6.0.9.dylib)
+   at 0x........: ...operator new... (vg_replace_malloc.c:...)
    by 0x........: main (annotate_smart_pointer.cpp:?)
 
 Done.

diff --git a/drd/tests/pth_detached3.stderr.exp1 b/drd/tests/pth_detached3.stderr.exp1
index 8dd58ba0f3d84a97f750e212a630fa9ea9808e61..683d634b0eb39dc1c75d2f8b94c4d1c862742fa7 100644 (file)
--- a/drd/tests/pth_detached3.stderr.exp1
+++ b/drd/tests/pth_detached3.stderr.exp1
@@ -1,11 +1,11 @@
 
 pthread_detach(): invalid thread ID 0x........
    at 0x........: pthread_detach (drd_pthread_intercepts.c:?)
-   by 0x........: main (pth_detached3.c:22)
+   by 0x........: main (pth_detached3.c:26)
 
 pthread_detach(): invalid thread ID 0x........
    at 0x........: pthread_detach (drd_pthread_intercepts.c:?)
-   by 0x........: main (pth_detached3.c:25)
+   by 0x........: main (pth_detached3.c:32)
 
 Finished.
 

diff --git a/drd/tests/tc23_bogus_condwait.stderr.exp-darwin-amd64 b/drd/tests/tc23_bogus_condwait.stderr.exp-darwin-amd64
index 33103900010c959d2906b2f2520179795524cf7b..9fc4b77d79390e2d158cf35ae0a0a6cbffcc9b4a 100644 (file)
--- a/drd/tests/tc23_bogus_condwait.stderr.exp-darwin-amd64
+++ b/drd/tests/tc23_bogus_condwait.stderr.exp-darwin-amd64
@@ -1,76 +1,70 @@
 
 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)
+   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:72)
+   by 0x........: main (tc23_bogus_condwait.c:79)
 mutex 0x........ was first observed at:
    at 0x........: pthread_mutex_init (drd_pthread_intercepts.c:?)
-   by 0x........: main (tc23_bogus_condwait.c:54)
+   by 0x........: main (tc23_bogus_condwait.c:59)
 
 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........: 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)
+   by 0x........: main (tc23_bogus_condwait.c:61)
 mutex 0x........ was first observed at:
    at 0x........: pthread_mutex_init (drd_pthread_intercepts.c:?)
-   by 0x........: main (tc23_bogus_condwait.c:54)
+   by 0x........: main (tc23_bogus_condwait.c:59)
 
 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)
+   by 0x........: main (tc23_bogus_condwait.c:82)
 rwlock 0x........ was first observed at:
    at 0x........: pthread_rwlock_init (drd_pthread_intercepts.c:?)
-   by 0x........: main (tc23_bogus_condwait.c:57)
+   by 0x........: main (tc23_bogus_condwait.c:62)
 
 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)
+   by 0x........: main (tc23_bogus_condwait.c:85)
 mutex 0x........ was first observed at:
    at 0x........: pthread_mutex_init (drd_pthread_intercepts.c:?)
-   by 0x........: main (tc23_bogus_condwait.c:53)
+   by 0x........: main (tc23_bogus_condwait.c:58)
 
 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........: rescue_me (tc23_bogus_condwait.c:29)
    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)
+   by 0x........: main (tc23_bogus_condwait.c:61)
 mutex 0x........ was first observed at:
    at 0x........: pthread_mutex_init (drd_pthread_intercepts.c:?)
-   by 0x........: main (tc23_bogus_condwait.c:53)
+   by 0x........: main (tc23_bogus_condwait.c:58)
 
 Thread 1:
 The impossible happened: mutex is locked simultaneously by two threads: mutex 0x........, recursion count 1, owner 2.
    at 0x........: pthread_cond_wait (drd_pthread_intercepts.c:?)
-   by 0x........: main (tc23_bogus_condwait.c:78)
+   by 0x........: main (tc23_bogus_condwait.c:85)
 mutex 0x........ was first observed at:
    at 0x........: pthread_mutex_init (drd_pthread_intercepts.c:?)
-   by 0x........: main (tc23_bogus_condwait.c:53)
+   by 0x........: main (tc23_bogus_condwait.c:58)
 
 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........: grab_the_lock (tc23_bogus_condwait.c:47)
    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)
-
-Assertion failed: (!r), function main, file tc23_bogus_condwait.c, line 86.
+   by 0x........: main (tc23_bogus_condwait.c:58)
 
-Process terminating with default action of signal 6 (SIGABRT)
-   at 0x........: __kill (in /...libc...)
-   by 0x........: __assert_rtn (in /...libc...)
-   by 0x........: main (tc23_bogus_condwait.c:86)
 
 ERROR SUMMARY: 10 errors from 8 contexts (suppressed: 0 from 0)