|
From: <sv...@va...> - 2011-12-17 14:23:05
|
Author: bart Date: 2011-12-17 14:18:25 +0000 (Sat, 17 Dec 2011) New Revision: 12311 Log: DRD: add two ppc output variants Added: trunk/drd/tests/tc04_free_lock.stderr.exp-ppc trunk/drd/tests/tc04_free_lock.stderr.exp-x86 trunk/drd/tests/tc09_bad_unlock.stderr.exp-ppc trunk/drd/tests/tc09_bad_unlock.stderr.exp-x86 Removed: trunk/drd/tests/tc04_free_lock.stderr.exp trunk/drd/tests/tc09_bad_unlock.stderr.exp Modified: trunk/drd/tests/Makefile.am Modified: trunk/drd/tests/Makefile.am =================================================================== --- trunk/drd/tests/Makefile.am 2011-12-17 12:59:45 UTC (rev 12310) +++ trunk/drd/tests/Makefile.am 2011-12-17 14:18:25 UTC (rev 12311) @@ -229,7 +229,8 @@ tc02_simple_tls.vgtest \ tc03_re_excl.stderr.exp \ tc03_re_excl.vgtest \ - tc04_free_lock.stderr.exp \ + tc04_free_lock.stderr.exp-x86 \ + tc04_free_lock.stderr.exp-ppc \ tc04_free_lock.vgtest \ tc05_simple_race.stderr.exp \ tc05_simple_race.vgtest \ @@ -241,7 +242,8 @@ tc08_hbl2.stderr.exp \ tc08_hbl2.stdout.exp \ tc08_hbl2.vgtest \ - tc09_bad_unlock.stderr.exp \ + tc09_bad_unlock.stderr.exp-x86 \ + tc09_bad_unlock.stderr.exp-ppc \ tc09_bad_unlock.stderr.exp-glibc2.8 \ tc09_bad_unlock.vgtest \ tc10_rec_lock.stderr.exp \ Deleted: trunk/drd/tests/tc04_free_lock.stderr.exp =================================================================== --- trunk/drd/tests/tc04_free_lock.stderr.exp 2011-12-17 12:59:45 UTC (rev 12310) +++ trunk/drd/tests/tc04_free_lock.stderr.exp 2011-12-17 14:18:25 UTC (rev 12311) @@ -1,34 +0,0 @@ - -Destroying locked mutex: mutex 0x........, recursion count 1, owner 1. - at 0x........: free (vg_replace_malloc.c:...) - by 0x........: main (tc04_free_lock.c:24) -mutex 0x........ was first observed at: - at 0x........: pthread_mutex_init (drd_pthread_intercepts.c:?) - by 0x........: main (tc04_free_lock.c:20) - -Destroying locked mutex: mutex 0x........, recursion count 1, owner 1. - at 0x........: bar (tc04_free_lock.c:40) - by 0x........: main (tc04_free_lock.c:26) -mutex 0x........ was first observed at: - at 0x........: pthread_mutex_lock (drd_pthread_intercepts.c:?) - by 0x........: bar (tc04_free_lock.c:38) - by 0x........: main (tc04_free_lock.c:26) - -Destroying locked mutex: mutex 0x........, recursion count 1, owner 1. - at 0x........: foo (tc04_free_lock.c:49) - by 0x........: main (tc04_free_lock.c:27) -mutex 0x........ was first observed at: - at 0x........: pthread_mutex_init (drd_pthread_intercepts.c:?) - by 0x........: foo (tc04_free_lock.c:46) - by 0x........: main (tc04_free_lock.c:27) - -Destroying locked mutex: mutex 0x........, recursion count 1, owner 1. - at 0x........: bar (tc04_free_lock.c:40) - by 0x........: main (tc04_free_lock.c:28) -mutex 0x........ was first observed at: - at 0x........: pthread_mutex_lock (drd_pthread_intercepts.c:?) - by 0x........: bar (tc04_free_lock.c:38) - by 0x........: main (tc04_free_lock.c:28) - - -ERROR SUMMARY: 4 errors from 4 contexts (suppressed: 0 from 0) Added: trunk/drd/tests/tc04_free_lock.stderr.exp-ppc =================================================================== --- trunk/drd/tests/tc04_free_lock.stderr.exp-ppc (rev 0) +++ trunk/drd/tests/tc04_free_lock.stderr.exp-ppc 2011-12-17 14:18:25 UTC (rev 12311) @@ -0,0 +1,34 @@ + +Destroying locked mutex: mutex 0x........, recursion count 1, owner 1. + at 0x........: free (vg_replace_malloc.c:...) + by 0x........: main (tc04_free_lock.c:24) +mutex 0x........ was first observed at: + at 0x........: pthread_mutex_init (drd_pthread_intercepts.c:?) + by 0x........: main (tc04_free_lock.c:20) + +Destroying locked mutex: mutex 0x........, recursion count 1, owner 1. + at 0x........: bar (tc04_free_lock.c:38) + by 0x........: main (tc04_free_lock.c:26) +mutex 0x........ was first observed at: + at 0x........: pthread_mutex_lock (drd_pthread_intercepts.c:?) + by 0x........: bar (tc04_free_lock.c:38) + by 0x........: main (tc04_free_lock.c:26) + +Destroying locked mutex: mutex 0x........, recursion count 1, owner 1. + at 0x........: foo (tc04_free_lock.c:47) + by 0x........: main (tc04_free_lock.c:27) +mutex 0x........ was first observed at: + at 0x........: pthread_mutex_init (drd_pthread_intercepts.c:?) + by 0x........: foo (tc04_free_lock.c:46) + by 0x........: main (tc04_free_lock.c:27) + +Destroying locked mutex: mutex 0x........, recursion count 1, owner 1. + at 0x........: bar (tc04_free_lock.c:38) + by 0x........: main (tc04_free_lock.c:28) +mutex 0x........ was first observed at: + at 0x........: pthread_mutex_lock (drd_pthread_intercepts.c:?) + by 0x........: bar (tc04_free_lock.c:38) + by 0x........: main (tc04_free_lock.c:28) + + +ERROR SUMMARY: 4 errors from 4 contexts (suppressed: 0 from 0) Copied: trunk/drd/tests/tc04_free_lock.stderr.exp-x86 (from rev 12308, trunk/drd/tests/tc04_free_lock.stderr.exp) =================================================================== --- trunk/drd/tests/tc04_free_lock.stderr.exp-x86 (rev 0) +++ trunk/drd/tests/tc04_free_lock.stderr.exp-x86 2011-12-17 14:18:25 UTC (rev 12311) @@ -0,0 +1,34 @@ + +Destroying locked mutex: mutex 0x........, recursion count 1, owner 1. + at 0x........: free (vg_replace_malloc.c:...) + by 0x........: main (tc04_free_lock.c:24) +mutex 0x........ was first observed at: + at 0x........: pthread_mutex_init (drd_pthread_intercepts.c:?) + by 0x........: main (tc04_free_lock.c:20) + +Destroying locked mutex: mutex 0x........, recursion count 1, owner 1. + at 0x........: bar (tc04_free_lock.c:40) + by 0x........: main (tc04_free_lock.c:26) +mutex 0x........ was first observed at: + at 0x........: pthread_mutex_lock (drd_pthread_intercepts.c:?) + by 0x........: bar (tc04_free_lock.c:38) + by 0x........: main (tc04_free_lock.c:26) + +Destroying locked mutex: mutex 0x........, recursion count 1, owner 1. + at 0x........: foo (tc04_free_lock.c:49) + by 0x........: main (tc04_free_lock.c:27) +mutex 0x........ was first observed at: + at 0x........: pthread_mutex_init (drd_pthread_intercepts.c:?) + by 0x........: foo (tc04_free_lock.c:46) + by 0x........: main (tc04_free_lock.c:27) + +Destroying locked mutex: mutex 0x........, recursion count 1, owner 1. + at 0x........: bar (tc04_free_lock.c:40) + by 0x........: main (tc04_free_lock.c:28) +mutex 0x........ was first observed at: + at 0x........: pthread_mutex_lock (drd_pthread_intercepts.c:?) + by 0x........: bar (tc04_free_lock.c:38) + by 0x........: main (tc04_free_lock.c:28) + + +ERROR SUMMARY: 4 errors from 4 contexts (suppressed: 0 from 0) Deleted: trunk/drd/tests/tc09_bad_unlock.stderr.exp =================================================================== --- trunk/drd/tests/tc09_bad_unlock.stderr.exp 2011-12-17 12:59:45 UTC (rev 12310) +++ trunk/drd/tests/tc09_bad_unlock.stderr.exp 2011-12-17 14:18:25 UTC (rev 12311) @@ -1,59 +0,0 @@ - -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) -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) - -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........: 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) - -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) - -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) -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) - ---------------------- -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) -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) - -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) - -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) -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) - - -ERROR SUMMARY: 8 errors from 7 contexts (suppressed: 0 from 0) Added: trunk/drd/tests/tc09_bad_unlock.stderr.exp-ppc =================================================================== --- trunk/drd/tests/tc09_bad_unlock.stderr.exp-ppc (rev 0) +++ trunk/drd/tests/tc09_bad_unlock.stderr.exp-ppc 2011-12-17 14:18:25 UTC (rev 12311) @@ -0,0 +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) +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) + +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........: 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) + +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) + +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) +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) + +--------------------- +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) +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) + +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) + +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) +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) + + +ERROR SUMMARY: 8 errors from 7 contexts (suppressed: 0 from 0) Copied: trunk/drd/tests/tc09_bad_unlock.stderr.exp-x86 (from rev 12308, trunk/drd/tests/tc09_bad_unlock.stderr.exp) =================================================================== --- trunk/drd/tests/tc09_bad_unlock.stderr.exp-x86 (rev 0) +++ trunk/drd/tests/tc09_bad_unlock.stderr.exp-x86 2011-12-17 14:18:25 UTC (rev 12311) @@ -0,0 +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) +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) + +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........: 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) + +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) + +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) +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) + +--------------------- +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) +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) + +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) + +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) +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) + + +ERROR SUMMARY: 8 errors from 7 contexts (suppressed: 0 from 0) |