diff --git a/CHANGES b/CHANGES index 459f72cba4..a47cf8e65c 100644 --- a/CHANGES +++ b/CHANGES @@ -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 * Fix default build with `--disable-cpp-tests`. (Benjamin Bannier, Corelight) diff --git a/VERSION b/VERSION index 8a4ed199a8..73ea33d662 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -5.1.0-dev.214 +5.1.0-dev.217 diff --git a/testing/btest/scripts/base/utils/dir.test b/testing/btest/scripts/base/utils/dir.test index 6043d54289..d37fe4a044 100644 --- a/testing/btest/scripts/base/utils/dir.test +++ b/testing/btest/scripts/base/utils/dir.test @@ -1,11 +1,10 @@ # @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: touch testdir/newone # @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: touch testdir/bye # @TEST-EXEC: btest-bg-wait 20 -# @TEST-EXEC: touch testdir/newone # @TEST-EXEC: btest-diff zeek/.stdout @TEST-START-FILE dirtest.zeek