From: msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Date: Wed, 6 Aug 2014 18:23:12 +0000 (+0000)
Subject: Add libgmalloc and malloc_history to the test suite on OS X.
X-Git-Tag: v2.2b1~534
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dc69e13abdfc0ca7b818b127f0c30df3b056bca6;p=thirdparty%2Fcups.git

Add libgmalloc and malloc_history to the test suite on OS X.


git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@12084 a1ca3aef-8c08-0410-bb20-df032aa958be
---

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index 641e03b780..47e93b238d 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -623,8 +623,7 @@ echo "    $VALGRIND ../scheduler/cupsd -c $BASE/cupsd.conf -f >$BASE/log/debug_l
 echo ""
 
 if test `uname` = Darwin -a "x$VALGRIND" = x; then
-	DYLD_INSERT_LIBRARIES=/usr/lib/libgmalloc.dylib
-	../scheduler/cupsd -c $BASE/cupsd.conf -f >$BASE/log/debug_log 2>&1 &
+	DYLD_INSERT_LIBRARIES=/usr/lib/libgmalloc.dylib MallocStackLogging=1 ../scheduler/cupsd -c $BASE/cupsd.conf -f >$BASE/log/debug_log 2>&1 &
 else
 	$VALGRIND ../scheduler/cupsd -c $BASE/cupsd.conf -f >$BASE/log/debug_log 2>&1 &
 fi
@@ -798,6 +797,13 @@ fi
 
 echo "</PRE>" >>$strfile
 
+if test `uname` = Darwin -a "x$VALGRIND" = x; then
+	#
+	# Log all allocations made by the scheduler...
+	#
+	malloc_history $cupsd -highWaterMark -callTree -showContent >$BASE/log/malloc_log
+fi
+
 #
 # Stop the server...
 #