From b2a3723a1d870d7da93a7ed83d692bfbd188fd18 Mon Sep 17 00:00:00 2001 From: Robin Sommer Date: Tue, 19 Jul 2011 17:39:46 -0700 Subject: [PATCH] Fixing tests that need a diff canonifier. --- .../policy.misc.loaded-scripts/output | 42 +++++++++---------- testing/btest/core/load-pkg.bro | 2 +- testing/btest/core/load-unload.bro | 2 +- testing/btest/policy/misc/loaded-scripts.bro | 2 +- 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/testing/btest/Baseline/policy.misc.loaded-scripts/output b/testing/btest/Baseline/policy.misc.loaded-scripts/output index fe360fd38f..ca3eb3f396 100644 --- a/testing/btest/Baseline/policy.misc.loaded-scripts/output +++ b/testing/btest/Baseline/policy.misc.loaded-scripts/output @@ -1,21 +1,21 @@ -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/policy.misc.loaded-scripts/loaded-scripts.bro +0, /Users/jsiwek/tmp/bro/policy/bro.init +1, /Users/jsiwek/tmp/bro/build/src/const.bif.bro +1, /Users/jsiwek/tmp/bro/build/src/types.bif.bro +1, /Users/jsiwek/tmp/bro/build/src/strings.bif.bro +1, /Users/jsiwek/tmp/bro/build/src/bro.bif.bro +1, /Users/jsiwek/tmp/bro/build/src/reporter.bif.bro +1, /Users/jsiwek/tmp/bro/build/src/event.bif.bro +1, /Users/jsiwek/tmp/bro/policy/site.bro +2, /Users/jsiwek/tmp/bro/policy/utils/pattern.bro +1, /Users/jsiwek/tmp/bro/policy/frameworks/logging/__load__.bro +2, /Users/jsiwek/tmp/bro/policy/frameworks/logging/base.bro +3, /Users/jsiwek/tmp/bro/build/src/logging.bif.bro +2, /Users/jsiwek/tmp/bro/policy/frameworks/logging/plugins/ascii.bro +1, /Users/jsiwek/tmp/bro/policy/frameworks/packet-filter/__load__.bro +2, /Users/jsiwek/tmp/bro/policy/frameworks/packet-filter/base.bro +3, /Users/jsiwek/tmp/bro/policy/frameworks/notice/__load__.bro +4, /Users/jsiwek/tmp/bro/policy/frameworks/notice/base.bro +4, /Users/jsiwek/tmp/bro/policy/frameworks/notice/weird.bro +5, /Users/jsiwek/tmp/bro/policy/utils/conn_ids.bro +2, /Users/jsiwek/tmp/bro/policy/frameworks/packet-filter/netstats.bro +0, /Users/jsiwek/tmp/bro/testing/btest/.tmp/policy.misc.loaded-scripts/loaded-scripts.bro diff --git a/testing/btest/core/load-pkg.bro b/testing/btest/core/load-pkg.bro index 9cb67b1ed3..2bd566a27f 100644 --- a/testing/btest/core/load-pkg.bro +++ b/testing/btest/core/load-pkg.bro @@ -3,6 +3,6 @@ # @TEST-EXEC: cp %INPUT foo/test.bro # @TEST-EXEC: bro misc/loaded-scripts foo >output # @TEST-EXEC: btest-diff output -# @TEST-EXEC: btest-diff loaded_scripts.log +# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff loaded_scripts.log print "Foo loaded"; diff --git a/testing/btest/core/load-unload.bro b/testing/btest/core/load-unload.bro index cab7fd1414..553260f395 100644 --- a/testing/btest/core/load-unload.bro +++ b/testing/btest/core/load-unload.bro @@ -3,6 +3,6 @@ # @TEST-EXEC: echo 'print "oops12345";' >dontloadmebro.bro # @TEST-EXEC: bro %INPUT misc/loaded-scripts dontloadmebro > output # @TEST-EXEC: btest-diff output -# @TEST-EXEC: btest-diff loaded_scripts.log +# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff loaded_scripts.log @unload dontloadmebro diff --git a/testing/btest/policy/misc/loaded-scripts.bro b/testing/btest/policy/misc/loaded-scripts.bro index 775a939196..589dc207b2 100644 --- a/testing/btest/policy/misc/loaded-scripts.bro +++ b/testing/btest/policy/misc/loaded-scripts.bro @@ -1,5 +1,5 @@ # @TEST-EXEC: bro %INPUT >output -# @TEST-EXEC: btest-diff output +# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff output event bro_script_loaded(path: string, level: count) {