Merge remote-tracking branch 'origin/topic/robin/gh-239'

* origin/topic/robin/gh-239:
  Undo a change to btest.cfg from a recent commit
  Updating submodule.
  Fix zeek-wrapper
  Update for renaming BroControl to ZeekControl.
  Updating submodule.
  GH-239: Rename bro to zeek, bro-config to zeek-config, and bro-path-dev to zeek-path-dev.
This commit is contained in:
Jon Siwek 2019-05-14 13:19:12 -07:00
commit 6ad7099f7e
1125 changed files with 1743 additions and 1665 deletions

View file

@ -25,12 +25,12 @@ case $output_dir in
esac
cd $build_dir
. bro-path-dev.sh
. zeek-path-dev.sh
export BRO_SEED_FILE=$source_dir/testing/btest/random.seed
function run_zeek
{
ZEEK_ALLOW_INIT_ERRORS=1 bro -X $conf_file zeekygen >/dev/null 2>$zeek_error_file
ZEEK_ALLOW_INIT_ERRORS=1 zeek -X $conf_file zeekygen >/dev/null 2>$zeek_error_file
if [ $? -ne 0 ]; then
echo "Failed running zeek with zeekygen config file $conf_file"