Reverse the arguments we feed to valgrind-wireshark.sh. Add debugging

output.

svn path=/trunk/; revision=48895
This commit is contained in:
Gerald Combs 2013-04-17 17:23:41 +00:00
parent b2f0991616
commit b25fa89125

View File

@ -50,7 +50,7 @@ shift $(($OPTIND - 1))
if [ $VALGRIND -eq 1 ]; then
RUNNER="$BIN_DIR/tools/valgrind-wireshark.sh"
declare -a RUNNER_ARGS=("${CONFIG_PROFILE}${TWO_PASS}" "${CONFIG_PROFILE}${TWO_PASS}-T")
declare -a RUNNER_ARGS=("${CONFIG_PROFILE}${TWO_PASS}-T" "${CONFIG_PROFILE}${TWO_PASS}")
else
# Not using valgrind, use regular tshark.
# TShark arguments (you won't have to change these)
@ -156,6 +156,7 @@ while [ \( $PASS -lt $MAX_PASSES -o $MAX_PASSES -lt 1 \) -a $DONE -ne 1 ] ; do
fi
fi
echo "RUNNER_ARGS:" "${RUNNER_ARGS[@]}"
for ARGS in "${RUNNER_ARGS[@]}" ; do
echo -n "($ARGS) "
echo -e "Command and args: $RUNNER $ARGS\n" > $TMP_DIR/$ERR_FILE
@ -166,7 +167,7 @@ while [ \( $PASS -lt $MAX_PASSES -o $MAX_PASSES -lt 1 \) -a $DONE -ne 1 ] ; do
(
ulimit -S -t $MAX_CPU_TIME -v $MAX_VMEM -s $MAX_STACK
ulimit -c unlimited
"$RUNNER" $ARGS $TMP_DIR/$TMP_FILE \
> /dev/null 2>> $TMP_DIR/$ERR_FILE
)