diff --git a/CHANGES b/CHANGES index 504a58c0de..edeb1f11ee 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,17 @@ +1.6-dev.242 Mon Jul 25 21:42:39 PDT 2011 + +- Adding a documentation coverage test. (Jon Siwek) + +- The CMake targets for generating reST docs from policy scripts are + now automatically generated via the genDocSourcesList.sh script. + (Jon Siwek) + +- Fixed a number of script error. (Jon Siwek) + +- Fixes to relative @load'ing. (Jon Siwek) + +- Fixes to tests. (Robin Sommer) + 1.6-dev.240 Sun Jul 24 15:14:26 PDT 2011 - Updated tests and test baselines. (Jon Siwek) diff --git a/VERSION b/VERSION index 40362f258c..5f3fe7d39f 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.6-dev.240 +1.6-dev.242 diff --git a/policy/test-all.bro b/policy/test-all.bro index a5f8de3761..6dff2511ef 100644 --- a/policy/test-all.bro +++ b/policy/test-all.bro @@ -41,8 +41,8 @@ @load frameworks/metrics/http-example.bro @load frameworks/notice/__load__.bro # @load frameworks/notice/action-filters.bro -@load frameworks/notice/base.bro -@load frameworks/notice/weird.bro +# @load frameworks/notice/base.bro +# @load frameworks/notice/weird.bro @load frameworks/packet-filter/__load__.bro @load frameworks/packet-filter/netstats.bro @load frameworks/signatures/__load__.bro diff --git a/testing/btest/Baseline/policy.misc.default-loaded-scripts/canonified_loaded_scripts.log b/testing/btest/Baseline/policy.misc.default-loaded-scripts/canonified_loaded_scripts.log new file mode 100644 index 0000000000..4e5c3c4bd3 --- /dev/null +++ b/testing/btest/Baseline/policy.misc.default-loaded-scripts/canonified_loaded_scripts.log @@ -0,0 +1,27 @@ +# depth name +0 policy/bro.init +1 build/src/const.bif.bro +1 build/src/types.bif.bro +1 build/src/strings.bif.bro +1 build/src/bro.bif.bro +1 build/src/reporter.bif.bro +1 build/src/event.bif.bro +1 policy/utils/site.bro +2 policy/utils/pattern.bro +1 policy/frameworks/logging/__load__.bro +2 policy/frameworks/logging/base.bro +3 build/src/logging.bif.bro +2 policy/frameworks/logging/plugins/ascii.bro +1 policy/frameworks/packet-filter/__load__.bro +2 policy/frameworks/packet-filter/base/__load__.bro +3 policy/frameworks/packet-filter/base/main.bro +4 policy/frameworks/notice/__load__.bro +5 policy/frameworks/notice/./base/__load__.bro +6 policy/frameworks/notice/./base/./main.bro +6 policy/frameworks/notice/./base/./weird.bro +7 policy/utils/conn-ids.bro +6 policy/frameworks/notice/./base/./actions/drop.bro +6 policy/frameworks/notice/./base/./actions/email_admin.bro +6 policy/frameworks/notice/./base/./actions/page.bro +5 policy/frameworks/notice/./extend-email/hostnames.bro +0 policy/misc/loaded-scripts.bro diff --git a/testing/btest/Baseline/policy.misc.default-loaded-scripts/loaded_scripts.log b/testing/btest/Baseline/policy.misc.default-loaded-scripts/loaded_scripts.log deleted file mode 100644 index 357b78c641..0000000000 --- a/testing/btest/Baseline/policy.misc.default-loaded-scripts/loaded_scripts.log +++ /dev/null @@ -1,27 +0,0 @@ -# depth name -0 /Users/jsiwek/Projects/bro/bro/policy/bro.init -1 /Users/jsiwek/Projects/bro/bro/build/src/const.bif.bro -1 /Users/jsiwek/Projects/bro/bro/build/src/types.bif.bro -1 /Users/jsiwek/Projects/bro/bro/build/src/strings.bif.bro -1 /Users/jsiwek/Projects/bro/bro/build/src/bro.bif.bro -1 /Users/jsiwek/Projects/bro/bro/build/src/reporter.bif.bro -1 /Users/jsiwek/Projects/bro/bro/build/src/event.bif.bro -1 /Users/jsiwek/Projects/bro/bro/policy/utils/site.bro -2 /Users/jsiwek/Projects/bro/bro/policy/utils/pattern.bro -1 /Users/jsiwek/Projects/bro/bro/policy/frameworks/logging/__load__.bro -2 /Users/jsiwek/Projects/bro/bro/policy/frameworks/logging/base.bro -3 /Users/jsiwek/Projects/bro/bro/build/src/logging.bif.bro -2 /Users/jsiwek/Projects/bro/bro/policy/frameworks/logging/plugins/ascii.bro -1 /Users/jsiwek/Projects/bro/bro/policy/frameworks/packet-filter/__load__.bro -2 /Users/jsiwek/Projects/bro/bro/policy/frameworks/packet-filter/base/__load__.bro -3 /Users/jsiwek/Projects/bro/bro/policy/frameworks/packet-filter/base/main.bro -4 /Users/jsiwek/Projects/bro/bro/policy/frameworks/notice/__load__.bro -5 /Users/jsiwek/Projects/bro/bro/policy/frameworks/notice/./base/__load__.bro -6 /Users/jsiwek/Projects/bro/bro/policy/frameworks/notice/./base/./main.bro -6 /Users/jsiwek/Projects/bro/bro/policy/frameworks/notice/./base/./weird.bro -7 /Users/jsiwek/Projects/bro/bro/policy/utils/conn-ids.bro -6 /Users/jsiwek/Projects/bro/bro/policy/frameworks/notice/./base/./actions/drop.bro -6 /Users/jsiwek/Projects/bro/bro/policy/frameworks/notice/./base/./actions/email_admin.bro -6 /Users/jsiwek/Projects/bro/bro/policy/frameworks/notice/./base/./actions/page.bro -5 /Users/jsiwek/Projects/bro/bro/policy/frameworks/notice/./extend-email/hostnames.bro -0 /Users/jsiwek/Projects/bro/bro/policy/misc/loaded-scripts.bro diff --git a/testing/btest/policy/misc/default-loaded-scripts.test b/testing/btest/policy/misc/default-loaded-scripts.test index eabb9a30ab..ca67058dd5 100644 --- a/testing/btest/policy/misc/default-loaded-scripts.test +++ b/testing/btest/policy/misc/default-loaded-scripts.test @@ -1,5 +1,12 @@ # This test is meant to cover whether the set of scripts that get loaded by # default matches a baseline of known defaults. +# +# As the output has absolute paths in it, we need to remove the common +# prefix to make the test work everywhere. That's what the sed magic +# below does. Don't ask. :-) # @TEST-EXEC: bro misc/loaded-scripts -# @TEST-EXEC: btest-diff loaded_scripts.log +# @TEST-EXEC: test -e loaded_scripts.log +# @TEST-EXEC: cat loaded_scripts.log | awk 'NR>1{print $2}' | sed ':a;$!N;s/^\(.*\).*\n\1.*/\1/;ta' >prefix +# @TEST-EXEC: cat loaded_scripts.log | sed "s#`cat prefix`##g" >canonified_loaded_scripts.log +# @TEST-EXEC: btest-diff canonified_loaded_scripts.log