move OSX leak suppression to code

diff --git a/scripts/build/lsan_leaks_osx b/scripts/build/lsan_leaks_osx
deleted file mode 100644 (file)
index c1fff0a..0000000
--- a/scripts/build/lsan_leaks_osx
+++ /dev/null
@@ -1,14 +0,0 @@
-#  OSX has all kinds of leaks in its' system files
-#
-#  Note that you MUST include the `pwd`, otherwise LSAN looks in a directory relative
-#  to the binary, which is most definitely not what we want.
-#
-#export LSAN_OPTIONS="suppressions=`pwd`/scripts/lsan_leaks_osx fast_unwind_on_malloc=0 print_suppressions=0"
-#export CC="/usr/local/opt/llvm/bin/clang"
-#export ASAN_OPTIONS="malloc_context_size=50 detect_leaks=1 symbolize=1"
-#export ASAN_SYMBOLIZER_PATH="/usr/local/opt/llvm/bin/llvm-symbolizer"
-
-leak:libsystem_notify
-leak:getpwuid_r
-leak:_st_tzset_basic
-leak:newlocale

diff --git a/src/lib/util/debug.c b/src/lib/util/debug.c
index 5feaf740cf02e2497ed681984f3bfca74f8380f8..515fd14f5b6cb3182627db2502f16a7d6d97edae 100644 (file)
--- a/src/lib/util/debug.c
+++ b/src/lib/util/debug.c
@@ -161,12 +161,16 @@ char const CC_HINT(used) *__lsan_default_suppressions(void)
                "leak:CRYPTO_THREAD_lock_new\n"         /* OpenSSL init leak - reported by heaptrack */
 #if defined(__APPLE__)
                "leak:getaddrinfo\n"
+               "leak:getpwuid_r\n"
                "leak:*gmtsub*\n"
                "leak:tzsetwall_basic\n"
                "leak:ImageLoaderMachO::doImageInit\n"
                "leak:libSystem_atfork_child\n"
                "leak:fork\n"
                "leak:tzset\n"
+               "leak:_st_tzset_basic\n"
+               "leak:newlocale\n"
+               "leak:libsystem_notify\n"
                /* Perl >= 5.32.0 - Upstream bug, tracked by https://github.com/Perl/perl5/issues/18108 */
                "leak:perl_construct"
 #elif defined(__linux__)