From 571ec74b4ea2f698ab22b8f326466df0571f593b Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Sat, 17 Dec 2011 14:18:25 +0000 Subject: [PATCH] DRD: add two ppc output variants git-svn-id: svn://svn.valgrind.org/valgrind/trunk@12311 --- drd/tests/Makefile.am | 6 +- drd/tests/tc04_free_lock.stderr.exp-ppc | 34 +++++++++++ ...derr.exp => tc04_free_lock.stderr.exp-x86} | 0 drd/tests/tc09_bad_unlock.stderr.exp-ppc | 59 +++++++++++++++++++ ...err.exp => tc09_bad_unlock.stderr.exp-x86} | 0 5 files changed, 97 insertions(+), 2 deletions(-) create mode 100644 drd/tests/tc04_free_lock.stderr.exp-ppc rename drd/tests/{tc04_free_lock.stderr.exp => tc04_free_lock.stderr.exp-x86} (100%) create mode 100644 drd/tests/tc09_bad_unlock.stderr.exp-ppc rename drd/tests/{tc09_bad_unlock.stderr.exp => tc09_bad_unlock.stderr.exp-x86} (100%) diff --git a/drd/tests/Makefile.am b/drd/tests/Makefile.am index fe8a6e0796..d427b3e438 100644 --- a/drd/tests/Makefile.am +++ b/drd/tests/Makefile.am @@ -229,7 +229,8 @@ EXTRA_DIST = \ 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 @@ EXTRA_DIST = \ 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 \ diff --git a/drd/tests/tc04_free_lock.stderr.exp-ppc b/drd/tests/tc04_free_lock.stderr.exp-ppc new file mode 100644 index 0000000000..50304a0ac8 --- /dev/null +++ b/drd/tests/tc04_free_lock.stderr.exp-ppc @@ -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) diff --git a/drd/tests/tc04_free_lock.stderr.exp b/drd/tests/tc04_free_lock.stderr.exp-x86 similarity index 100% rename from drd/tests/tc04_free_lock.stderr.exp rename to drd/tests/tc04_free_lock.stderr.exp-x86 diff --git a/drd/tests/tc09_bad_unlock.stderr.exp-ppc b/drd/tests/tc09_bad_unlock.stderr.exp-ppc new file mode 100644 index 0000000000..0be4db6eac --- /dev/null +++ b/drd/tests/tc09_bad_unlock.stderr.exp-ppc @@ -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) diff --git a/drd/tests/tc09_bad_unlock.stderr.exp b/drd/tests/tc09_bad_unlock.stderr.exp-x86 similarity index 100% rename from drd/tests/tc09_bad_unlock.stderr.exp rename to drd/tests/tc09_bad_unlock.stderr.exp-x86 -- 2.47.2