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

Merge branch 'topic/christian/gh-2259-fix-dir-test'

Browse source 
* topic/christian/gh-2259-fix-dir-test:
  Fix race condition in scripts.base.utils.dir test
  Remove needless "touch" in scripts.base.utils.dir test
This commit is contained in:
Christian Kreibich 2022-07-11 17:29:19 -07:00
commit b59bfe5558
3 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
CHANGES
View file

@ -1,3 +1,9 @@
5.1.0-dev.217 | 2022-07-11 17:29:19 -0700
* Fix race condition in scripts.base.utils.dir test (Christian Kreibich, Corelight)
* Remove needless "touch" in scripts.base.utils.dir test (Christian Kreibich, Corelight)
5.1.0-dev.214 | 2022-07-11 09:46:52 -0700 5.1.0-dev.214 | 2022-07-11 09:46:52 -0700
* Fix default build with `--disable-cpp-tests`. (Benjamin Bannier, Corelight) * Fix default build with `--disable-cpp-tests`. (Benjamin Bannier, Corelight)

2
VERSION
View file

@ -1 +1 @@
5.1.0-dev.214 5.1.0-dev.217

3
testing/btest/scripts/base/utils/dir.test
View file

@ -1,11 +1,10 @@
# @TEST-EXEC: btest-bg-run zeek zeek -b ../dirtest.zeek # @TEST-EXEC: btest-bg-run zeek zeek -b ../dirtest.zeek
# @TEST-EXEC: $SCRIPTS/wait-for-file zeek/next1 10 || (btest-bg-wait -k 1 && false) # @TEST-EXEC: $SCRIPTS/wait-for-file zeek/next1 10 || (btest-bg-wait -k 1 && false)
# @TEST-EXEC: touch testdir/newone
# @TEST-EXEC: rm testdir/bye # @TEST-EXEC: rm testdir/bye
# @TEST-EXEC: touch testdir/newone
# @TEST-EXEC: $SCRIPTS/wait-for-file zeek/next2 10 || (btest-bg-wait -k 1 && false) # @TEST-EXEC: $SCRIPTS/wait-for-file zeek/next2 10 || (btest-bg-wait -k 1 && false)
# @TEST-EXEC: touch testdir/bye # @TEST-EXEC: touch testdir/bye
# @TEST-EXEC: btest-bg-wait 20 # @TEST-EXEC: btest-bg-wait 20
# @TEST-EXEC: touch testdir/newone
# @TEST-EXEC: btest-diff zeek/.stdout # @TEST-EXEC: btest-diff zeek/.stdout
@TEST-START-FILE dirtest.zeek @TEST-START-FILE dirtest.zeek