diff --git a/CHANGES b/CHANGES index bd46f4e65c..2a606b2956 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,8 @@ +2.5-723 | 2018-07-03 09:34:10 -0500 + + * Fix unstable config framework test (Corelight) + 2.5-722 | 2018-07-03 09:16:37 -0500 * BIT-1941: teach diff-remove-timestamps about time 0 (Corelight) diff --git a/VERSION b/VERSION index e1dbbe72b1..64feb3eb5a 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.5-722 +2.5-723 diff --git a/testing/btest/scripts/base/frameworks/config/several-files.bro b/testing/btest/scripts/base/frameworks/config/several-files.bro index 57d15c0075..c5ad563b4e 100644 --- a/testing/btest/scripts/base/frameworks/config/several-files.bro +++ b/testing/btest/scripts/base/frameworks/config/several-files.bro @@ -1,7 +1,6 @@ # @TEST-EXEC: btest-bg-run bro bro -b %INPUT # @TEST-EXEC: btest-bg-wait 10 -# @TEST-EXEC: sort bro/config.log >bro/config.log.tmp && mv bro/config.log.tmp bro/config.log -# @TEST-EXEC: btest-diff bro/config.log +# @TEST-EXEC: TEST_DIFF_CANONIFIER="$SCRIPTS/diff-canonifier | grep -v ^# | $SCRIPTS/diff-sort" btest-diff bro/config.log @load base/frameworks/config @load base/protocols/conn