Fix missing @load dependencies in some scripts.

And update the unit test which is supposed to catch such errors.
This commit is contained in:
Jon Siwek 2014-04-09 16:32:23 -05:00
parent 285ef548ff
commit d4ef9f3693
5 changed files with 10 additions and 12 deletions

View file

@ -4,6 +4,8 @@
@load base/protocols/ssl
@load base/files/x509
@load base/frameworks/notice
@load base/utils/directions-and-hosts
module SSL;

View file

@ -11,6 +11,7 @@
@load base/protocols/ssl
@load base/files/x509
@load base/utils/directions-and-hosts
module SSL;

View file

@ -1,6 +1,9 @@
##! When this script is loaded, only the host certificates (client and server)
##! will be logged to x509.log. Logging of all other certificates will be suppressed.
@load base/protocols/ssl
@load base/files/x509
module X509;
export {

View file

@ -1,17 +1,9 @@
# Makes sure any given bro script in the scripts/ tree can be loaded in
# bare mode without error. btest-bg-run/btest-bg-wait are used to kill off
# scripts that block after loading, e.g. start listening on a socket.
# bare mode without error.
#
# Commonly, this test may fail if one forgets to @load some base/ scripts
# when writing a new bro scripts. Look into "allerrors" to find out
# which script had trouble.
#
# @TEST-SERIALIZE: comm
# when writing a new bro scripts.
#
# @TEST-EXEC: test -d $DIST/scripts
# @TEST-EXEC: for script in `find $DIST/scripts/ -name \*\.bro -not -path '*/site/*'`; do echo "=== $script" >>allerrors; if echo "$script" | egrep -q 'communication/listen|controllee'; then rm -rf load_attempt .bgprocs; btest-bg-run load_attempt bro -b $script; btest-bg-wait -k 2; cat load_attempt/.stderr >>allerrors; else bro -b $script 2>>allerrors; fi done || exit 0
# @TEST-EXEC: cat allerrors | grep -v "received termination signal" | fgrep -v -f %INPUT | grep -v '===' | sort | uniq > unique_errors
# @TEST-EXEC: btest-diff unique_errors
# White-list of tests to exclude because of cyclic load dependencies.
scripts/base/protocols/ftp/utils.bro
# @TEST-EXEC: for script in `find $DIST/scripts/ -name \*\.bro`; do bro -b --parse-only $script >>errors 2>&1; done
# @TEST-EXEC: btest-diff errors