Merge remote-tracking branch 'origin/topic/dnthayer/gh-339'

* origin/topic/dnthayer/gh-339:
  Rename all BRO-prefixed environment variables
This commit is contained in:
Jon Siwek 2019-05-23 19:34:42 -07:00
commit 580822a32c
109 changed files with 345 additions and 282 deletions

View file

@ -1,12 +1,12 @@
#! /usr/bin/env bash
unset BRO_DISABLE_BROXYGEN
unset ZEEK_DISABLE_ZEEKYGEN;
# If running this from btest, unset any of the environment
# variables that alter default script values.
unset BRO_DEFAULT_LISTEN_ADDRESS
unset BRO_DEFAULT_LISTEN_RETRY
unset BRO_DEFAULT_CONNECT_RETRY
unset ZEEK_DEFAULT_LISTEN_ADDRESS;
unset ZEEK_DEFAULT_LISTEN_RETRY;
unset ZEEK_DEFAULT_CONNECT_RETRY;
dir="$( cd "$( dirname "$0" )" && pwd )"
source_dir="$( cd $dir/../.. && pwd )"
@ -26,7 +26,7 @@ esac
cd $build_dir
. zeek-path-dev.sh
export BRO_SEED_FILE=$source_dir/testing/btest/random.seed
export ZEEK_SEED_FILE=$source_dir/testing/btest/random.seed
function run_zeek
{