Updating a few expecteds based on valgrind-testresults

I tried to work out what the expecteds should be based on the changes to
the testcase source so there may be a bit more to do.

diff --git a/drd/tests/tc09_bad_unlock.stderr.exp-glibc2.8 b/drd/tests/tc09_bad_unlock.stderr.exp-glibc2.8
index 9a6c0474f541f549deda876f7f13d878876c8fbb..8a60570c5b85fb0ca336149edc1377cd13708dd5 100644 (file)
--- a/drd/tests/tc09_bad_unlock.stderr.exp-glibc2.8
+++ b/drd/tests/tc09_bad_unlock.stderr.exp-glibc2.8
@@ -26,7 +26,7 @@ The object at address 0x........ is not a mutex.
 
 Destroying locked mutex: mutex 0x........, recursion count 1, owner 1.
    at 0x........: nearly_main (tc09_bad_unlock.c:48)
-   by 0x........: main (tc09_bad_unlock.c:52)
+   by 0x........: (below main)
 mutex 0x........ was first observed at:
    at 0x........: pthread_mutex_init (drd_pthread_intercepts.c:?)
    by 0x........: nearly_main (tc09_bad_unlock.c:32)
@@ -49,7 +49,7 @@ The object at address 0x........ is not a mutex.
 
 Destroying locked mutex: mutex 0x........, recursion count 1, owner 1.
    at 0x........: nearly_main (tc09_bad_unlock.c:48)
-   by 0x........: main (tc09_bad_unlock.c:53)
+   by 0x........: (below main)
 mutex 0x........ was first observed at:
    at 0x........: pthread_mutex_init (drd_pthread_intercepts.c:?)
    by 0x........: nearly_main (tc09_bad_unlock.c:32)

diff --git a/drd/tests/tc09_bad_unlock.stderr.exp-ppc b/drd/tests/tc09_bad_unlock.stderr.exp-ppc
index 0be4db6eacd90295112ae395ab196190f971b147..9a42458da917624124517839d5439bc50f40ea33 100644 (file)
--- a/drd/tests/tc09_bad_unlock.stderr.exp-ppc
+++ b/drd/tests/tc09_bad_unlock.stderr.exp-ppc
@@ -1,59 +1,59 @@
 
 Mutex not locked by calling thread: mutex 0x........, recursion count 0, owner 1.
    at 0x........: pthread_mutex_unlock (drd_pthread_intercepts.c:?)
-   by 0x........: nearly_main (tc09_bad_unlock.c:27)
-   by 0x........: main (tc09_bad_unlock.c:49)
+   by 0x........: nearly_main (tc09_bad_unlock.c:28)
+   by 0x........: main (tc09_bad_unlock.c:52)
 mutex 0x........ was first observed at:
    at 0x........: pthread_mutex_init (drd_pthread_intercepts.c:?)
-   by 0x........: nearly_main (tc09_bad_unlock.c:23)
-   by 0x........: main (tc09_bad_unlock.c:49)
+   by 0x........: nearly_main (tc09_bad_unlock.c:24)
+   by 0x........: main (tc09_bad_unlock.c:52)
 
 Thread 2:
 Mutex not locked by calling thread: mutex 0x........, recursion count 1, owner 1.
    at 0x........: pthread_mutex_unlock (drd_pthread_intercepts.c:?)
-   by 0x........: child_fn (tc09_bad_unlock.c:11)
+   by 0x........: child_fn (tc09_bad_unlock.c:12)
    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........: nearly_main (tc09_bad_unlock.c:31)
-   by 0x........: main (tc09_bad_unlock.c:49)
+   by 0x........: nearly_main (tc09_bad_unlock.c:32)
+   by 0x........: main (tc09_bad_unlock.c:52)
 
 Thread 1:
 The object at address 0x........ is not a mutex.
    at 0x........: pthread_mutex_unlock (drd_pthread_intercepts.c:?)
-   by 0x........: nearly_main (tc09_bad_unlock.c:41)
-   by 0x........: main (tc09_bad_unlock.c:49)
+   by 0x........: nearly_main (tc09_bad_unlock.c:43)
+   by 0x........: main (tc09_bad_unlock.c:52)
 
 Destroying locked mutex: mutex 0x........, recursion count 1, owner 1.
