From f6f9dd952f191fec4f81e2729dd64f55490f1fbc Mon Sep 17 00:00:00 2001 From: Robin Sommer Date: Thu, 26 Jan 2012 20:55:24 -0800 Subject: [PATCH] Fixed for Brofiler merge. --- testing/btest/btest.cfg | 2 +- testing/btest/coverage/coverage-blacklist.bro | 4 ++-- testing/external/subdir-btest.cfg | 2 +- testing/scripts/btest-bg-run | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/testing/btest/btest.cfg b/testing/btest/btest.cfg index de8abe7aa9..2126e733e7 100644 --- a/testing/btest/btest.cfg +++ b/testing/btest/btest.cfg @@ -18,4 +18,4 @@ DIST=%(testbase)s/../.. BUILD=%(testbase)s/../../build TEST_DIFF_CANONIFIER=$SCRIPTS/diff-canonifier TMPDIR=%(testbase)s/.tmp -# BRO_PROFILER_FILE=%(testbase)s/.tmp/script-coverage +BRO_PROFILER_FILE=%(testbase)s/.tmp/script-coverage diff --git a/testing/btest/coverage/coverage-blacklist.bro b/testing/btest/coverage/coverage-blacklist.bro index 04983a921f..30a5f86efa 100644 --- a/testing/btest/coverage/coverage-blacklist.bro +++ b/testing/btest/coverage/coverage-blacklist.bro @@ -1,6 +1,6 @@ -# @TEST-EXEC: BROFILER_FILE=coverage bro -b %INPUT +# @TEST-EXEC: BRO_PROFILER_FILE=coverage bro -b %INPUT # @TEST-EXEC: grep %INPUT coverage | sort -k2 >output -# @TEST-EXEC: btest-diff output +# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff output print "first"; diff --git a/testing/external/subdir-btest.cfg b/testing/external/subdir-btest.cfg index e24f89255a..7b1d59cb07 100644 --- a/testing/external/subdir-btest.cfg +++ b/testing/external/subdir-btest.cfg @@ -17,4 +17,4 @@ TRACES=%(testbase)s/Traces SCRIPTS=%(testbase)s/../scripts DIST=%(testbase)s/../../.. BUILD=%(testbase)s/../../../build -BROFILER_FILE=%(testbase)s/.tmp/script-coverage +BRO_PROFILER_FILE=%(testbase)s/.tmp/script-coverage diff --git a/testing/scripts/btest-bg-run b/testing/scripts/btest-bg-run index 462ae23fa2..ec5497da7d 100755 --- a/testing/scripts/btest-bg-run +++ b/testing/scripts/btest-bg-run @@ -4,4 +4,4 @@ # when collecting Bro script coverage statistics so that two independent # Bro processing don't try to write those usage statistics to the same file. -BROFILER_FILE=`mktemp -t script-coverage` $BTEST_PATH/btest-bg-run $@ +BRO_PROFILER_FILE=`mktemp -t script-coverage` $BTEST_PATH/btest-bg-run $@