From 6fb488c58720e914f06393797323abc9325a014f Mon Sep 17 00:00:00 2001 From: Jon Siwek Date: Fri, 22 Jul 2011 11:14:53 -0500 Subject: [PATCH] core.load-pkg test now insensitive to default-loaded scripts. --- .../Baseline/core.load-pkg/loaded_scripts.log | 24 ------------------- testing/btest/core/load-pkg.bro | 12 ++++++---- 2 files changed, 7 insertions(+), 29 deletions(-) delete mode 100644 testing/btest/Baseline/core.load-pkg/loaded_scripts.log diff --git a/testing/btest/Baseline/core.load-pkg/loaded_scripts.log b/testing/btest/Baseline/core.load-pkg/loaded_scripts.log deleted file mode 100644 index eab9f30894..0000000000 --- a/testing/btest/Baseline/core.load-pkg/loaded_scripts.log +++ /dev/null @@ -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/policy/misc/loaded-scripts.bro -0 ./foo/__load__.bro -1 ./foo/test.bro diff --git a/testing/btest/core/load-pkg.bro b/testing/btest/core/load-pkg.bro index 2bd566a27f..26e190a14c 100644 --- a/testing/btest/core/load-pkg.bro +++ b/testing/btest/core/load-pkg.bro @@ -1,8 +1,10 @@ -# @TEST-EXEC: mkdir foo -# @TEST-EXEC: echo "@load foo/test.bro" >foo/__load__.bro -# @TEST-EXEC: cp %INPUT foo/test.bro -# @TEST-EXEC: bro misc/loaded-scripts foo >output +# @TEST-EXEC: bro foo >output # @TEST-EXEC: btest-diff output -# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff loaded_scripts.log +@TEST-START-FILE foo/__load__.bro +@load ./test.bro +@TEST-END-FILE + +@TEST-START-FILE foo/test.bro print "Foo loaded"; +@TEST-END-FILE