-   at 0x........: nearly_main (tc09_bad_unlock.c:41)
-   by 0x........: main (tc09_bad_unlock.c:49)
+   at 0x........: nearly_main (tc09_bad_unlock.c:44)
+   by 0x........: main (tc09_bad_unlock.c:52)
 mutex 0x........ was first observed at:
    at 0x........: pthread_mutex_init (drd_pthread_intercepts.c:?)
-   by 0x........: nearly_main (tc09_bad_unlock.c:31)
-   by 0x........: main (tc09_bad_unlock.c:49)
+   by 0x........: nearly_main (tc09_bad_unlock.c:32)
+   by 0x........: main (tc09_bad_unlock.c:52)
 
 ---------------------
 Mutex not locked by calling thread: mutex 0x........, recursion count 0, owner 1.
    at 0x........: pthread_mutex_unlock (drd_pthread_intercepts.c:?)
-   by 0x........: nearly_main (tc09_bad_unlock.c:27)
-   by 0x........: main (tc09_bad_unlock.c:50)
+   by 0x........: nearly_main (tc09_bad_unlock.c:28)
+   by 0x........: main (tc09_bad_unlock.c:53)
 mutex 0x........ was first observed at:
    at 0x........: pthread_mutex_init (drd_pthread_intercepts.c:?)
-   by 0x........: nearly_main (tc09_bad_unlock.c:23)
-   by 0x........: main (tc09_bad_unlock.c:50)
+   by 0x........: nearly_main (tc09_bad_unlock.c:24)
+   by 0x........: main (tc09_bad_unlock.c:53)
 
 The object at address 0x........ is not a mutex.
    at 0x........: pthread_mutex_unlock (drd_pthread_intercepts.c:?)
-   by 0x........: nearly_main (tc09_bad_unlock.c:41)
-   by 0x........: main (tc09_bad_unlock.c:50)
+   by 0x........: nearly_main (tc09_bad_unlock.c:43)
+   by 0x........: main (tc09_bad_unlock.c:53)
 
 Destroying locked mutex: mutex 0x........, recursion count 1, owner 1.
-   at 0x........: nearly_main (tc09_bad_unlock.c:41)
-   by 0x........: main (tc09_bad_unlock.c:50)
+   at 0x........: nearly_main (tc09_bad_unlock.c:44)
+   by 0x........: main (tc09_bad_unlock.c:53)
 mutex 0x........ was first observed at:
    at 0x........: pthread_mutex_init (drd_pthread_intercepts.c:?)
-   by 0x........: nearly_main (tc09_bad_unlock.c:31)
-   by 0x........: main (tc09_bad_unlock.c:50)
+   by 0x........: nearly_main (tc09_bad_unlock.c:32)
+   by 0x........: main (tc09_bad_unlock.c:53)
 
 
 ERROR SUMMARY: 8 errors from 7 contexts (suppressed: 0 from 0)

diff --git a/drd/tests/tc09_bad_unlock.stderr.exp-s390 b/drd/tests/tc09_bad_unlock.stderr.exp-s390
index dd84c816e19a4f5cf9cd20f1b49fb989af68427b..6f6493e4834f18cdcd786fab7ab7ef3ff5f7fe2f 100644 (file)
--- a/drd/tests/tc09_bad_unlock.stderr.exp-s390
+++ b/drd/tests/tc09_bad_unlock.stderr.exp-s390
@@ -1,51 +1,51 @@
 
 Mutex not locked by calling thread: mutex 0x........, recursion count 0, owner 1.
    at 0x........: pthread_mutex_unlock (drd_pthread_intercepts.c:?)
-   by 0x........: nearly_main (tc09_bad_unlock.c:27)
-   by 0x........: main (tc09_bad_unlock.c:49)
+   by 0x........: nearly_main (tc09_bad_unlock.c:28)
+   by 0x........: main (tc09_bad_unlock.c:52)
 mutex 0x........ was first observed at:
    at 0x........: pthread_mutex_init (drd_pthread_intercepts.c:?)
-   by 0x........: nearly_main (tc09_bad_unlock.c:23)
-   by 0x........: main (tc09_bad_unlock.c:49)
+   by 0x........: nearly_main (tc09_bad_unlock.c:24)
+   by 0x........: main (tc09_bad_unlock.c:52)
 
 Thread 2:
 Mutex not locked by calling thread: mutex 0x........, recursion count 1, owner 1.
    at 0x........: pthread_mutex_unlock (drd_pthread_intercepts.c:?)
