From c0bd02e18f9178247813331d1bbd7cbe19d872d4 Mon Sep 17 00:00:00 2001
From: Christian Kreibich <christian@corelight.com>
Date: Mon, 23 Nov 2020 22:43:45 -0800
Subject: [PATCH] Canonifier improvements for the
 scripts.base.frameworks.logging.ascii-double test

This now more surgically applies canonifiers so that the double-format
numerical output isn't itself canonified.
---
 .../test.log                                         |  4 ++--
 .../base/frameworks/logging/ascii-double.zeek        |  7 +++++--
 testing/scripts/diff-remove-openclose-timestamps     | 12 ++++++++++++
 3 files changed, 19 insertions(+), 4 deletions(-)
 create mode 100755 testing/scripts/diff-remove-openclose-timestamps

diff --git a/testing/btest/Baseline/scripts.base.frameworks.logging.ascii-double/test.log b/testing/btest/Baseline/scripts.base.frameworks.logging.ascii-double/test.log
index 1a1e901622..b6832f58cf 100644
--- a/testing/btest/Baseline/scripts.base.frameworks.logging.ascii-double/test.log
+++ b/testing/btest/Baseline/scripts.base.frameworks.logging.ascii-double/test.log
@@ -4,7 +4,7 @@
 #empty_field	(empty)
 #unset_field	-
 #path	test
-#open	2020-11-24-05-07-03
+#open XXXX-XX-XX-XX-XX-XX
 #fields	d
 #types	double
 2153226000.0
@@ -29,4 +29,4 @@ inf
 -inf
 0.0
 nan
-#close	2020-11-24-05-07-03
+#close XXXX-XX-XX-XX-XX-XX
diff --git a/testing/btest/scripts/base/frameworks/logging/ascii-double.zeek b/testing/btest/scripts/base/frameworks/logging/ascii-double.zeek
index 676f69600f..132b75c604 100644
--- a/testing/btest/scripts/base/frameworks/logging/ascii-double.zeek
+++ b/testing/btest/scripts/base/frameworks/logging/ascii-double.zeek
@@ -3,8 +3,11 @@
 # @TEST-EXEC: zeek -b %INPUT test-json.zeek
 # @TEST-EXEC: mv test.log json.log
 # @TEST-EXEC: zeek -b %INPUT
-# @TEST-EXEC: btest-diff test.log
-# @TEST-EXEC: btest-diff json.log
+#
+# Override the canonifiers in the following: we don't want to canonify
+# the double-format numbers themselves:
+# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-openclose-timestamps btest-diff test.log
+# @TEST-EXEC: TEST_DIFF_CANONIFIER= btest-diff json.log
 # 
 # Make sure  we do not write out scientific notation for doubles.
 
diff --git a/testing/scripts/diff-remove-openclose-timestamps b/testing/scripts/diff-remove-openclose-timestamps
new file mode 100755
index 0000000000..e3e0a201be
--- /dev/null
+++ b/testing/scripts/diff-remove-openclose-timestamps
@@ -0,0 +1,12 @@
+#! /usr/bin/env bash
+#
+# Replace timestamps in the #start/end markers in logs.
+
+# Get us "modern" regexps with sed.
+if [ `uname` == "Linux" ]; then
+   sed="sed -r"
+else
+   sed="sed -E"
+fi
+
+$sed 's/^ *#(open|close).(19|20)..-..-..-..-..-..$/#\1 XXXX-XX-XX-XX-XX-XX/g'