From 8e8d3a7117b66f3aec970a0ef14c6a9970591442 Mon Sep 17 00:00:00 2001 From: msweet Date: Wed, 20 Aug 2014 15:10:51 +0000 Subject: [PATCH] Fix libgmalloc usage (although the report is still not too useful - need to do more here...) git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@12101 a1ca3aef-8c08-0410-bb20-df032aa958be --- test/run-stp-tests.sh | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh index 47e93b238..7d20831b4 100755 --- a/test/run-stp-tests.sh +++ b/test/run-stp-tests.sh @@ -766,6 +766,13 @@ for file in 5*.sh; do fi done +# +# Log all allocations made by the scheduler... +# +if test `uname` = Darwin -a "x$VALGRIND" = x; then + malloc_history $cupsd -callTree -showContent >$BASE/log/malloc_log 2>&1 +fi + # # Restart the server... # @@ -777,12 +784,12 @@ echo "\"5.10-restart\":" >>$strfile kill -HUP $cupsd while true; do + sleep 10 + running=`../systemv/lpstat -r 2>/dev/null` if test "x$running" = "xscheduler is running"; then break fi - - sleep 10 done description="`lpstat -l -p Test1 | grep Description | sed -e '1,$s/^[^:]*: //g'`" @@ -797,13 +804,6 @@ fi echo "" >>$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... # -- 2.39.2