-   by 0x........: child_fn (tc09_bad_unlock.c:11)
+   by 0x........: child_fn (tc09_bad_unlock.c:12)
    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........: nearly_main (tc09_bad_unlock.c:31)
-   by 0x........: main (tc09_bad_unlock.c:49)
+   by 0x........: nearly_main (tc09_bad_unlock.c:32)
+   by 0x........: main (tc09_bad_unlock.c:52)
 
 Thread 1:
 The object at address 0x........ is not a mutex.
    at 0x........: pthread_mutex_unlock (drd_pthread_intercepts.c:?)
-   by 0x........: nearly_main (tc09_bad_unlock.c:41)
-   by 0x........: main (tc09_bad_unlock.c:49)
+   by 0x........: nearly_main (tc09_bad_unlock.c:43)
+   by 0x........: main (tc09_bad_unlock.c:52)
 
 Destroying locked mutex: mutex 0x........, recursion count 1, owner 1.
-   at 0x........: nearly_main (tc09_bad_unlock.c:45)
+   at 0x........: nearly_main (tc09_bad_unlock.c:48)
    by 0x........: ???
 mutex 0x........ was first observed at:
    at 0x........: pthread_mutex_init (drd_pthread_intercepts.c:?)
-   by 0x........: nearly_main (tc09_bad_unlock.c:31)
-   by 0x........: main (tc09_bad_unlock.c:49)
+   by 0x........: nearly_main (tc09_bad_unlock.c:32)
+   by 0x........: main (tc09_bad_unlock.c:52)
 
 ---------------------
 Mutex not locked by calling thread: mutex 0x........, recursion count 0, owner 1.
    at 0x........: pthread_mutex_unlock (drd_pthread_intercepts.c:?)
-   by 0x........: nearly_main (tc09_bad_unlock.c:27)
-   by 0x........: main (tc09_bad_unlock.c:50)
+   by 0x........: nearly_main (tc09_bad_unlock.c:28)
+   by 0x........: main (tc09_bad_unlock.c:53)
 mutex 0x........ was first observed at:
    at 0x........: pthread_mutex_init (drd_pthread_intercepts.c:?)
-   by 0x........: nearly_main (tc09_bad_unlock.c:23)
-   by 0x........: main (tc09_bad_unlock.c:50)
+   by 0x........: nearly_main (tc09_bad_unlock.c:24)
+   by 0x........: main (tc09_bad_unlock.c:53)
 
 The object at address 0x........ is not a mutex.
    at 0x........: pthread_mutex_unlock (drd_pthread_intercepts.c:?)
-   by 0x........: nearly_main (tc09_bad_unlock.c:41)
-   by 0x........: main (tc09_bad_unlock.c:50)
+   by 0x........: nearly_main (tc09_bad_unlock.c:43)
+   by 0x........: main (tc09_bad_unlock.c:53)
 
 
 ERROR SUMMARY: 8 errors from 6 contexts (suppressed: 0 from 0)

diff --git a/drd/tests/tc09_bad_unlock.stderr.exp-solaris b/drd/tests/tc09_bad_unlock.stderr.exp-solaris
index a517b71f0fb255cd1cc9acacf1be62b5ba3d4c2c..1a1ef29baa373758c2b697cbb6341cc0206aeecc 100644 (file)
--- a/drd/tests/tc09_bad_unlock.stderr.exp-solaris
+++ b/drd/tests/tc09_bad_unlock.stderr.exp-solaris
@@ -1,54 +1,54 @@
 
 Mutex not locked by calling thread: mutex 0x........, recursion count 0, owner 1.
    at 0x........: pthread_mutex_unlock (drd_pthread_intercepts.c:?)
-   by 0x........: nearly_main (tc09_bad_unlock.c:27)
-   by 0x........: main (tc09_bad_unlock.c:49)
+   by 0x........: nearly_main (tc09_bad_unlock.c:28)
+   by 0x........: main (tc09_bad_unlock.c:52)
 mutex 0x........ was first observed at:
    at 0x........: pthread_mutex_init (drd_pthread_intercepts.c:?)
