From: Julian Seward Date: Mon, 14 Oct 2013 14:09:35 +0000 (+0000) Subject: Update expected output following r13642, which fixes #323432 X-Git-Tag: svn/VALGRIND_3_9_0~48 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a2190960882689a94fc6b4d2114e23807ade73a6;p=thirdparty%2Fvalgrind.git Update expected output following r13642, which fixes #323432 (When calling pthread_cond_destroy or pthread_mutex_destroy with initializers as argument Helgrind (incorrectly) reports errors.) This introduces a new race report (but no new race) in some conditions. I think this is OK because the race only occurs in the case where the program is buggy (racey) anyway. git-svn-id: svn://svn.valgrind.org/valgrind/trunk@13643 --- diff --git a/helgrind/tests/pth_cond_destroy_busy.stderr.exp b/helgrind/tests/pth_cond_destroy_busy.stderr.exp index 6ffa3c2cd5..f8de191b7a 100644 --- a/helgrind/tests/pth_cond_destroy_busy.stderr.exp +++ b/helgrind/tests/pth_cond_destroy_busy.stderr.exp @@ -3,6 +3,32 @@ Thread #x is the program's root thread +---Thread-Announcement------------------------------------------ + +Thread #x was created + ... + by 0x........: pthread_create_WRK (hg_intercepts.c:...) + by 0x........: pthread_create@* (hg_intercepts.c:...) + by 0x........: main (pth_cond_destroy_busy.c:45) + +---------------------------------------------------------------- + +Possible data race during read of size 1 at 0x........ by thread #x +Locks held: none + at 0x........: my_memcmp (hg_intercepts.c:...) + by 0x........: pthread_cond_destroy_WRK (hg_intercepts.c:...) + by 0x........: pthread_cond_destroy@* (hg_intercepts.c:...) + by 0x........: main (pth_cond_destroy_busy.c:52) + +This conflicts with a previous write of size 4 by thread #x +Locks held: none + ... + by 0x........: pthread_cond_wait_WRK (hg_intercepts.c:...) + by 0x........: pthread_cond_wait@* (hg_intercepts.c:...) + by 0x........: thread_func (pth_cond_destroy_busy.c:31) + by 0x........: mythread_wrapper (hg_intercepts.c:...) + ... + ---------------------------------------------------------------- Thread #x: pthread_cond_destroy: destruction of condition variable being waited upon @@ -21,4 +47,4 @@ Thread #x's call to pthread_cond_destroy failed First pthread_cond_destroy() call returned EBUSY. Second pthread_cond_destroy() call returned success. -ERROR SUMMARY: 2 errors from 2 contexts (suppressed: 0 from 0) +ERROR SUMMARY: 3 errors from 3 contexts (suppressed: 0 from 0)