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

Fix a unit test

Browse source
This commit is contained in:
Jon Siwek 2018-08-29 17:22:20 -05:00
parent 0c9878f136
commit 01300f8706
5 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
CHANGES
View file

@ -1,4 +1,10 @@
2.5-922 | 2018-08-29 17:22:20 -0500
* Fix unit tests (Jon Siwek, Corelight)
* Fix strict-aliasing compiler warning (Jon Siwek, Corelight)
2.5-919 | 2018-08-29 14:58:06 -0500 2.5-919 | 2018-08-29 14:58:06 -0500
* Update unit test baseline for new BinPAC output (Jon Siwek, Corelight) * Update unit test baseline for new BinPAC output (Jon Siwek, Corelight)

2
VERSION
View file

@ -1 +1 @@
2.5-919 2.5-922

2
aux/broker

@ -1 +1 @@
Subproject commit 18d56b70558db61f424dc90e5d010f57b75de459 Subproject commit dede39c13390bcd57dff311dab9648db7dfdaa89

2
src/3rdparty

@ -1 +1 @@
Subproject commit 7c95b51de202ac534b27dd721da5778b773dd614 Subproject commit d7af30b30c811077d3838f4142400d8cc1f2cdbb

3
testing/btest/scripts/base/frameworks/config/updates.bro
View file

@ -1,13 +1,10 @@
# @TEST-EXEC: btest-bg-run bro bro -b %INPUT # @TEST-EXEC: btest-bg-run bro bro -b %INPUT
# @TEST-EXEC: $SCRIPTS/wait-for-file bro/got1 10 || (btest-bg-wait -k 1 && false) # @TEST-EXEC: $SCRIPTS/wait-for-file bro/got1 10 || (btest-bg-wait -k 1 && false)
# @TEST-EXEC: mv configfile2 configfile # @TEST-EXEC: mv configfile2 configfile
# @TEST-EXEC: touch configfile
# @TEST-EXEC: $SCRIPTS/wait-for-file bro/got2 10 || (btest-bg-wait -k 1 && false) # @TEST-EXEC: $SCRIPTS/wait-for-file bro/got2 10 || (btest-bg-wait -k 1 && false)
# @TEST-EXEC: mv configfile3 configfile # @TEST-EXEC: mv configfile3 configfile
# @TEST-EXEC: touch configfile
# @TEST-EXEC: $SCRIPTS/wait-for-file bro/got3 10 || (btest-bg-wait -k 1 && false) # @TEST-EXEC: $SCRIPTS/wait-for-file bro/got3 10 || (btest-bg-wait -k 1 && false)
# @TEST-EXEC: mv configfile4 configfile # @TEST-EXEC: mv configfile4 configfile
# @TEST-EXEC: touch configfile
# @TEST-EXEC: btest-bg-wait 10 # @TEST-EXEC: btest-bg-wait 10
# @TEST-EXEC: btest-diff bro/config.log # @TEST-EXEC: btest-diff bro/config.log