[Libreoffice-commits] core.git: instsetoo_native/ooenv solenv/gbuild

[Noel Grandin (via logerrit)]

 instsetoo_native/ooenv           |    6 +++++-
 solenv/gbuild/platform/macosx.mk |    1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 302d85a931586313e04f82d206970dbc3bce9a47
Author:     Noel Grandin <noelgrandin at gmail.com>
AuthorDate: Wed Feb 19 21:45:35 2020 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Thu Feb 20 07:11:13 2020 +0100

    add macOS malloc debugging env vars
    
    which would have saved me some time when debugging a
    recent macOS issue.
    
    Change-Id: I370826501db14fc563b553428f480f50bde48f9e
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89056
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/instsetoo_native/ooenv b/instsetoo_native/ooenv
index d6087a40f39e..f37f6bb7b324 100644
--- a/instsetoo_native/ooenv
+++ b/instsetoo_native/ooenv
@@ -17,9 +17,13 @@
 #
 
 ulimit -c unlimited
-# debugging assistance
+# Linux debugging assistance
 export SAL_DISABLE_FLOATGRAB=1
 export G_SLICE=always-malloc
 export MALLOC_CHECK_=2
 export MALLOC_PERTURB_=153
 export OOO_DISABLE_RECOVERY=1
+
+# macOS debugging assistance
+export MallocScribble=1
+export MallocPreScribble=1
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index c850d3f068a3..2aaf1508c145 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -267,6 +267,7 @@ gb_CppunitTest_CPPTESTPRECOMMAND := \
 	$(call gb_Helper_extend_ld_path,$(gb_Library_DLLDIR):$(WORKDIR)/UnpackedTarball/cppunit/src/cppunit/.libs)
 gb_CppunitTest_get_filename = libtest_$(1).dylib
 gb_CppunitTest_get_ilibfilename = $(gb_CppunitTest_get_filename)
+gb_CppunitTest_malloc_check := MallocScribble=1 MallocPreScribble=1
 
 define gb_CppunitTest_CppunitTest_platform
 $(call gb_LinkTarget_get_target,$(2)) : RPATH :=