From: Bart Van Assche Date: Tue, 26 Feb 2008 12:52:00 +0000 (+0000) Subject: Summarized multiple pth_barrier.stderr.exp* output files into one. X-Git-Tag: svn/VALGRIND_3_4_0~1029 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5af4c3f463883dafadc5fb3de4e8d5492204aebd;p=thirdparty%2Fvalgrind.git Summarized multiple pth_barrier.stderr.exp* output files into one. git-svn-id: svn://svn.valgrind.org/valgrind/trunk@7472 --- diff --git a/exp-drd/tests/Makefile.am b/exp-drd/tests/Makefile.am index dea593111b..f5980eeb18 100644 --- a/exp-drd/tests/Makefile.am +++ b/exp-drd/tests/Makefile.am @@ -5,9 +5,13 @@ SUBDIRS = . DIST_SUBDIRS = . -noinst_SCRIPTS = \ - filter_cmdline0 filter_linenos \ - filter_fdleak filter_none_discards filter_stderr +noinst_SCRIPTS = \ + filter_cmdline0 \ + filter_error_summary \ + filter_fdleak \ + filter_linenos \ + filter_none_discards \ + filter_stderr EXTRA_DIST = $(noinst_SCRIPTS) \ fp_race.vgtest \ @@ -21,8 +25,10 @@ EXTRA_DIST = $(noinst_SCRIPTS) \ hg02_deadlock.stderr.exp \ hg03_inherit.vgtest \ hg03_inherit.stderr.exp \ + hg03_inherit.stderr.exp2 \ hg04_race.vgtest \ hg04_race.stderr.exp \ + hg04_race.stderr.exp2 \ hg05_race2.vgtest \ hg05_race2.stderr.exp \ hg06_readshared.vgtest \ @@ -49,6 +55,7 @@ EXTRA_DIST = $(noinst_SCRIPTS) \ sem_as_mutex2.stderr.exp \ tc01_simple_race.vgtest \ tc01_simple_race.stderr.exp \ + tc01_simple_race.stderr.exp2 \ tc02_simple_tls.vgtest \ tc02_simple_tls.stderr.exp \ tc03_re_excl.vgtest \ @@ -57,12 +64,14 @@ EXTRA_DIST = $(noinst_SCRIPTS) \ tc04_free_lock.stderr.exp \ tc07_hbl1.vgtest \ tc07_hbl1.stderr.exp tc07_hbl1.stdout.exp \ + tc07_hbl1.stderr.exp2 \ tc09_bad_unlock.vgtest \ tc09_bad_unlock.stderr.exp \ tc10_rec_lock.vgtest \ tc10_rec_lock.stderr.exp \ tc11_XCHG.vgtest \ tc11_XCHG.stderr.exp tc11_XCHG.stdout.exp \ + tc11_XCHG.stderr.exp2 \ tc12_rwl_trivial.vgtest \ tc12_rwl_trivial.stderr.exp \ tc13_laog1.vgtest \ @@ -71,6 +80,7 @@ EXTRA_DIST = $(noinst_SCRIPTS) \ tc15_laog_lockdel.stderr.exp \ tc16_byterace.vgtest \ tc16_byterace.stderr.exp \ + tc16_byterace.stderr.exp2 \ tc17_sembar.vgtest \ tc17_sembar.stderr.exp \ tc18_semabuse.vgtest \ @@ -79,10 +89,12 @@ EXTRA_DIST = $(noinst_SCRIPTS) \ tc19_shadowmem.stderr.exp \ tc20_verifywrap.vgtest \ tc20_verifywrap.stderr.exp \ + tc20_verifywrap.stderr.exp2 \ tc21_pthonce.vgtest \ tc21_pthonce.stderr.exp tc21_pthonce.stdout.exp \ tc22_exit_w_lock.vgtest \ tc22_exit_w_lock.stderr.exp \ + tc22_exit_w_lock.stderr.exp-32bit \ tc23_bogus_condwait.vgtest \ tc23_bogus_condwait.stderr.exp \ tc24_nonzero_sem.vgtest \ diff --git a/exp-drd/tests/filter_error_summary b/exp-drd/tests/filter_error_summary new file mode 100755 index 0000000000..08d6fcd58c --- /dev/null +++ b/exp-drd/tests/filter_error_summary @@ -0,0 +1,6 @@ +#!/bin/sh + +# Filter the error output of Valgrind such that only the line with the error +# summary is kept. Bart Van Assche, February 26, 2008. + +sed -n -e 's/^.*\(ERROR SUMMARY.*\)$/\1/' -e '/ERROR SUMMARY/p' diff --git a/exp-drd/tests/pth_barrier.stderr.exp b/exp-drd/tests/pth_barrier.stderr.exp new file mode 100644 index 0000000000..5246717584 --- /dev/null +++ b/exp-drd/tests/pth_barrier.stderr.exp @@ -0,0 +1 @@ +ERROR SUMMARY: 1 errors from 1 contexts (suppressed: 5 from 2) diff --git a/exp-drd/tests/pth_barrier.stderr.exp-thread2 b/exp-drd/tests/pth_barrier.stderr.exp-thread2 deleted file mode 100644 index f8b48aca6d..0000000000 --- a/exp-drd/tests/pth_barrier.stderr.exp-thread2 +++ /dev/null @@ -1,23 +0,0 @@ - -Thread 2: -Conflicting store by thread 2 at 0x........ size 4 - at 0x........: threadfunc (pth_barrier.c:?) - by 0x........: vg_thread_wrapper (drd_intercepts.c:?) - by 0x........: start_thread (in libpthread-?.?.so) - by 0x........: clone (in /...libc...) -Allocation context: unknown -Other segment start (thread 3) - at 0x........: pthread_barrier_wait (drd_intercepts.c:?) - by 0x........: threadfunc (pth_barrier.c:?) - by 0x........: vg_thread_wrapper (drd_intercepts.c:?) - by 0x........: start_thread (in libpthread-?.?.so) - by 0x........: clone (in /...libc...) -Other segment end (thread 3) - at 0x........: __lll_mutex_lock_wait (in libpthread-?.?.so) - by 0x........: pthread_barrier_wait (in libpthread-?.?.so) - by 0x........: threadfunc (pth_barrier.c:?) - by 0x........: vg_thread_wrapper (drd_intercepts.c:?) - by 0x........: start_thread (in libpthread-?.?.so) - by 0x........: clone (in /...libc...) - -ERROR SUMMARY: 1 errors from 1 contexts (suppressed: 0 from 0) diff --git a/exp-drd/tests/pth_barrier.stderr.exp-thread2b b/exp-drd/tests/pth_barrier.stderr.exp-thread2b deleted file mode 100644 index dbcead415a..0000000000 --- a/exp-drd/tests/pth_barrier.stderr.exp-thread2b +++ /dev/null @@ -1,25 +0,0 @@ - -Thread 2: -Conflicting store by thread 2 at 0x........ size 4 - at 0x........: threadfunc (pth_barrier.c:?) - by 0x........: vg_thread_wrapper (drd_intercepts.c:?) - by 0x........: start_thread (in libpthread-?.?.so) - by 0x........: clone (in /...libc...) -Allocation context: heap, offset 0 in block at 0x........ of size 4 - at 0x........: malloc (vg_replace_malloc.c:...) - by 0x........: barriers_and_races (pth_barrier.c:?) - by 0x........: main (pth_barrier.c:?) -Other segment start (thread 3) - at 0x........: pthread_barrier_wait (drd_intercepts.c:?) - by 0x........: threadfunc (pth_barrier.c:?) - by 0x........: vg_thread_wrapper (drd_intercepts.c:?) - by 0x........: start_thread (in libpthread-?.?.so) - by 0x........: clone (in /...libc...) -Other segment end (thread 3) - at 0x........: __lll_lock_wait (in libpthread-?.?.so) - by 0x........: threadfunc (pth_barrier.c:?) - by 0x........: vg_thread_wrapper (drd_intercepts.c:?) - by 0x........: start_thread (in libpthread-?.?.so) - by 0x........: clone (in /...libc...) - -ERROR SUMMARY: 1 errors from 1 contexts (suppressed: 0 from 0) diff --git a/exp-drd/tests/pth_barrier.stderr.exp-thread3 b/exp-drd/tests/pth_barrier.stderr.exp-thread3 deleted file mode 100644 index 92b698f64a..0000000000 --- a/exp-drd/tests/pth_barrier.stderr.exp-thread3 +++ /dev/null @@ -1,25 +0,0 @@ - -Thread 3: -Conflicting store by thread 3 at 0x........ size 4 - at 0x........: threadfunc (pth_barrier.c:?) - by 0x........: vg_thread_wrapper (drd_intercepts.c:?) - by 0x........: start_thread (in libpthread-?.?.so) - by 0x........: clone (in /...libc...) -Allocation context: heap, offset 0 in block at 0x........ of size 4 - at 0x........: malloc (vg_replace_malloc.c:...) - by 0x........: barriers_and_races (pth_barrier.c:?) - by 0x........: main (pth_barrier.c:?) -Other segment start (thread 2) - at 0x........: pthread_barrier_wait (drd_intercepts.c:?) - by 0x........: threadfunc (pth_barrier.c:?) - by 0x........: vg_thread_wrapper (drd_intercepts.c:?) - by 0x........: start_thread (in libpthread-?.?.so) - by 0x........: clone (in /...libc...) -Other segment end (thread 2) - at 0x........: pthread_barrier_wait (in libpthread-?.?.so) - by 0x........: threadfunc (pth_barrier.c:?) - by 0x........: vg_thread_wrapper (drd_intercepts.c:?) - by 0x........: start_thread (in libpthread-?.?.so) - by 0x........: clone (in /...libc...) - -ERROR SUMMARY: 1 errors from 1 contexts (suppressed: 0 from 0) diff --git a/exp-drd/tests/pth_barrier.vgtest b/exp-drd/tests/pth_barrier.vgtest index 0c7d29dc9d..fce5b7a1af 100644 --- a/exp-drd/tests/pth_barrier.vgtest +++ b/exp-drd/tests/pth_barrier.vgtest @@ -1,2 +1,3 @@ prog: pth_barrier args: 2 1 1 +stderr_filter: filter_error_summary diff --git a/exp-drd/tests/tc20_verifywrap.stderr.exp b/exp-drd/tests/tc20_verifywrap.stderr.exp index 2ad249863d..504ce2648b 100644 --- a/exp-drd/tests/tc20_verifywrap.stderr.exp +++ b/exp-drd/tests/tc20_verifywrap.stderr.exp @@ -7,7 +7,7 @@ Conflicting store by thread 1 at 0x........ size 2 at 0x........: main (tc20_verifywrap.c:78) -Allocation context: unknown +Allocation context: unprotected (offset 0, size 2) in tc20_verifywrap, NONE:BSS Other segment start (thread 2) (thread finished, call stack no longer available) Other segment end (thread 2) diff --git a/exp-drd/tests/tc20_verifywrap.stderr.exp2 b/exp-drd/tests/tc20_verifywrap.stderr.exp2 new file mode 100644 index 0000000000..2ad249863d --- /dev/null +++ b/exp-drd/tests/tc20_verifywrap.stderr.exp2 @@ -0,0 +1,63 @@ + + + +------ This is output for >= glibc 2.4 ------ + +---------------- pthread_create/join ---------------- + +Conflicting store by thread 1 at 0x........ size 2 + at 0x........: main (tc20_verifywrap.c:78) +Allocation context: unknown +Other segment start (thread 2) + (thread finished, call stack no longer available) +Other segment end (thread 2) + (thread finished, call stack no longer available) + +---------------- pthread_mutex_lock et al ---------------- + + +Destroying locked mutex / mutex 0x........ (recursion count 1, owner 1) + at 0x........: pthread_mutex_destroy (drd_intercepts.c:?) + by 0x........: main (tc20_verifywrap.c:102) + +Not a mutex / mutex 0x........ (recursion count 0, owner 0) + at 0x........: pthread_mutex_unlock (drd_intercepts.c:?) + by 0x........: main (tc20_verifywrap.c:125) + +---------------- pthread_cond_wait et al ---------------- + + +Not a mutex / mutex 0x........ (recursion count 0, owner 0) + at 0x........: pthread_cond_wait* (drd_intercepts.c:?) + by 0x........: main (tc20_verifywrap.c:147) + +FIXME: can't figure out how to verify wrap of pthread_cond_signal + + +FIXME: can't figure out how to verify wrap of pthread_broadcast_signal + + +---------------- pthread_rwlock_* ---------------- + +(1) no error on next line +(2) no error on next line +(3) ERROR on next line +(4) no error on next line +(5) no error on next line +(6) no error on next line +(7) no error on next line +(8) ERROR on next line + +---------------- sem_* ---------------- + + +FIXME: can't figure out how to verify wrap of sem_destroy + + +FIXME: can't figure out how to verify wrap of sem_post + + +------------ dealloc of mem holding locks ------------ + + +ERROR SUMMARY: 4 errors from 4 contexts (suppressed: 0 from 0)