From: Richard Mudgett <rmudgett@digium.com>
Date: Mon, 9 Jan 2012 18:54:56 +0000 (+0000)
Subject: live_ast: valgrind: run asterisk under valgrind
X-Git-Tag: 1.8.10.0-rc1~69
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8726d89f584073fd363f701f5fa3728350fd9766;p=thirdparty%2Fasterisk.git

live_ast: valgrind: run asterisk under valgrind

Adds a new sub-command, "valgrind" to live_ast. It runs asterisk under
valgrind. The extra command-line parameters are passed to Asterisk as
usual, and parameters to valgrind are passed through LIVE_AST_VALGRIND_ARGS
in live.conf .

Review: https://reviewboard.asterisk.org/r/1109/

Merged revisions 326636 from http://svn.asterisk.org/svn/asterisk/branches/10


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@350128 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/contrib/scripts/live_ast b/contrib/scripts/live_ast
index 0746c4127f..c5195c3d81 100755
--- a/contrib/scripts/live_ast
+++ b/contrib/scripts/live_ast
@@ -99,9 +99,9 @@
 # is run.
 #LIVE_AST_BRISTUFFED_LIBPRI=yes
 #
-# LIVE_AST_VALGRIND_ARGS
-# Extra parameters to be passed to valgrind in the 'valgrind' subcommand.
-#LIVE_AST_VALGRIND_ARGS="-v --leak-check=full --suppressions=$PWD/contrib/valgrind.supp"
+# LIVE_AST_VALGRIND_ARGS:
+# Parameters to pass to valgrind if using the 'valgrind' command.
+#LIVE_AST_VALGRIND_ARGS="-v --leak-check=full --suppressions=contrib/valgrind.supp --log-file=valgrind.log"
 #
 # LIVE_AST_FOR_SYSTEM
 # When generating asterisk.conf, use most components from the installed 
@@ -241,7 +241,7 @@ run)
   ;;
 valgrind)
   set_ld_env
-  valgrind $LIVE_AST_VALGRIND_ARGS --log-fd=9 -- $AST_BIN -C $AST_CONF "$@" 9>$PWD/live/valgrind.txt
+  valgrind $LIVE_AST_VALGRIND_ARGS $AST_BIN -C $AST_CONF "$@"
   ;;
 rsync)
   remote_host="$1"
@@ -269,8 +269,8 @@ gdb)
   echo "$0 install              make install"
   echo "$0 samples              make samples"
   echo "$0 run [params]         asterisk [params]"
-  echo "$0 valgrind [params]    valgrind -- asterisk [params]"
   echo "$0 gdb                  gdb asterisk"
+  echo "$0 valgrind             valgrind asterisk"
   echo "$0 rsync [user@]host dir  copy files over to [user@]host:dir"
   echo "$0 gen-live-asterisk    regenerate the wrapper ./live/asterisk"
   echo "$0 conf-file            create live.conf if it does not exist"