GH-239: Rename bro to zeek, bro-config to zeek-config, and bro-path-dev to zeek-path-dev.

This also installs symlinks from "zeek" and "bro-config" to a wrapper
script that prints a deprecation warning.

The btests pass, but this is still WIP. broctl renaming is still
missing.

#239
This commit is contained in:
Robin Sommer 2019-04-23 14:25:56 +02:00
parent 375b151a4b
commit 789cb376fd
1119 changed files with 1686 additions and 1647 deletions

View file

@ -3,9 +3,9 @@
#
# @TEST-EXEC: btest-bg-run httpd python $SCRIPTS/httpd.py --max 2 --addr=127.0.0.1
# @TEST-EXEC: sleep 3
# @TEST-EXEC: btest-bg-run bro bro -b %INPUT
# @TEST-EXEC: btest-bg-run zeek zeek -b %INPUT
# @TEST-EXEC: btest-bg-wait 15
# @TEST-EXEC: cat bro/.stdout | sort >output
# @TEST-EXEC: cat zeek/.stdout | sort >output
# @TEST-EXEC: btest-diff output
@load base/utils/active-http

View file

@ -1,4 +1,4 @@
# @TEST-EXEC: bro -b %INPUT > output
# @TEST-EXEC: zeek -b %INPUT > output
# @TEST-EXEC: btest-diff output
@load base/utils/addrs

View file

@ -1,4 +1,4 @@
# @TEST-EXEC: bro %INPUT >output
# @TEST-EXEC: zeek %INPUT >output
# @TEST-EXEC: btest-diff output
# This is loaded by default.

View file

@ -1,4 +1,4 @@
# @TEST-EXEC: bro -b %INPUT > output
# @TEST-EXEC: zeek -b %INPUT > output
# @TEST-EXEC: btest-diff output
@load base/utils/urls

View file

@ -1,12 +1,12 @@
# @TEST-EXEC: btest-bg-run bro bro -b ../dirtest.zeek
# @TEST-EXEC: $SCRIPTS/wait-for-file bro/next1 10 || (btest-bg-wait -k 1 && false)
# @TEST-EXEC: btest-bg-run zeek zeek -b ../dirtest.zeek
# @TEST-EXEC: $SCRIPTS/wait-for-file zeek/next1 10 || (btest-bg-wait -k 1 && false)
# @TEST-EXEC: touch testdir/newone
# @TEST-EXEC: rm testdir/bye
# @TEST-EXEC: $SCRIPTS/wait-for-file bro/next2 10 || (btest-bg-wait -k 1 && false)
# @TEST-EXEC: $SCRIPTS/wait-for-file zeek/next2 10 || (btest-bg-wait -k 1 && false)
# @TEST-EXEC: touch testdir/bye
# @TEST-EXEC: btest-bg-wait 20
# @TEST-EXEC: touch testdir/newone
# @TEST-EXEC: btest-diff bro/.stdout
# @TEST-EXEC: btest-diff zeek/.stdout
@TEST-START-FILE dirtest.zeek

View file

@ -1,4 +1,4 @@
# @TEST-EXEC: bro %INPUT >output
# @TEST-EXEC: zeek %INPUT >output
# @TEST-EXEC: btest-diff output
# These are loaded by default.

View file

@ -1,6 +1,6 @@
# @TEST-EXEC: btest-bg-run bro bro -b ../exectest.zeek
# @TEST-EXEC: btest-bg-run zeek zeek -b ../exectest.zeek
# @TEST-EXEC: btest-bg-wait 15
# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff bro/.stdout
# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff zeek/.stdout
@TEST-START-FILE exectest.zeek

View file

@ -1,4 +1,4 @@
# @TEST-EXEC: bro -r $TRACES/wikipedia.trace %INPUT >output
# @TEST-EXEC: zeek -r $TRACES/wikipedia.trace %INPUT >output
# @TEST-EXEC: btest-diff output
# This is loaded by default.

View file

