Merge remote-tracking branch 'origin/topic/script-load-changes'

* origin/topic/script-load-changes:
  Fix reST file name associated w/ stdin when in doc mode (closes #497)
  Update @prefixes test.
  Rewrite a test using btest's TEST-START-FILE directive
  Fix @unload'd files from generating bro_script_loaded event.
  Renaming a test better.
  Reimplementation of the @prefixes statement.
  Fix accidental overwrite of BROPATH copy.
  Make @load statements recognize relative paths.

testing/btest/Baseline/core.load-prefixes/output

@@ -0,0 +1,4 @@
+loaded lcl2.site.bro
+loaded lcl.site.bro
+loaded lcl2.protocols.http.bro
+loaded lcl.protocols.http.bro

testing/btest/Baseline/core.load-relative/output

@@ -0,0 +1,3 @@
+bar loaded
+baz loaded
+foo loaded

testing/btest/Baseline/core.load-unload/loaded_scripts.log

@@ -1,24 +0,0 @@
-# depth	name
-0	/Users/seth/bro.git9/policy/bro.init
-1	/Users/seth/bro.git9/build/src/const.bif.bro
-1	/Users/seth/bro.git9/build/src/types.bif.bro
-1	/Users/seth/bro.git9/build/src/strings.bif.bro
-1	/Users/seth/bro.git9/build/src/bro.bif.bro
-1	/Users/seth/bro.git9/build/src/reporter.bif.bro
-1	/Users/seth/bro.git9/build/src/event.bif.bro
-1	/Users/seth/bro.git9/policy/utils/site.bro
-2	/Users/seth/bro.git9/policy/utils/pattern.bro
-1	/Users/seth/bro.git9/policy/frameworks/logging/__load__.bro
-2	/Users/seth/bro.git9/policy/frameworks/logging/base.bro
-3	/Users/seth/bro.git9/build/src/logging.bif.bro
-2	/Users/seth/bro.git9/policy/frameworks/logging/plugins/ascii.bro
-1	/Users/seth/bro.git9/policy/frameworks/packet-filter/__load__.bro
-2	/Users/seth/bro.git9/policy/frameworks/packet-filter/base.bro
-3	/Users/seth/bro.git9/policy/frameworks/notice/__load__.bro
-4	/Users/seth/bro.git9/policy/frameworks/notice/base.bro
-4	/Users/seth/bro.git9/policy/frameworks/notice/weird.bro
-5	/Users/seth/bro.git9/policy/utils/conn-ids.bro
-2	/Users/seth/bro.git9/policy/frameworks/packet-filter/netstats.bro
-0	/Users/seth/bro.git9/testing/btest/.tmp/core.load-unload/load-unload.bro
-1	./dontloadmebro.bro
-0	/Users/seth/bro.git9/policy/misc/loaded-scripts.bro

testing/btest/core/load-prefixes.bro

@@ -0,0 +1,25 @@
+# A test of prefix-based @load'ing
+
+# @TEST-EXEC: bro addprefixes utils/site protocols/http >output
+# @TEST-EXEC: btest-diff output
+
+@TEST-START-FILE addprefixes.bro
+@prefixes += lcl
+@prefixes += lcl2
+@TEST-END-FILE
+
+@TEST-START-FILE lcl.utils.site.bro
+print "loaded lcl.site.bro";
+@TEST-END-FILE
+
+@TEST-START-FILE lcl2.utils.site.bro
+print "loaded lcl2.site.bro";
+@TEST-END-FILE
+
+@TEST-START-FILE lcl.protocols.http.bro
+print "loaded lcl.protocols.http.bro";
+@TEST-END-FILE
+
+@TEST-START-FILE lcl2.protocols.http.bro
+print "loaded lcl2.protocols.http.bro";
+@TEST-END-FILE

testing/btest/core/load-relative.bro

@@ -0,0 +1,18 @@
+# A test of relative-path-based @load'ing
+
+# @TEST-EXEC: bro foo/foo >output
+# @TEST-EXEC: btest-diff output
+
+@TEST-START-FILE foo/foo.bro
+@load ./bar
+@load ../baz
+print "foo loaded";
+@TEST-END-FILE
+
+@TEST-START-FILE foo/bar.bro
+print "bar loaded";
+@TEST-END-FILE
+
+@TEST-START-FILE baz.bro
+print "baz loaded";
+@TEST-END-FILE

testing/btest/core/load-unload.bro

@@ -1,8 +1,11 @@
 # This tests the @unload directive
 #
-# @TEST-EXEC: echo 'print "oops12345";' >dontloadmebro.bro
 # @TEST-EXEC: bro %INPUT misc/loaded-scripts dontloadmebro > output
 # @TEST-EXEC: btest-diff output
-# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff loaded_scripts.log
+# @TEST-EXEC: grep -q dontloadmebro loaded_scripts.log && exit 1 || exit 0
 
 @unload dontloadmebro
+
+@TEST-START-FILE dontloadmebro.bro
+print "FAIL";
+@TEST-END-FILE