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.

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

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.
 

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'