Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 06:38:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix unstable config framework test

Browse source
This commit is contained in:
Jon Siwek 2018-07-03 09:34:10 -05:00
parent 85e46f37ca
commit a6ddc882c3
3 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CHANGES
View file

@ -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 2.5-722 | 2018-07-03 09:16:37 -0500
* BIT-1941: teach diff-remove-timestamps about time 0 (Corelight) * BIT-1941: teach diff-remove-timestamps about time 0 (Corelight)

2
VERSION
View file

@ -1 +1 @@
2.5-722 2.5-723

3
testing/btest/scripts/base/frameworks/config/several-files.bro
View file

@ -1,7 +1,6 @@
# @TEST-EXEC: btest-bg-run bro bro -b %INPUT # @TEST-EXEC: btest-bg-run bro bro -b %INPUT
# @TEST-EXEC: btest-bg-wait 10 # @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: TEST_DIFF_CANONIFIER="$SCRIPTS/diff-canonifier | grep -v ^# | $SCRIPTS/diff-sort" btest-diff bro/config.log
# @TEST-EXEC: btest-diff bro/config.log
@load base/frameworks/config @load base/frameworks/config
@load base/protocols/conn @load base/protocols/conn