Merge remote-tracking branch 'origin/topic/jsiwek/reorg-followup'

testing/btest/Baseline/core.check-unused-event-handlers/.stderr

@@ -0,0 +1 @@
+warning in <params>, line 1: event handler never invoked: this_is_never_used

testing/btest/Baseline/scripts.policy.misc.bare-loaded-scripts/canonified_loaded_scripts.log

@@ -1,13 +1,13 @@
 # depth	name
 0	scripts/base/init-bare.bro
-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	build/src/base/const.bif.bro
+1	build/src/base/types.bif.bro
+1	build/src/base/strings.bif.bro
+1	build/src/base/bro.bif.bro
+1	build/src/base/reporter.bif.bro
+1	build/src/base/event.bif.bro
 1	scripts/base/frameworks/logging/__load__.bro
 2	scripts/base/frameworks/logging/./main.bro
-3	build/src/logging.bif.bro
+3	build/src/base/logging.bif.bro
 2	scripts/base/frameworks/logging/./writers/ascii.bro
 0	scripts/policy/misc/loaded-scripts.bro

testing/btest/Baseline/scripts.policy.misc.default-loaded-scripts/canonified_loaded_scripts.log

@@ -1,14 +1,14 @@
 # depth	name
 0	scripts/base/init-bare.bro
-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	build/src/base/const.bif.bro
+1	build/src/base/types.bif.bro
+1	build/src/base/strings.bif.bro
+1	build/src/base/bro.bif.bro
+1	build/src/base/reporter.bif.bro
+1	build/src/base/event.bif.bro
 1	scripts/base/frameworks/logging/__load__.bro
 2	scripts/base/frameworks/logging/./main.bro
-3	build/src/logging.bif.bro
+3	build/src/base/logging.bif.bro
 2	scripts/base/frameworks/logging/./writers/ascii.bro
 0	scripts/base/init-default.bro
 1	scripts/base/utils/site.bro
@@ -38,16 +38,17 @@
 2	scripts/base/frameworks/packet-filter/./netstats.bro
 1	scripts/base/frameworks/software/__load__.bro
 2	scripts/base/frameworks/software/./main.bro
-1	scripts/base/frameworks/intel/__load__.bro
-2	scripts/base/frameworks/intel/./main.bro
-1	scripts/base/frameworks/metrics/__load__.bro
-2	scripts/base/frameworks/metrics/./main.bro
 1	scripts/base/frameworks/communication/__load__.bro
 2	scripts/base/frameworks/communication/./main.bro
 1	scripts/base/frameworks/control/__load__.bro
 2	scripts/base/frameworks/control/./main.bro
 1	scripts/base/frameworks/cluster/__load__.bro
 2	scripts/base/frameworks/cluster/./main.bro
+1	scripts/base/frameworks/metrics/__load__.bro
+2	scripts/base/frameworks/metrics/./main.bro
+2	scripts/base/frameworks/metrics/./non-cluster.bro
+1	scripts/base/frameworks/intel/__load__.bro
+2	scripts/base/frameworks/intel/./main.bro
 1	scripts/base/frameworks/reporter/__load__.bro
 2	scripts/base/frameworks/reporter/./main.bro
 1	scripts/base/protocols/conn/__load__.bro

testing/btest/btest.cfg

@@ -1,5 +1,5 @@
 [btest]
-TestDirs    = doc bifs language core policy istate
+TestDirs    = doc bifs language core scripts istate
 TmpDir      = %(testbase)s/.tmp
 BaselineDir = %(testbase)s/Baseline
 IgnoreDirs  = .svn CVS .tmp

testing/btest/core/check-unused-event-handlers.test

@@ -0,0 +1,8 @@
+# This test should print a warning that the event handler is never invoked.
+# @TEST-EXEC: bro -b %INPUT check_for_unused_event_handlers=T
+# @TEST-EXEC: btest-diff .stderr
+
+event this_is_never_used()
+	{
+	print "not even once";
+	}

testing/btest/policy/misc/check-bare-test-all-policy.bro

@@ -1,7 +0,0 @@
-# Makes sures test-all-policy.bro (which loads *all* other policy scripts)
-# compiles correctly even in bare mode.
-# 
-# @TEST-EXEC: bro -b %INPUT >output
-# @TEST-EXEC: btest-diff output
-
-@load test-all-policy

testing/btest/scripts/bare-mode-coverage.test

@@ -0,0 +1,8 @@
+# Makes sure any given policy script in the scripts/ tree can be loaded in
+# bare mode.  btest-bg-run/btest-bg-wait are used to kill off scripts that
+# block after loading, e.g. start listening on a socket.
+#
+# @TEST-EXEC: test -d $DIST/scripts
+# @TEST-EXEC: for script in `find $DIST/scripts -name \*\.bro`; do echo $script;if [[ "$script" =~ listen-clear|listen-ssl|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" | sort | uniq > unique_errors
+# @TEST-EXEC: btest-diff unique_errors