@ -1,4 +1,4 @@
# @TEST-EXEC: bro -b %INPUT > output
# @TEST-EXEC: zeek -b %INPUT > output
# @TEST-EXEC: btest-diff output
@load base/utils/hash_hrw

View file

@ -2,7 +2,7 @@
# test with no elements, with one element, and with more than one element.
# Test that the "only_loggable" option works (output only record fields with
# the &log attribute).
# @TEST-EXEC: bro %INPUT >output
# @TEST-EXEC: zeek %INPUT >output
# @TEST-EXEC: btest-diff output
type color: enum { Red, White, Blue };

View file

@ -1,4 +1,4 @@
# @TEST-EXEC: bro %INPUT >output
# @TEST-EXEC: zeek %INPUT >output
# @TEST-EXEC: btest-diff output
# This is loaded by default.

View file

@ -1,4 +1,4 @@
# @TEST-EXEC: bro %INPUT >output
# @TEST-EXEC: zeek %INPUT >output
# @TEST-EXEC: btest-diff output
# This is loaded by default.
@ -41,18 +41,18 @@ print "===============================";
test_extract("\"/this/is/a/dir\" is current directory", "/this/is/a/dir");
test_extract("/this/is/a/dir is current directory", "/this/is/a/dir");
test_extract("/this/is/a/dir\\ is\\ current\\ directory", "/this/is/a/dir\\ is\\ current\\ directory");
test_extract("hey, /foo/bar/baz.bro is a cool script", "/foo/bar/baz.bro");
test_extract("hey, /foo/bar/baz.zeek is a cool script", "/foo/bar/baz.zeek");
test_extract("here's two dirs: /foo/bar and /foo/baz", "/foo/bar");
print "test build_path_compressed()";
print "===============================";
print build_path_compressed("/home/bro/", "policy/somefile.bro");
print build_path_compressed("/home/bro/", "/usr/local/bro/share/bro/somefile.bro");
print build_path_compressed("/home/bro/", "/usr/local/bro/share/../../bro/somefile.bro");
print build_path_compressed("/home/bro/", "policy/somefile.zeek");
print build_path_compressed("/home/bro/", "/usr/local/bro/share/bro/somefile.zeek");
print build_path_compressed("/home/bro/", "/usr/local/bro/share/../../bro/somefile.zeek");
print "===============================";
print "test build_full_path()";
print "===============================";
print build_path("/home/bro/", "policy/somefile.bro");
print build_path("/home/bro/", "/usr/local/bro/share/bro/somefile.bro");
print build_path("/home/bro/", "policy/somefile.zeek");
print build_path("/home/bro/", "/usr/local/bro/share/bro/somefile.zeek");

View file

@ -1,4 +1,4 @@
# @TEST-EXEC: bro %INPUT >output
# @TEST-EXEC: zeek %INPUT >output
# @TEST-EXEC: btest-diff output
# This is loaded by default.

View file

@ -1,4 +1,4 @@
# @TEST-EXEC: bro -b %INPUT > output
# @TEST-EXEC: zeek -b %INPUT > output
# @TEST-EXEC: btest-diff output
# This is loaded by default

View file

@ -1,4 +1,4 @@
# @TEST-EXEC: bro %INPUT > output
# @TEST-EXEC: zeek %INPUT > output
# @TEST-EXEC: btest-diff output
# This is loaded by default.

View file

@ -1,4 +1,4 @@
# @TEST-EXEC: bro %INPUT >output
# @TEST-EXEC: zeek %INPUT >output
# @TEST-EXEC: btest-diff output
# This is loaded by default.

View file

@ -1,4 +1,4 @@
# @TEST-EXEC: bro %INPUT >output
# @TEST-EXEC: zeek %INPUT >output
# @TEST-EXEC: btest-diff output
# This is loaded by default.

View file

@ -1,4 +1,4 @@
# @TEST-EXEC: bro %INPUT >output
# @TEST-EXEC: zeek %INPUT >output
# @TEST-EXEC: btest-diff output
# This is loaded by default.