From 8d3c07b62a5cf0274a5468efd5b28e40e0af4e59 Mon Sep 17 00:00:00 2001 From: Jon Siwek Date: Tue, 25 Aug 2020 14:32:47 -0700 Subject: [PATCH] Improve an Intel framework btest Relying on non-atomic `cp` operation may not cooperate well with the Input framework file re-reading logic. --- CHANGES | 7 +++++++ VERSION | 2 +- .../btest/scripts/base/frameworks/intel/updated-match.zeek | 6 +++--- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/CHANGES b/CHANGES index 9ce15963e2..9c5b21cf4d 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,11 @@ +3.3.0-dev.195 | 2020-08-25 14:32:47 -0700 + + * Improve an Intel framework btest (Jon Siwek, Corelight) + + Relying on non-atomic `cp` operation may not cooperate well with the + Input framework file re-reading logic. + 3.3.0-dev.194 | 2020-08-24 19:20:29 -0700 * Mark Continuation.h and PacketDumper.h as deprecated (Tim Wojtulewicz, Corelight) diff --git a/VERSION b/VERSION index b6c54d00be..ef41dcfd59 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.3.0-dev.194 +3.3.0-dev.195 diff --git a/testing/btest/scripts/base/frameworks/intel/updated-match.zeek b/testing/btest/scripts/base/frameworks/intel/updated-match.zeek index 272e89718d..3a52b8654f 100644 --- a/testing/btest/scripts/base/frameworks/intel/updated-match.zeek +++ b/testing/btest/scripts/base/frameworks/intel/updated-match.zeek @@ -1,9 +1,9 @@ -# @TEST-EXEC: cp intel1.dat intel.dat +# @TEST-EXEC: mv intel1.dat intel.dat # @TEST-EXEC: btest-bg-run zeekproc zeek -b %INPUT # @TEST-EXEC: $SCRIPTS/wait-for-file zeekproc/got1 15 || (btest-bg-wait -k 1 && false) -# @TEST-EXEC: cp intel2.dat intel.dat +# @TEST-EXEC: mv intel2.dat intel.dat # @TEST-EXEC: $SCRIPTS/wait-for-file zeekproc/got2 15 || (btest-bg-wait -k 1 && false) -# @TEST-EXEC: cp intel3.dat intel.dat +# @TEST-EXEC: mv intel3.dat intel.dat # @TEST-EXEC: btest-bg-wait 30 # @TEST-EXEC: cat zeekproc/intel.log > output # @TEST-EXEC: cat zeekproc/notice.log >> output