From: Paul Floyd Date: Wed, 24 Dec 2025 12:18:36 +0000 (+0100) Subject: DRD regtest: delete tc22_exit_w_lock 32bit variant, rename 64bit one X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7e77fe49cc2097f1cd6c472dab4b7530cbfafb4c;p=thirdparty%2Fvalgrind.git DRD regtest: delete tc22_exit_w_lock 32bit variant, rename 64bit one The 32bit one isn't used by FreeBSD x86. In the event that it is needed by some platform I'll put it back. --- diff --git a/drd/tests/Makefile.am b/drd/tests/Makefile.am index 151b114df..257edeef3 100644 --- a/drd/tests/Makefile.am +++ b/drd/tests/Makefile.am @@ -361,8 +361,7 @@ EXTRA_DIST = \ tc21_pthonce.stderr.exp \ tc21_pthonce.stdout.exp \ tc21_pthonce.vgtest \ - tc22_exit_w_lock.stderr.exp-32bit \ - tc22_exit_w_lock.stderr.exp-64bit \ + tc22_exit_w_lock.stderr.exp \ tc22_exit_w_lock.stderr.exp-solaris \ tc22_exit_w_lock.vgtest \ tc23_bogus_condwait.stderr.exp-linux-x86 \ diff --git a/drd/tests/tc22_exit_w_lock.stderr.exp-64bit b/drd/tests/tc22_exit_w_lock.stderr.exp similarity index 100% rename from drd/tests/tc22_exit_w_lock.stderr.exp-64bit rename to drd/tests/tc22_exit_w_lock.stderr.exp diff --git a/drd/tests/tc22_exit_w_lock.stderr.exp-32bit b/drd/tests/tc22_exit_w_lock.stderr.exp-32bit deleted file mode 100644 index 556312643..000000000 --- a/drd/tests/tc22_exit_w_lock.stderr.exp-32bit +++ /dev/null @@ -1,137 +0,0 @@ - -Conflicting load by thread 1 at 0x........ size 4 - at 0x........: __deallocate_stack (in libpthread-?.?.so) - by 0x........: __free_tcb (in libpthread-?.?.so) - by 0x........: pthread_join (in libpthread-?.?.so) - by 0x........: pthread_join (drd_pthread_intercepts.c:?) - by 0x........: main (tc22_exit_w_lock.c:43) -Allocation context: stack_cache_lock (offset 0, size 4) in libpthread-?.?.so, libpthread.so.0:BSS -Other segment start (thread 2) - (thread finished, call stack no longer available) -Other segment end (thread 2) - (thread finished, call stack no longer available) - -Conflicting store by thread 1 at 0x........ size 4 - at 0x........: __deallocate_stack (in libpthread-?.?.so) - by 0x........: __free_tcb (in libpthread-?.?.so) - by 0x........: pthread_join (in libpthread-?.?.so) - by 0x........: pthread_join (drd_pthread_intercepts.c:?) - by 0x........: main (tc22_exit_w_lock.c:43) -Allocation context: stack_cache_lock (offset 0, size 4) in libpthread-?.?.so, libpthread.so.0:BSS -Other segment start (thread 2) - (thread finished, call stack no longer available) -Other segment end (thread 2) - (thread finished, call stack no longer available) - -Conflicting store by thread 1 at 0x........ size 4 - at 0x........: __deallocate_stack (in libpthread-?.?.so) - by 0x........: __free_tcb (in libpthread-?.?.so) - by 0x........: pthread_join (in libpthread-?.?.so) - by 0x........: pthread_join (drd_pthread_intercepts.c:?) - by 0x........: main (tc22_exit_w_lock.c:43) -Allocation context: stack_used (offset 4, size 8) in libpthread-?.?.so, libpthread.so.0:Data -Other segment start (thread 2) - (thread finished, call stack no longer available) -Other segment end (thread 2) - (thread finished, call stack no longer available) - -Conflicting store by thread 1 at 0x........ size 4 - at 0x........: __deallocate_stack (in libpthread-?.?.so) - by 0x........: __free_tcb (in libpthread-?.?.so) - by 0x........: pthread_join (in libpthread-?.?.so) - by 0x........: pthread_join (drd_pthread_intercepts.c:?) - by 0x........: main (tc22_exit_w_lock.c:43) -Allocation context: stack_used (offset 0, size 8) in libpthread-?.?.so, libpthread.so.0:Data -Other segment start (thread 2) - (thread finished, call stack no longer available) -Other segment end (thread 2) - (thread finished, call stack no longer available) - -Conflicting load by thread 1 at 0x........ size 4 - at 0x........: __deallocate_stack (in libpthread-?.?.so) - by 0x........: __free_tcb (in libpthread-?.?.so) - by 0x........: pthread_join (in libpthread-?.?.so) - by 0x........: pthread_join (drd_pthread_intercepts.c:?) - by 0x........: main (tc22_exit_w_lock.c:43) -Allocation context: stack_cache (offset 0, size 8) in libpthread-?.?.so, libpthread.so.0:Data -Other segment start (thread 2) - (thread finished, call stack no longer available) -Other segment end (thread 2) - (thread finished, call stack no longer available) - -Conflicting store by thread 1 at 0x........ size 4 - at 0x........: __deallocate_stack (in libpthread-?.?.so) - by 0x........: __free_tcb (in libpthread-?.?.so) - by 0x........: pthread_join (in libpthread-?.?.so) - by 0x........: pthread_join (drd_pthread_intercepts.c:?) - by 0x........: main (tc22_exit_w_lock.c:43) -Allocation context: stack_cache (offset 4, size 8) in libpthread-?.?.so, libpthread.so.0:Data -Other segment start (thread 2) - (thread finished, call stack no longer available) -Other segment end (thread 2) - (thread finished, call stack no longer available) - -Conflicting load by thread 1 at 0x........ size 4 - at 0x........: __deallocate_stack (in libpthread-?.?.so) - by 0x........: __free_tcb (in libpthread-?.?.so) - by 0x........: pthread_join (in libpthread-?.?.so) - by 0x........: pthread_join (drd_pthread_intercepts.c:?) - by 0x........: main (tc22_exit_w_lock.c:43) -Allocation context: stack_cache_actsize (offset 0, size 4) in libpthread-?.?.so, libpthread.so.0:BSS -Other segment start (thread 2) - (thread finished, call stack no longer available) -Other segment end (thread 2) - (thread finished, call stack no longer available) - -Conflicting store by thread 1 at 0x........ size 4 - at 0x........: __deallocate_stack (in libpthread-?.?.so) - by 0x........: __free_tcb (in libpthread-?.?.so) - by 0x........: pthread_join (in libpthread-?.?.so) - by 0x........: pthread_join (drd_pthread_intercepts.c:?) - by 0x........: main (tc22_exit_w_lock.c:43) -Allocation context: stack_cache (offset 0, size 8) in libpthread-?.?.so, libpthread.so.0:Data -Other segment start (thread 2) - (thread finished, call stack no longer available) -Other segment end (thread 2) - (thread finished, call stack no longer available) - -Conflicting store by thread 1 at 0x........ size 4 - at 0x........: __deallocate_stack (in libpthread-?.?.so) - by 0x........: __free_tcb (in libpthread-?.?.so) - by 0x........: pthread_join (in libpthread-?.?.so) - by 0x........: pthread_join (drd_pthread_intercepts.c:?) - by 0x........: main (tc22_exit_w_lock.c:43) -Allocation context: stack_cache_actsize (offset 0, size 4) in libpthread-?.?.so, libpthread.so.0:BSS -Other segment start (thread 2) - (thread finished, call stack no longer available) -Other segment end (thread 2) - (thread finished, call stack no longer available) - -Conflicting load by thread 1 at 0x........ size 4 - at 0x........: __deallocate_stack (in libpthread-?.?.so) - by 0x........: __free_tcb (in libpthread-?.?.so) - by 0x........: pthread_join (in libpthread-?.?.so) - by 0x........: pthread_join (drd_pthread_intercepts.c:?) - by 0x........: main (tc22_exit_w_lock.c:43) -Allocation context: stack_cache_lock (offset 0, size 4) in libpthread-?.?.so, libpthread.so.0:BSS -Other segment start (thread 2) - (thread finished, call stack no longer available) -Other segment end (thread 2) - (thread finished, call stack no longer available) - -Conflicting store by thread 1 at 0x........ size 4 - at 0x........: __deallocate_stack (in libpthread-?.?.so) - by 0x........: __free_tcb (in libpthread-?.?.so) - by 0x........: pthread_join (in libpthread-?.?.so) - by 0x........: pthread_join (drd_pthread_intercepts.c:?) - by 0x........: main (tc22_exit_w_lock.c:43) -Allocation context: stack_cache_lock (offset 0, size 4) in libpthread-?.?.so, libpthread.so.0:BSS -Other segment start (thread 2) - (thread finished, call stack no longer available) -Other segment end (thread 2) - (thread finished, call stack no longer available) - -Mutex still locked at thread exit: address 0x........, recursion count 1, owner 3. - at 0x........: pthread_join (drd_pthread_intercepts.c:?) - by 0x........: main (tc22_exit_w_lock.c:43) -