-   by 0x........: nearly_main (tc09_bad_unlock.c:23)
+   by 0x........: nearly_main (tc09_bad_unlock.c:24)
 
 Thread 2:
 Mutex not locked by calling thread: mutex 0x........, recursion count 1, owner 1.
    at 0x........: pthread_mutex_unlock (drd_pthread_intercepts.c:?)
-   by 0x........: child_fn (tc09_bad_unlock.c:11)
+   by 0x........: child_fn (tc09_bad_unlock.c:12)
    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........: nearly_main (tc09_bad_unlock.c:31)
+   by 0x........: nearly_main (tc09_bad_unlock.c:32)
 
 Thread 1:
 The object at address 0x........ is not a mutex.
    at 0x........: pthread_mutex_unlock (drd_pthread_intercepts.c:?)
-   by 0x........: nearly_main (tc09_bad_unlock.c:41)
-   by 0x........: main (tc09_bad_unlock.c:49)
+   by 0x........: nearly_main (tc09_bad_unlock.c:43)
+   by 0x........: main (tc09_bad_unlock.c:5)
 
 Destroying locked mutex: mutex 0x........, recursion count 1, owner 1.
-   at 0x........: nearly_main (tc09_bad_unlock.c:45)
-   by 0x........: main (tc09_bad_unlock.c:49)
+   at 0x........: nearly_main (tc09_bad_unlock.c:48)
+   by 0x........: main (tc09_bad_unlock.c:52)
 mutex 0x........ was first observed at:
    at 0x........: pthread_mutex_init (drd_pthread_intercepts.c:?)
-   by 0x........: nearly_main (tc09_bad_unlock.c:31)
+   by 0x........: nearly_main (tc09_bad_unlock.c:32)
 
 ---------------------
 Mutex not locked by calling thread: mutex 0x........, recursion count 0, owner 1.
    at 0x........: pthread_mutex_unlock (drd_pthread_intercepts.c:?)
-   by 0x........: nearly_main (tc09_bad_unlock.c:27)
-   by 0x........: main (tc09_bad_unlock.c:50)
+   by 0x........: nearly_main (tc09_bad_unlock.c:28)
+   by 0x........: main (tc09_bad_unlock.c:53)
 mutex 0x........ was first observed at:
    at 0x........: pthread_mutex_init (drd_pthread_intercepts.c:?)
-   by 0x........: nearly_main (tc09_bad_unlock.c:23)
+   by 0x........: nearly_main (tc09_bad_unlock.c:24)
 
 The object at address 0x........ is not a mutex.
    at 0x........: pthread_mutex_unlock (drd_pthread_intercepts.c:?)
-   by 0x........: nearly_main (tc09_bad_unlock.c:41)
-   by 0x........: main (tc09_bad_unlock.c:50)
+   by 0x........: nearly_main (tc09_bad_unlock.c:43)
+   by 0x........: main (tc09_bad_unlock.c:53)
 
 Destroying locked mutex: mutex 0x........, recursion count 1, owner 1.
-   at 0x........: nearly_main (tc09_bad_unlock.c:45)
-   by 0x........: main (tc09_bad_unlock.c:50)
+   at 0x........: nearly_main (tc09_bad_unlock.c:48)
+   by 0x........: main (tc09_bad_unlock.c:53)
 mutex 0x........ was first observed at:
    at 0x........: pthread_mutex_init (drd_pthread_intercepts.c:?)
-   by 0x........: nearly_main (tc09_bad_unlock.c:31)
+   by 0x........: nearly_main (tc09_bad_unlock.c:32)
 
 
 ERROR SUMMARY: 8 errors from 7 contexts (suppressed: 0 from 0)

diff --git a/drd/tests/tc09_bad_unlock.stderr.exp-x86 b/drd/tests/tc09_bad_unlock.stderr.exp-x86
index 7f8e2cc2aa9ed450404a2e9683378e4bb285c5f0..9a6c0474f541f549deda876f7f13d878876c8fbb 100644 (file)
--- a/drd/tests/tc09_bad_unlock.stderr.exp-x86
+++ b/drd/tests/tc09_bad_unlock.stderr.exp-x86
@@ -1,59 +1,59 @@
 
 Mutex not locked by calling thread: mutex 0x........, recursion count 0, owner 1.
    at 0x........: pthread_mutex_unlock (drd_pthread_intercepts.c:?)
