Darwin regtest: DRD filters and more suppressions

diff --git a/darwin17.supp b/darwin17.supp
index 528a9f139a0ac49d0461572d0398d5680a9f6b68..71d79d844ed80d86cc623e35095d271451f4337e 100644 (file)
--- a/darwin17.supp
+++ b/darwin17.supp
@@ -1056,3 +1056,42 @@
    fun:xpc_pipe_routine
 }
 
+{
+   OSX1013:drd:__si_module_static_cache_block_invoke
+   drd:MutexErr
+   fun:pthread_mutex_init
+   fun:__si_module_static_cache_block_invoke
+}
+
+{
+   OSX1013:drd:setlocale
+   drd:ConflictingAccess
+   ...
+   fun:setlocale
+}
+
+{
+   OSX1013:drd:std::__1::__thread_specific_ptr<std::__1::__thread_struct>::set_pointer(std::__1::__thread_struct*)
+
+   drd:ConflictingAccess
+   fun:_ZNSt3__121__thread_specific_ptrINS_15__thread_structEE11set_pointerEPS1_
+}
+
+{
+   OSX1013:drd:std::__1::__thread_local_data
+   drd:ConflictingAccess
+   fun:_ZNSt3__119__thread_local_dataEv
+}
+
+{
+   OSX1013:drd:get_counter
+   drd:ConflictingAccess
+   fun:_ZL11get_counterv
+}
+
+{
+   OSX1013:drd:gomp_barier_wait
+   drd:ConflictingAccess
+   fun:gomp_barrier_wait
+   fun:child
+}

diff --git a/drd/tests/filter_stderr.in b/drd/tests/filter_stderr.in
index fea9bcff9dccd73a1a0273d02d7c87614e4c3471..bde4e597abd43c3aa0bf0fd462873fe3d403c3eb 100644 (file)
--- a/drd/tests/filter_stderr.in
+++ b/drd/tests/filter_stderr.in
@@ -38,6 +38,7 @@ $SED \
 -e "s/[A-Za-z_]* (pthread_create.c:[0-9]*)/(within libpthread-?.?.so)/" \
 -e "s/[A-Za-z_]* (in [^ ]*libpthread-[0-9.]*\.so)/(within libpthread-?.?.so)/" \
 -e "s/... (in \/lib\/libthr.so.3)/start_thread/" \
+-e "s/_pthread_body (in \/...libc...)/start_thread/" \
 -e "s:(within /lib[0-9]*/ld-[0-9.]*\.so):(within ld-?.?.so):" \
 -e "s/was held during [0-9][0-9]*/was held during .../" \
 -e "s: BSS section of [^<]*/: BSS section of :g" \