diff options
author | Evan Huus <eapache@gmail.com> | 2015-06-25 23:48:48 -0700 |
---|---|---|
committer | Evan Huus <eapache@gmail.com> | 2015-06-26 06:52:58 +0000 |
commit | 8f40e2cd8dc335fa9c927dba38000f8dde8e0b98 (patch) | |
tree | 88056d3047ae6a53e2a43d878a607a0673911c5b /tools/fuzz-test.sh | |
parent | 4975c068b53d5061f032caf4d0e1094bce03096b (diff) |
tools: permit setting BIN_DIR in the environment
For out-of-tree builds you have to pass the location of your build to our tools
like the fuzz script, valgrind script etc. Modify them so that the value can be
set in the environment rather than requiring a shell script flag.
Set the environment variable in the vagrant provision step, so that the scripts
Just Work (TM) in the VM.
Change-Id: If8ce6b278176085ba6dd994137b82fc989b80124
Reviewed-on: https://code.wireshark.org/review/9168
Reviewed-by: Evan Huus <eapache@gmail.com>
Diffstat (limited to 'tools/fuzz-test.sh')
-rwxr-xr-x | tools/fuzz-test.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/fuzz-test.sh b/tools/fuzz-test.sh index f31ec987d9..7293b149f9 100755 --- a/tools/fuzz-test.sh +++ b/tools/fuzz-test.sh @@ -58,7 +58,7 @@ while getopts "2b:C:d:e:agp:P:" OPTCHAR ; do case $OPTCHAR in a) ASAN=1 ;; 2) TWO_PASS="-2 " ;; - b) BIN_DIR=$OPTARG ;; + b) WIRESHARK_BIN_DIR=$OPTARG ;; C) CONFIG_PROFILE="-C $OPTARG " ;; d) TMP_DIR=$OPTARG ;; e) ERR_PROB=$OPTARG ;; @@ -77,7 +77,7 @@ ws_check_exec "$TSHARK" "$EDITCAP" "$CAPINFOS" "$DATE" "$TMP_DIR" COMMON_ARGS="${CONFIG_PROFILE}${TWO_PASS}" if [ $VALGRIND -eq 1 ]; then RUNNER="`dirname $0`/valgrind-wireshark.sh" - COMMON_ARGS="-b $BIN_DIR $COMMON_ARGS" + COMMON_ARGS="-b $WIRESHARK_BIN_DIR $COMMON_ARGS" declare -a RUNNER_ARGS=("" "-T") # Valgrind requires more resources, so permit 1.5x memory and 3x time # (1.5x time is too small for a few large captures in the menagerie) |