-   by 0x........: nearly_main (tc09_bad_unlock.c:27)
-   by 0x........: main (tc09_bad_unlock.c:49)
+   by 0x........: nearly_main (tc09_bad_unlock.c:28)
+   by 0x........: main (tc09_bad_unlock.c:52)
 mutex 0x........ was first observed at:
    at 0x........: pthread_mutex_init (drd_pthread_intercepts.c:?)
-   by 0x........: nearly_main (tc09_bad_unlock.c:23)
-   by 0x........: main (tc09_bad_unlock.c:49)
+   by 0x........: nearly_main (tc09_bad_unlock.c:24)
+   by 0x........: main (tc09_bad_unlock.c:52)
 
 Thread 2:
 Mutex not locked by calling thread: mutex 0x........, recursion count 1, owner 1.
    at 0x........: pthread_mutex_unlock (drd_pthread_intercepts.c:?)
-   by 0x........: child_fn (tc09_bad_unlock.c:11)
+   by 0x........: child_fn (tc09_bad_unlock.c:12)
    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........: nearly_main (tc09_bad_unlock.c:31)
-   by 0x........: main (tc09_bad_unlock.c:49)
+   by 0x........: nearly_main (tc09_bad_unlock.c:32)
+   by 0x........: main (tc09_bad_unlock.c:52)
 
 Thread 1:
 The object at address 0x........ is not a mutex.
    at 0x........: pthread_mutex_unlock (drd_pthread_intercepts.c:?)
-   by 0x........: nearly_main (tc09_bad_unlock.c:41)
-   by 0x........: main (tc09_bad_unlock.c:49)
+   by 0x........: nearly_main (tc09_bad_unlock.c:43)
+   by 0x........: main (tc09_bad_unlock.c:52)
 
 Destroying locked mutex: mutex 0x........, recursion count 1, owner 1.
-   at 0x........: nearly_main (tc09_bad_unlock.c:45)
-   by 0x........: main (tc09_bad_unlock.c:49)
+   at 0x........: nearly_main (tc09_bad_unlock.c:48)
+   by 0x........: main (tc09_bad_unlock.c:52)
 mutex 0x........ was first observed at:
    at 0x........: pthread_mutex_init (drd_pthread_intercepts.c:?)
-   by 0x........: nearly_main (tc09_bad_unlock.c:31)
-   by 0x........: main (tc09_bad_unlock.c:49)
+   by 0x........: nearly_main (tc09_bad_unlock.c:32)
+   by 0x........: main (tc09_bad_unlock.c:52)
 
 ---------------------
 Mutex not locked by calling thread: mutex 0x........, recursion count 0, owner 1.
    at 0x........: pthread_mutex_unlock (drd_pthread_intercepts.c:?)
-   by 0x........: nearly_main (tc09_bad_unlock.c:27)
-   by 0x........: main (tc09_bad_unlock.c:50)
+   by 0x........: nearly_main (tc09_bad_unlock.c:28)
+   by 0x........: main (tc09_bad_unlock.c:53)
 mutex 0x........ was first observed at:
    at 0x........: pthread_mutex_init (drd_pthread_intercepts.c:?)
-   by 0x........: nearly_main (tc09_bad_unlock.c:23)
-   by 0x........: main (tc09_bad_unlock.c:50)
+   by 0x........: nearly_main (tc09_bad_unlock.c:24)
+   by 0x........: main (tc09_bad_unlock.c:53)
 
 The object at address 0x........ is not a mutex.
    at 0x........: pthread_mutex_unlock (drd_pthread_intercepts.c:?)
-   by 0x........: nearly_main (tc09_bad_unlock.c:41)
-   by 0x........: main (tc09_bad_unlock.c:50)
+   by 0x........: nearly_main (tc09_bad_unlock.c:43)
+   by 0x........: main (tc09_bad_unlock.c:53)
 
 Destroying locked mutex: mutex 0x........, recursion count 1, owner 1.
-   at 0x........: nearly_main (tc09_bad_unlock.c:45)
-   by 0x........: main (tc09_bad_unlock.c:50)
+   at 0x........: nearly_main (tc09_bad_unlock.c:48)
+   by 0x........: main (tc09_bad_unlock.c:53)
 mutex 0x........ was first observed at:
    at 0x........: pthread_mutex_init (drd_pthread_intercepts.c:?)
