diff options
| author | Dario Lombardo <lomato@gmail.com> | 2016-02-07 15:01:28 +0100 |
|---|---|---|
| committer | Evan Huus <eapache@gmail.com> | 2016-02-08 15:24:02 +0000 |
| commit | 22a569ad3acd0833e593c02813edd8fe2eb73b3e (patch) | |
| tree | b2c4263b189f489203efa06e751a649352fa9d8a /tools | |
| parent | 23c6241e52818586d63583830bf18dfa08edc1fc (diff) | |
tools: improve valgrind script.
Change-Id: Ifae62e6334b48002516dfff6d1c2f094445f423c
Reviewed-on: https://code.wireshark.org/review/13820
Reviewed-by: Evan Huus <eapache@gmail.com>
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/valgrind-wireshark.sh | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/tools/valgrind-wireshark.sh b/tools/valgrind-wireshark.sh index ab888be8f3..cc6a9c8004 100755 --- a/tools/valgrind-wireshark.sh +++ b/tools/valgrind-wireshark.sh @@ -36,9 +36,10 @@ VALID=0 PCAP="" TOOL="memcheck" -while getopts ":2b:C:lmnpP:rtTYwcevWdG" OPTCHAR ; do +while getopts ":2a:b:C:lmnpP:rstTYwcevWdG" OPTCHAR ; do case $OPTCHAR in 2) COMMAND_ARGS="-2 $COMMAND_ARGS" ;; + a) ADDITIONAL_SUPPRESSION_FILE="--suppressions=$OPTARG" ;; b) WIRESHARK_BIN_DIR=$OPTARG ;; C) COMMAND_ARGS="-C $OPTARG $COMMAND_ARGS" ;; l) LEAK_CHECK="--leak-check=full" ;; @@ -49,6 +50,7 @@ while getopts ":2b:C:lmnpP:rtTYwcevWdG" OPTCHAR ; do P) TOOL="callgrind" CALLGRIND_OUT_FILE="--callgrind-out-file=$OPTARG" ;; r) REACHABLE="--show-reachable=yes" ;; + s) GEN_SUPPRESSIONS="--gen-suppressions=yes" ;; t) TRACK_ORIGINS="--track-origins=yes" ;; T) COMMAND_ARGS="-Vx $COMMAND_ARGS" ;; # "build the Tree" Y) COMMAND_ARGS="-Y frame $COMMAND_ARGS" ;; # Run with a read filter (but no tree) @@ -84,7 +86,7 @@ fi if [ $VALID -eq 0 ] then - printf "Usage: $0 [-2] [-b bin_dir] [-c] [-e] [-C config_profile] [-l] [-m] [-n] [-p] [-r] [-t] [-T] [-w] [-v] /path/to/file.pcap\n" + printf "Usage: $0 [-2] [-a file] [-b bin_dir] [-c] [-e] [-C config_profile] [-l] [-m] [-n] [-p] [-r] [-s] [-t] [-T] [-w] [-v] /path/to/file.pcap\n" exit 1 fi @@ -110,4 +112,12 @@ else LIBTOOL="" fi -$LIBTOOL valgrind --suppressions=`dirname $0`/vg-suppressions --tool=$TOOL $CALLGRIND_OUT_FILE $VERBOSE $LEAK_CHECK $REACHABLE $TRACK_ORIGINS $COMMAND $COMMAND_ARGS $PCAP $COMMAND_ARGS2 > /dev/null +cmdline="$LIBTOOL valgrind --suppressions=`dirname $0`/vg-suppressions $ADDITIONAL_SUPPRESSION_FILE \ +--tool=$TOOL $CALLGRIND_OUT_FILE $VERBOSE $LEAK_CHECK $REACHABLE $GEN_SUPPRESSIONS $TRACK_ORIGINS \ +$COMMAND $COMMAND_ARGS $PCAP $COMMAND_ARGS2" + +if [ $VERBOSE ];then + echo -e "\n$cmdline\n" +fi + +$cmdline > /dev/null |