forked from osmocom/wireshark
Try to use smarter path resolution and detection in order to work in
environments that are not the build tree (namely the fuzz-bot, but this might make normal out-of-tree builds easier too). svn path=/trunk/; revision=51387
This commit is contained in:
parent
6538787c92
commit
5d8b79cff5
|
@ -73,7 +73,7 @@ shift $(($OPTIND - 1))
|
||||||
### usually you won't have to change anything below this line ###
|
### usually you won't have to change anything below this line ###
|
||||||
|
|
||||||
if [ $VALGRIND -eq 1 ]; then
|
if [ $VALGRIND -eq 1 ]; then
|
||||||
RUNNER="$BIN_DIR/tools/valgrind-wireshark.sh"
|
RUNNER="`dirname $0`/valgrind-wireshark.sh"
|
||||||
declare -a RUNNER_ARGS=("${CONFIG_PROFILE}${TWO_PASS}" "${CONFIG_PROFILE}${TWO_PASS}-T")
|
declare -a RUNNER_ARGS=("${CONFIG_PROFILE}${TWO_PASS}" "${CONFIG_PROFILE}${TWO_PASS}-T")
|
||||||
else
|
else
|
||||||
# Not using valgrind, use regular tshark.
|
# Not using valgrind, use regular tshark.
|
||||||
|
|
|
@ -89,4 +89,17 @@ export WIRESHARK_DEBUG_SE_NO_CHUNKS=
|
||||||
export WIRESHARK_DEBUG_WMEM_OVERRIDE=simple
|
export WIRESHARK_DEBUG_WMEM_OVERRIDE=simple
|
||||||
export G_SLICE=always-malloc # or debug-blocks
|
export G_SLICE=always-malloc # or debug-blocks
|
||||||
|
|
||||||
./libtool --mode=execute valgrind $TOOL $VERBOSE $LEAK_CHECK $REACHABLE $TRACK_ORIGINS $BIN_DIR/$COMMAND $COMMAND_ARGS $PCAP $COMMAND_ARGS2 > /dev/null
|
COMMAND="$BIN_DIR/$COMMAND"
|
||||||
|
|
||||||
|
if file $COMMAND | grep -q "ASCII text"; then
|
||||||
|
if [ -x "`dirname $0`/../libtool" ]; then
|
||||||
|
LIBTOOL="`dirname $0`/../libtool"
|
||||||
|
else
|
||||||
|
LIBTOOL="libtool"
|
||||||
|
fi
|
||||||
|
LIBTOOL="$LIBTOOL --mode=execute"
|
||||||
|
else
|
||||||
|
LIBTOOL=""
|
||||||
|
fi
|
||||||
|
|
||||||
|
$LIBTOOL valgrind $TOOL $VERBOSE $LEAK_CHECK $REACHABLE $TRACK_ORIGINS $COMMAND $COMMAND_ARGS $PCAP $COMMAND_ARGS2 > /dev/null
|
||||||
|
|
Loading…
Reference in New Issue