-   by 0x........: nearly_main (tc09_bad_unlock.c:31)
-   by 0x........: main (tc09_bad_unlock.c:50)
+   by 0x........: nearly_main (tc09_bad_unlock.c:32)
+   by 0x........: main (tc09_bad_unlock.c:53)
 
 
 ERROR SUMMARY: 8 errors from 7 contexts (suppressed: 0 from 0)

diff --git a/helgrind/tests/bar_bad.stderr.exp b/helgrind/tests/bar_bad.stderr.exp
index a675a18df059a05759435a3b02afefe0ec10ef53..7aa18c047ca495938893f2233b3539d2fb7f756e 100644 (file)
--- a/helgrind/tests/bar_bad.stderr.exp
+++ b/helgrind/tests/bar_bad.stderr.exp
@@ -8,14 +8,14 @@ Thread #x is the program's root thread
 
 Thread #x: pthread_barrier_init: 'count' argument is zero
    at 0x........: pthread_barrier_init (hg_intercepts.c:...)
-   by 0x........: main (bar_bad.c:43)
+   by 0x........: main (bar_bad.c:44)
 
 ----------------------------------------------------------------
 
 Thread #x's call to pthread_barrier_init failed
    with error code 22 (EINVAL: Invalid argument)
    at 0x........: pthread_barrier_init (hg_intercepts.c:...)
-   by 0x........: main (bar_bad.c:43)
+   by 0x........: main (bar_bad.c:44)
 
 
 initialise a barrier twice
@@ -23,7 +23,7 @@ initialise a barrier twice
 
 Thread #x: pthread_barrier_init: barrier is already initialised
    at 0x........: pthread_barrier_init (hg_intercepts.c:...)
-   by 0x........: main (bar_bad.c:49)
+   by 0x........: main (bar_bad.c:50)
 
 
 initialise a barrier which has threads waiting on it
@@ -31,13 +31,13 @@ initialise a barrier which has threads waiting on it
 
 Thread #x: pthread_barrier_init: barrier is already initialised
    at 0x........: pthread_barrier_init (hg_intercepts.c:...)
-   by 0x........: main (bar_bad.c:64)
+   by 0x........: main (bar_bad.c:65)
 
 ----------------------------------------------------------------
 
 Thread #x: pthread_barrier_init: threads are waiting at barrier
    at 0x........: pthread_barrier_init (hg_intercepts.c:...)
-   by 0x........: main (bar_bad.c:64)
+   by 0x........: main (bar_bad.c:65)
 
 
 destroy a barrier that has waiting threads
@@ -45,14 +45,14 @@ destroy a barrier that has waiting threads
 
 Thread #x: pthread_barrier_destroy: threads are waiting at barrier
    at 0x........: pthread_barrier_destroy (hg_intercepts.c:...)
-   by 0x........: main (bar_bad.c:82)
+   by 0x........: main (bar_bad.c:83)
 
 ----------------------------------------------------------------
 
 Thread #x's call to pthread_barrier_destroy failed
    with error code 16 (EBUSY: Device or resource busy)
    at 0x........: pthread_barrier_destroy (hg_intercepts.c:...)
-   by 0x........: main (bar_bad.c:82)
+   by 0x........: main (bar_bad.c:83)
 
 
 destroy a barrier that was never initialised
@@ -60,5 +60,5 @@ destroy a barrier that was never initialised
 
 Thread #x: pthread_barrier_destroy: barrier was never initialised
    at 0x........: pthread_barrier_destroy (hg_intercepts.c:...)
-   by 0x........: main (bar_bad.c:98)
+   by 0x........: main (bar_bad.c:100)
 

diff --git a/memcheck/tests/badjump2.stderr.exp b/memcheck/tests/badjump2.stderr.exp
index 7033e69d7ee507baf560317e4de296c2cdbc387a..78e416bdcda98e83ad55c502ea285bba7034e30a 100644 (file)
--- a/memcheck/tests/badjump2.stderr.exp
+++ b/memcheck/tests/badjump2.stderr.exp
@@ -1,6 +1,6 @@
 Jump to the invalid address stated on the next line
    ...
-   by 0x........: main (badjump2.c:46)
+   by 0x........: main (badjump2.c:47)
  Address 0x........ is not stack'd, malloc'd or (recently) free'd
 
 Signal caught, as expected